From 695ce08c64a915d3344a32c33e21c2db52663faf Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 17 May 2004 12:38:52 +0000 Subject: [PATCH] * 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. --- ChangeLog | 10 ++++++++++ src/sfnt/ttload.c | 12 ++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97e511e58..b0054a259 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-05-15 George Williams + + * src/sfnt/ttload.c (tt_face_load_max_profile): Always set + face->root.num_glyphs. + +2004-05-14 Masatake YAMATO + George Williams + + * src/sfnt/ttload.c (sfnt_dir_check): Handle `bhed' properly. + 2004-05-14 Werner Lemberg * src/cache/ftcbasic.c (ftc_basic_family_compare, diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index 95d49b9e1..9e21d7d01 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -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 );