diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-22 09:10:19 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-22 09:10:19 +0000 |
commit | 9390cbb84a9dca0d3d20e02765cc92902b06ec14 (patch) | |
tree | 5688e78de0248b85cda933213a1aaa01e550b460 /Build/source/texk/dvipdfm-x/tt_post.c | |
parent | ccb5ed485c606f3475f6412c5f41f9c6dbd4484a (diff) |
dvipdfm-x: Continue merging dvipdfmx and xdvipdfmx
git-svn-id: svn://tug.org/texlive/trunk@31262 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/tt_post.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/tt_post.c | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/Build/source/texk/dvipdfm-x/tt_post.c b/Build/source/texk/dvipdfm-x/tt_post.c index 14d3d22b8b9..d000f5487b0 100644 --- a/Build/source/texk/dvipdfm-x/tt_post.c +++ b/Build/source/texk/dvipdfm-x/tt_post.c @@ -138,40 +138,19 @@ tt_read_post_table (sfnt *sfont) if (post->Version == 0x00010000UL) { post->numberOfGlyphs = 258; /* wrong */ post->glyphNamePtr = macglyphorder; - post->count = 0; - post->names = NULL; - } else if (post->Version == 0x00025000UL) { + } else if (post->Version == 0x00028000UL) { WARN("TrueType 'post' version 2.5 found (deprecated)"); - post->numberOfGlyphs = 0; /* wrong */ - post->glyphNamePtr = NULL; - post->count = 0; - post->names = NULL; } else if (post->Version == 0x00020000UL) { if (read_v2_post_names(post, sfont) < 0) { -#ifdef XETEX WARN("Invalid version 2.0 'post' table"); -#else - WARN("Invalid TrueType 'post' table..."); -#endif tt_release_post_table(post); post = NULL; } - } else if (post->Version == 0x00030000UL) { /* no glyph names provided */ - post->numberOfGlyphs = 0; /* wrong */ - post->glyphNamePtr = NULL; - post->count = 0; - post->names = NULL; -#ifdef XETEX - } else if (post->Version == 0x00040000UL) { /* Apple format for printer-based fonts */ - post->numberOfGlyphs = 0; /* don't bother constructing char names, not sure if they'll ever be needed */ - post->glyphNamePtr = NULL; - post->count = 0; - post->names = NULL; -#endif - } else { - WARN("Unknown 'post' version: %08X", post->Version); - tt_release_post_table(post); - post = NULL; + } else if (post->Version == 0x00030000UL || /* no glyph names provided */ + post->Version == 0x00040000UL) { /* Apple format for printer-based fonts */ + /* don't bother constructing char names, not sure if they'll ever be needed */ + } else { /* some broken font files have 0x00000000UL and perhaps other values */ + WARN("Unknown 'post' version: %08X, assuming version 3.0", post->Version); } return post; |