Commit 94b79e74532373ad8da0eb28d1fb08dd754647ff
2012-12-17T19:17:30
[truetype] Remove unusued code and variables.
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
diff --git a/ChangeLog b/ChangeLog
index 7591398..f9eb658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-17 Infinality <infinality@infinality.net>
+
+ [truetype] Remove unusued code and variables.
+
+ * src/truetype/ttinterp.c: Updated.
+ (Ins_FDEF): Remove opcode patterns that are not being used.
+
2012-12-16 Werner Lemberg <wl@gnu.org>
Various compiler warning fixes.
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 505168d..19fb66c 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -4610,25 +4610,25 @@
FT_ULong n;
TT_DefRecord* rec;
TT_DefRecord* limit;
+
#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
- FT_Byte opcode_pattern[7][12] = {
- /* inline delta function 1 */
- {0x4B,0x53,0x23,0x4B,0x51,0x5A,0x58,0x38,0x1B,0x21,0x21,0x59},
- /* inline delta function 2 */
- {0x4B,0x54,0x58,0x38,0x1B,0x5A,0x21,0x21,0x59,},
- /* diagonal stroke function */
- {0x20,0x20,0x40,0x60,0x47,0x40,0x23,0x42,},
- /* VacuFormRound function */
- {0x45,0x23,0x46,0x60,0x20,},
- /* ttfautohinted */
- {0x20,0x64,0xb0,0x60,0x66,0x23,0xb0,},
- /* spacing functions */
- {0x01,0x41,0x43,0x58,},
- {0x01,0x18,0x41,0x43,0x58,},
+ /* arguments to opcodes are skipped by `SKIP_Code' */
+ FT_Byte opcode_pattern[1][12] = {
+ /* #0 TTFautohint bytecode (old) */
+ {
+ 0x20, /* DUP */
+ 0x64, /* ABS */
+ 0xB0, /* PUSHB_1 */
+ /* 32 */
+ 0x60, /* ADD */
+ 0x66, /* FLOOR */
+ 0x23, /* SWAP */
+ 0xB0 /* PUSHB_1 */
+ },
};
- FT_UShort opcode_patterns = 7;
- FT_UShort opcode_pointer[7] = {0,0,0,0,0,0,0};
- FT_UShort opcode_size[7] = {12,9,8,5,7,4,5};
+ FT_UShort opcode_patterns = 1;
+ FT_UShort opcode_pointer[1] = { 0, };
+ FT_UShort opcode_size[1] = { 7, };
FT_UShort i;
#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
@@ -4706,23 +4706,8 @@
switch ( i )
{
case 0:
- case 1:
- rec->inline_delta = TRUE;
- break;
-
- case 2:
- case 3:
- rec->active = FALSE;
- break;
-
- case 4:
CUR.size->ttfautohinted = TRUE;
break;
-
- case 5:
- case 6:
- rec->active = FALSE;
- break;
}
opcode_pointer[i] = 0;
}