summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/xsrc/tt_table.c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-03 10:15:17 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-03 10:15:17 +0000
commitbafcd628ab422e43e5ead345d239bbc6af9fc568 (patch)
treed02cde6e49f1239219fd09fcb90b7558aad80613 /Build/source/texk/dvipdfm-x/xsrc/tt_table.c
parentca0e507a0a79afc9ffa63e3d3d1dbf4e2f3975b4 (diff)
Merging dvipdfmx and xdvipdfmx (continue)
git-svn-id: svn://tug.org/texlive/trunk@31083 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/xsrc/tt_table.c')
-rw-r--r--Build/source/texk/dvipdfm-x/xsrc/tt_table.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/Build/source/texk/dvipdfm-x/xsrc/tt_table.c b/Build/source/texk/dvipdfm-x/xsrc/tt_table.c
index 009ca5634cb..7447d568c18 100644
--- a/Build/source/texk/dvipdfm-x/xsrc/tt_table.c
+++ b/Build/source/texk/dvipdfm-x/xsrc/tt_table.c
@@ -79,9 +79,7 @@ char *tt_pack_head_table (struct tt_head_table *table)
struct tt_head_table *tt_read_head_table (sfnt *sfont)
{
int i;
- struct tt_head_table *table = NULL;
-
- table = NEW(1, struct tt_head_table);
+ struct tt_head_table *table = NEW(1, struct tt_head_table);
sfnt_locate_table(sfont, "head");
@@ -136,11 +134,10 @@ char *tt_pack_maxp_table (struct tt_maxp_table *table)
struct tt_maxp_table *tt_read_maxp_table (sfnt *sfont)
{
- struct tt_maxp_table *table = NULL;
-
- table = NEW(1, struct tt_maxp_table);
+ struct tt_maxp_table *table = NEW(1, struct tt_maxp_table);
sfnt_locate_table(sfont, "maxp");
+
table->version = sfnt_get_ulong(sfont);
table->numGlyphs = sfnt_get_ushort(sfont);
table->maxPoints = sfnt_get_ushort(sfont);
@@ -191,11 +188,10 @@ tt_read_hhea_table (sfnt *sfont)
{
int i;
ULONG len;
- struct tt_hhea_table *table = NULL;
+ struct tt_hhea_table *table = NEW(1, struct tt_hhea_table);
sfnt_locate_table(sfont, "hhea");
- table = NEW(1, struct tt_hhea_table);
table->version = sfnt_get_ulong(sfont);
table->ascent = sfnt_get_short (sfont);
table->descent = sfnt_get_short(sfont);
@@ -255,11 +251,10 @@ struct tt_vhea_table *tt_read_vhea_table (sfnt *sfont)
{
int i;
ULONG len;
- struct tt_vhea_table *table = NULL;
-
- table = NEW(1, struct tt_vhea_table);
+ struct tt_vhea_table *table = NEW(1, struct tt_vhea_table);
sfnt_locate_table(sfont, "vhea");
+
table->version = sfnt_get_ulong(sfont);
table->vertTypoAscender = sfnt_get_short (sfont);
table->vertTypoDescender = sfnt_get_short(sfont);