diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-26 12:47:55 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-26 12:47:55 +0000 |
commit | fbcbe9b36240e101914f4b687e609ef5e03b3747 (patch) | |
tree | 91f8770ddd48fbceea91bc905b18e1b3c3b4804f /Build/source/texk/dvipdfm-x/tt_table.c | |
parent | 8dc34f4a2fe697d0f38addfc64b096d3f864c0e8 (diff) |
dvipdfm-x: Reduced dvipdfmx/xdvipdfmx diffs
git-svn-id: svn://tug.org/texlive/trunk@31776 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/tt_table.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/tt_table.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Build/source/texk/dvipdfm-x/tt_table.c b/Build/source/texk/dvipdfm-x/tt_table.c index a07af72cecb..22bf583a9a9 100644 --- a/Build/source/texk/dvipdfm-x/tt_table.c +++ b/Build/source/texk/dvipdfm-x/tt_table.c @@ -350,11 +350,10 @@ tt_read_os2__table (sfnt *sfont) struct tt_os2__table *table = NULL; int i; + table = NEW(1, struct tt_os2__table); + if (sfnt_find_table_pos(sfont, "OS/2") > 0) { sfnt_locate_table(sfont, "OS/2"); - - table = NEW(1, struct tt_os2__table); - table->version = sfnt_get_ushort(sfont); table->xAvgCharWidth = sfnt_get_short(sfont); table->usWeightClass = sfnt_get_ushort(sfont); @@ -407,10 +406,7 @@ tt_read_os2__table (sfnt *sfont) } } } - } -#ifndef XETEX - else { - table = NEW(1, struct tt_os2__table); + } else { /* used in add_CIDVMetrics() of cidtype0.c */ table->sTypoAscender = 880; @@ -426,7 +422,6 @@ tt_read_os2__table (sfnt *sfont) table->panose[i] = 0; /* All Any */ } } -#endif return table; } |