rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/sfnt/ttload.c (tt_face_load_max_profile): Always set 

face->root.num_glyphs.

* src/sfnt/ttload.c (sfnt_dir_check): Handle `bhed' properly.
This commit is contained in:
Werner Lemberg 2004-05-17 12:38:52 +00:00
parent 17deda1fe1
commit 90b593ca07
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2004-05-15 George Williams <gww@silcom.com>
* src/sfnt/ttload.c (tt_face_load_max_profile): Always set
face->root.num_glyphs.
2004-05-14 Masatake YAMATO <jet@gyve.org>
George Williams <gww@silcom.com>
* src/sfnt/ttload.c (sfnt_dir_check): Handle `bhed' properly.
2004-05-14 Werner Lemberg <wl@gnu.org>
* src/cache/ftcbasic.c (ftc_basic_family_compare,

12
src/sfnt/ttload.c
View File

@ -207,6 +207,10 @@
FT_UInt32 magic;
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
head_retry:
#endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
has_head = 1;
/* The table length should be 0x36, but certain font tools
@ -225,6 +229,10 @@
if ( FT_STREAM_SEEK( offset + 28 + 16*nn ) )
goto Bad_Format;
}
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
else if ( table.Tag == TTAG_bhed )
goto head_retry;
#endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
}
if ( has_head == 0 )
@ -715,6 +723,8 @@
if ( FT_STREAM_READ_FIELDS( maxp_fields, maxProfile ) )
goto Exit;
face->root.num_glyphs = maxProfile->numGlyphs;
maxProfile->maxPoints = 0;
maxProfile->maxContours = 0;
maxProfile->maxCompositePoints = 0;
@ -743,8 +753,6 @@
if ( maxProfile->maxFunctionDefs == 0 )
maxProfile->maxFunctionDefs = 64;
face->root.num_glyphs = maxProfile->numGlyphs;
face->root.internal->max_points =
(FT_UShort)FT_MAX( maxProfile->maxCompositePoints,
maxProfile->maxPoints );