Commit 25ab491d559531b2fec2dc9770187a0f26482312
2003-12-10T20:04:50
* src/sfnt/sfobjs.c (sfnt_load_face): Set FT_FACE_FLAG_GLYPH_NAMES only if a `post' table is present.
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
diff --git a/ChangeLog b/ChangeLog
index 9b9f670..02214d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-12-09 Werner Lemberg <wl@gnu.org>
+
+ * src/sfnt/sfobjs.c (sfnt_load_face): Set FT_FACE_FLAG_GLYPH_NAMES
+ only if a `post' table is present.
+
+2003-12-09 George Williams <gww@silcom.com>
+
+ * src/base/ftobjs.c (load_mac_face): Recent versions of Linux
+ support Mac's HFS+ file system, thus enable code to read /rsrc on
+ non-Macintosh platforms also.
+
2003-12-08 Werner Lemberg <wl@gnu.org>
* include/freetype/internal/psaux.h (PS_TableRec): Change type
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 237fc96..1a98c13 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -400,7 +400,7 @@
FT_Int num_params,
FT_Parameter* params )
{
- FT_Error error;
+ FT_Error error, psnames_error;
FT_Bool has_outline;
FT_Bool is_apple_sbit;
@@ -462,7 +462,7 @@
/* the following tables are optional in PCL fonts -- */
/* don't check for errors */
(void)LOAD_( names );
- (void)LOAD_( psnames );
+ psnames_error = LOAD_( psnames );
/* do not load the metrics headers and tables if this is an Apple */
/* sbit font file */
@@ -529,9 +529,8 @@
FT_FACE_FLAG_HORIZONTAL; /* horizontal data */
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
- /* might need more polish to detect the presence of a Postscript */
- /* name table in the font */
- flags |= FT_FACE_FLAG_GLYPH_NAMES;
+ if ( psnames_error == SFNT_Err_Ok )
+ flags |= FT_FACE_FLAG_GLYPH_NAMES;
#endif
/* fixed width font? */