Commit 74c34eba3978554ef2628a6547e793c47e807365
2007-03-18T07:19:31
another bytecode interpreter regression fix
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/ChangeLog b/ChangeLog
index 38ab6dc..673e589 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-18 David Turner <david@freetype.org>
+
+ * src/truetype/ttinterp.c (Ins_MDRP): another bytecode
+ regression fix; testing still needed
+
2007-03-17 David Turner <david@freetype.org>
* src/truetype/ttinterp.c (Ins_IP): fixing wrong handling
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 91129c1..469c372 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -4844,7 +4844,7 @@
CUR.twilight.n_points );
/* get scaled orus coordinates */
- vec1.x = TT_MULFIX( CUR.zp0.orus[L].x - CUR.zp1.orus[K].x,
+ vec1.x = TT_MULFIX( CUR.zp0.org[L].x - CUR.zp1.orus[K].x,
CUR.metrics.x_scale );
vec1.y = TT_MULFIX( CUR.zp0.orus[L].y - CUR.zp1.orus[L].y,
CUR.metrics.y_scale );
@@ -5780,16 +5780,21 @@
#ifdef FIX_BYTECODE
+ /* UNDOCUMENTED: twilight zone special case */
+
+ if ( CUR.GS.gep0 == 0 || CUR.GS.gep1 == 0 )
+ {
+ FT_Vector* vec1 = &CUR.zp1.org[point];
+ FT_Vector* vec2 = &CUR.zp0.org[CUR.GS.rp0];
+
+ org_dist = CUR_Func_dualproj( vec1, vec2 );
+ }
+ else
{
FT_Vector* vec1 = &CUR.zp1.orus[point];
FT_Vector* vec2 = &CUR.zp0.orus[CUR.GS.rp0];
- if ( CUR.GS.gep0 == 0 || CUR.GS.gep1 == 0 )
- FT_ARRAY_COPY( CUR.twilight.orus,
- CUR.twilight.org,
- CUR.twilight.n_points );
-
if ( CUR.metrics.x_scale == CUR.metrics.y_scale )
{
/* this should be faster */