diff options
Diffstat (limited to 'freetype/src/pcf/pcfdrivr.c')
| -rw-r--r-- | freetype/src/pcf/pcfdrivr.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/freetype/src/pcf/pcfdrivr.c b/freetype/src/pcf/pcfdrivr.c index e5ab43040..14c507e07 100644 --- a/freetype/src/pcf/pcfdrivr.c +++ b/freetype/src/pcf/pcfdrivr.c @@ -34,6 +34,7 @@ THE SOFTWARE. #include FT_LZW_H #include FT_ERRORS_H #include FT_BDF_H +#include FT_TRUETYPE_IDS_H #include "pcf.h" #include "pcfdrivr.h" @@ -227,7 +228,8 @@ THE SOFTWARE. { prop = &face->properties[i]; - if ( prop ) { + if ( prop ) + { FT_FREE( prop->name ); if ( prop->isString ) FT_FREE( prop->value.atom ); @@ -358,14 +360,15 @@ THE SOFTWARE. charmap.face = FT_FACE( face ); charmap.encoding = FT_ENCODING_NONE; - charmap.platform_id = 0; - charmap.encoding_id = 0; + /* initial platform/encoding should indicate unset status? */ + charmap.platform_id = TT_PLATFORM_APPLE_UNICODE; + charmap.encoding_id = TT_APPLE_ID_DEFAULT; if ( unicode_charmap ) { charmap.encoding = FT_ENCODING_UNICODE; - charmap.platform_id = 3; - charmap.encoding_id = 1; + charmap.platform_id = TT_PLATFORM_MICROSOFT; + charmap.encoding_id = TT_MS_ID_UNICODE_CS; } error = FT_CMap_New( &pcf_cmap_class, NULL, &charmap, NULL ); |