Commit 628578c6558abe6e1106f7d23e6466c06b9ce153
2015-01-11T08:53:31
* src/truetype/ttinterp.c (Ins_SxVTL): Simplify function call.
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 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117
diff --git a/ChangeLog b/ChangeLog
index 755db2c..8b3fe5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-01-11 Werner Lemberg <wl@gnu.org>
+ * src/truetype/ttinterp.c (Ins_SxVTL): Simplify function call.
+
+2015-01-11 Werner Lemberg <wl@gnu.org>
+
* src/truetype/ttinterp.c (Normalize): Remove unused argument.
2015-01-11 Werner Lemberg <wl@gnu.org>
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index f35c5c6..b530ec8 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -2629,13 +2629,14 @@
Ins_SxVTL( TT_ExecContext exc,
FT_UShort aIdx1,
FT_UShort aIdx2,
- FT_Int aOpc,
FT_UnitVector* Vec )
{
FT_Long A, B, C;
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,7 +2702,8 @@
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 );
@@ -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,7 +4988,8 @@
{
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];
@@ -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;