* src/truetype/ttinterp.c (SetSuperRound) <0x30>: Follow Apple's

22 years ago · edb31ca7fa
parent 4e9526d6ca
commit edb31ca7fa
2 changed files with 11 additions and 3 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2003-06-09  George Williams  <gww@silcom.com>
+
+	* src/truetype/ttinterp.c (SetSuperRound) <0x30>: Follow Apple's
+	TrueType specification.
+	(Ins_MDRP, Ins_MIRP): Fix single width cut-in test.
+
 2003-06-09  Detlef Würkner  <TetiSoft@apg.lahn.de>

 	* src/gzip/ftgzip.c: (inflate_mask): Replaced with...
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@ -2087,7 +2087,7 @@
      break;

    case 0x30:
-      CUR.phase = GridPeriod * 3 / 4;
+      CUR.phase = CUR.period * 3 / 4;
      break;
    }

@ -5663,7 +5663,8 @@

    /* single width cutin test */

-    if ( ABS( org_dist ) < CUR.GS.single_width_cutin )
+    if ( ABS( org_dist - CUR.GS.single_width_value ) <
+         CUR.GS.single_width_cutin )
    {
      if ( org_dist >= 0 )
        org_dist = CUR.GS.single_width_value;
@ -5752,7 +5753,8 @@

    /* single width test */

-    if ( ABS( cvt_dist ) < CUR.GS.single_width_cutin )
+    if ( ABS( cvt_dist - CUR.GS.single_width_value ) <
+         CUR.GS.single_width_cutin )
    {
      if ( cvt_dist >= 0 )
        cvt_dist =  CUR.GS.single_width_value;