diff options
author | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
commit | 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (patch) | |
tree | 3db49b4d73b8c4c734c1382ab5469a4f9f8baf93 /freetype/src/truetype/ttobjs.c | |
parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
download | vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.gz vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.bz2 vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.zip |
Updated to freetype-2.4.9
Diffstat (limited to 'freetype/src/truetype/ttobjs.c')
-rw-r--r-- | freetype/src/truetype/ttobjs.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/freetype/src/truetype/ttobjs.c b/freetype/src/truetype/ttobjs.c index d77c3c421..814c713aa 100644 --- a/freetype/src/truetype/ttobjs.c +++ b/freetype/src/truetype/ttobjs.c @@ -328,7 +328,7 @@ FT_MEM_SET( num_matched_ids, 0, - sizeof( int ) * TRICK_SFNT_IDS_NUM_FACES ); + sizeof ( int ) * TRICK_SFNT_IDS_NUM_FACES ); has_cvt = FALSE; has_fpgm = FALSE; has_prep = FALSE; @@ -493,10 +493,17 @@ TT_Face face = (TT_Face)ttface; + FT_TRACE2(( "TTF driver\n" )); + library = ttface->driver->root.library; - sfnt = (SFNT_Service)FT_Get_Module_Interface( library, "sfnt" ); + + sfnt = (SFNT_Service)FT_Get_Module_Interface( library, "sfnt" ); if ( !sfnt ) - goto Bad_Format; + { + FT_ERROR(( "tt_face_init: cannot access `sfnt' module\n" )); + error = TT_Err_Missing_Module; + goto Exit; + } /* create input stream from resource */ if ( FT_STREAM_SEEK( 0 ) ) @@ -514,7 +521,7 @@ face->format_tag != 0x00020000L && /* CJK fonts for Win 3.1 */ face->format_tag != TTAG_true ) /* Mac fonts */ { - FT_TRACE2(( "[not a valid TTF font]\n" )); + FT_TRACE2(( " not a TTF font\n" )); goto Bad_Format; } |