Commit 63cb46dd1a38979f7e51fa964f1042695feea41c
2000-02-22T13:34:26
simple fixes
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/demos/Makefile b/demos/Makefile
index 7c33224..f8a8862 100644
--- a/demos/Makefile
+++ b/demos/Makefile
@@ -152,7 +152,7 @@ endif
#
# The list of demonstration programs to build.
#
-EXES := ftlint t1dump ftview fttimer
+EXES := ftlint ftview fttimer
ifneq ($(findstring $(PLATFORM),os2 unix),)
EXES += ttdebug
diff --git a/demos/src/ttdebug.c b/demos/src/ttdebug.c
index 878f5e4..836026e 100644
--- a/demos/src/ttdebug.c
+++ b/demos/src/ttdebug.c
@@ -815,8 +815,8 @@ TT_CodeRange_Tag debug_coderange = tt_coderange_glyph;
TT_Error error = 0;
- TT_GlyphZone save;
- TT_GlyphZone pts;
+ FT_GlyphZone save;
+ FT_GlyphZone pts;
const FT_String* round_str[8] =
{
@@ -847,7 +847,7 @@ TT_CodeRange_Tag debug_coderange = tt_coderange_glyph;
save.n_points );
save.cur = (TT_Vector*)malloc( 2 * sizeof( TT_F26Dot6 ) *
save.n_points );
- save.touch = (TT_Byte*)malloc( save.n_points );
+ save.flags = (TT_Byte*)malloc( save.n_points );
exc->instruction_trap = 1;
@@ -998,7 +998,7 @@ TT_CodeRange_Tag debug_coderange = tt_coderange_glyph;
MEM_Copy( save.org, pts.org, pts.n_points * sizeof ( TT_Vector ) );
MEM_Copy( save.cur, pts.cur, pts.n_points * sizeof ( TT_Vector ) );
- MEM_Copy( save.touch, pts.touch, pts.n_points );
+ MEM_Copy( save.flags, pts.flags, pts.n_points );
/* a return indicate the last command */
if (ch == '\r')
@@ -1052,14 +1052,14 @@ TT_CodeRange_Tag debug_coderange = tt_coderange_glyph;
if ( save.org[A].y != pts.org[A].y ) diff |= 2;
if ( save.cur[A].x != pts.cur[A].x ) diff |= 4;
if ( save.cur[A].y != pts.cur[A].y ) diff |= 8;
- if ( save.touch[A] != pts.touch[A] ) diff |= 16;
+ if ( save.flags[A] != pts.flags[A] ) diff |= 16;
if ( diff )
{
printf( "%02hx ", A );
if ( diff & 16 ) temp = "(%01hx)"; else temp = " %01hx ";
- printf( temp, save.touch[A] & 7 );
+ printf( temp, save.flags[A] & 7 );
if ( diff & 1 ) temp = "(%08lx)"; else temp = " %08lx ";
printf( temp, save.org[A].x );
@@ -1078,7 +1078,7 @@ TT_CodeRange_Tag debug_coderange = tt_coderange_glyph;
printf( "%02hx ", A );
if ( diff & 16 ) temp = "[%01hx]"; else temp = " %01hx ";
- printf( temp, pts.touch[A] & 7 );
+ printf( temp, pts.flags[A] & 7 );
if ( diff & 1 ) temp = "[%08lx]"; else temp = " %08lx ";
printf( temp, pts.org[A].x );
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index 597c292..07a6c08 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -34,7 +34,6 @@
/* When this configuration macro is defined, we rely on the "psnames" */
/* module to grab the glyph names.. */
#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
#include <psnames.h>
#define MAC_NAME(x) ((TT_String*)psnames->macintosh_name(x))
@@ -48,7 +47,7 @@
/* the 258 default Mac PS glyph names */
- String* TT_Post_Default_Names[258] =
+ FT_String* TT_Post_Default_Names[258] =
{
/* 0 */
".notdef", ".null", "CR", "space", "exclam",
@@ -411,18 +410,21 @@
{
TT_Error error;
TT_Post_Names* names;
+#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
PSNames_Interface* psnames;
-
+#endif
if ( !face )
return TT_Err_Invalid_Face_Handle;
if ( index >= (TT_UInt)face->root.num_glyphs )
return TT_Err_Invalid_Glyph_Index;
+#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
psnames = (PSNames_Interface*)face->psnames;
if (!psnames)
return TT_Err_Unimplemented_Feature;
-
+#endif
+
names = &face->postscript_names;
/* `.notdef' by default */