diff options
author | Werner Lemberg <wl@gnu.org> | 2005-08-20 05:45:42 +0000 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2005-08-20 05:45:42 +0000 |
commit | 9c27494f871b0f46fa2951f30160e7a882423f8a (patch) | |
tree | 96ff8b08e565e7461e6ef190e3f1250590781097 | |
parent | 1a800db9c97eee465025e470a277d0da5eb9dbae (diff) | |
download | freetype2-9c27494f871b0f46fa2951f30160e7a882423f8a.tar.gz |
* src/sfnt/ttload.c (tt_face_load_metrics_header): Ignore missing
`hhea' table for SFNT Mac fonts. Change based on a patch by
mpsuzuki@hiroshima-u.ac.jp.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/sfnt/ttload.c | 12 |
2 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-08-20 Werner Lemberg <wl@gnu.org> + + * src/sfnt/ttload.c (tt_face_load_metrics_header): Ignore missing + `hhea' table for SFNT Mac fonts. Change based on a patch by + mpsuzuki@hiroshima-u.ac.jp. + 2005-08-20 Masatake YAMATO <jet@gyve.org> * src/otvalid/otvmod.c (otv_validate): Use ft_validator_run instead diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index 0f9198402..701dc98b9 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -1092,12 +1092,20 @@ } else { - /* The horizontal header is mandatory; return an error if we */ - /* don't find it. */ + /* The horizontal header is mandatory for most fonts; return */ + /* an error if we don't find it. */ error = face->goto_table( face, TTAG_hhea, stream, 0 ); if ( error ) { error = SFNT_Err_Horiz_Header_Missing; + + /* No `hhea' table necessary for SFNT Mac fonts. */ + if ( face->format_tag == TTAG_true ) + { + FT_TRACE2(( "missing. This is an SFNT Mac font.\n")); + error = SFNT_Err_Ok; + } + goto Exit; } |