shithub: freetype+ttf2subf

Download patch

ref: 628578c6558abe6e1106f7d23e6466c06b9ce153
parent: 08e7909a5818de4c71c9a54b7ae66b3ad01c65d8
author: Werner Lemberg <[email protected]>
date: Sun Jan 11 03:53:31 EST 2015 

* src/truetype/ttinterp.c (Ins_SxVTL): Simplify function call.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-01-11  Werner Lemberg  <[email protected]>
 
+	* src/truetype/ttinterp.c (Ins_SxVTL): Simplify function call.
+
+2015-01-11  Werner Lemberg  <[email protected]>
+
 	* src/truetype/ttinterp.c (Normalize): Remove unused argument.
 
 2015-01-11  Werner Lemberg  <[email protected]>
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -2629,7 +2629,6 @@
   Ins_SxVTL( TT_ExecContext  exc,
              FT_UShort       aIdx1,
              FT_UShort       aIdx2,
-             FT_Int          aOpc,
              FT_UnitVector*  Vec )
   {
     FT_Long     A, B, C;
@@ -2636,7 +2635,9 @@
     FT_Vector*  p1;
     FT_Vector*  p2;
 
+    FT_Byte  opcode = exc->opcode;
 
+
     if ( BOUNDS( aIdx1, exc->zp2.n_points ) ||
          BOUNDS( aIdx2, exc->zp1.n_points ) )
     {
@@ -2658,11 +2659,11 @@
 
     if ( A == 0 && B == 0 )
     {
-      A    = 0x4000;
-      aOpc = 0;
+      A      = 0x4000;
+      opcode = 0;
     }
 
-    if ( ( aOpc & 1 ) != 0 )
+    if ( ( opcode & 1 ) != 0 )
     {
       C =  B;   /* counter clockwise rotation */
       B =  A;
@@ -2701,9 +2702,10 @@
   Ins_SxyTCA( TT_ExecContext  exc )
   {
     FT_Short  AA, BB;
-    FT_Byte   opcode = exc->opcode;
 
+    FT_Byte  opcode = exc->opcode;
 
+
     AA = (FT_Short)( ( opcode & 1 ) << 14 );
     BB = (FT_Short)( AA ^ 0x4000 );
 
@@ -2743,7 +2745,6 @@
     if ( Ins_SxVTL( exc,
                     (FT_UShort)args[1],
                     (FT_UShort)args[0],
-                    exc->opcode,
                     &exc->GS.projVector ) == SUCCESS )
     {
       exc->GS.dualVector = exc->GS.projVector;
@@ -2766,7 +2767,6 @@
     if ( Ins_SxVTL( exc,
                     (FT_UShort)args[1],
                     (FT_UShort)args[0],
-                    exc->opcode,
                     &exc->GS.freeVector ) == SUCCESS )
     {
       GUESS_VECTOR( projVector );
@@ -4988,9 +4988,10 @@
   {
     FT_Long    A, B, C;
     FT_UShort  p1, p2;            /* was FT_Int in pas type ERROR */
-    FT_Int     aOpc = exc->opcode;
 
+    FT_Byte  opcode = exc->opcode;
 
+
     p1 = (FT_UShort)args[1];
     p2 = (FT_UShort)args[0];
 
@@ -5017,12 +5018,12 @@
 
       if ( A == 0 && B == 0 )
       {
-        A    = 0x4000;
-        aOpc = 0;
+        A      = 0x4000;
+        opcode = 0;
       }
     }
 
-    if ( ( aOpc & 1 ) != 0 )
+    if ( ( opcode & 1 ) != 0 )
     {
       C =  B;   /* counter clockwise rotation */
       B =  A;
@@ -5041,12 +5042,12 @@
 
       if ( A == 0 && B == 0 )
       {
-        A    = 0x4000;
-        aOpc = 0;
+        A      = 0x4000;
+        opcode = 0;
       }
     }
 
-    if ( ( aOpc & 1 ) != 0 )
+    if ( ( opcode & 1 ) != 0 )
     {
       C =  B;   /* counter clockwise rotation */
       B =  A;