summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx/src/tt_glyf.c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-11 13:25:20 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-11 13:25:20 +0000
commitf33df6d448eecaace37506c4fc1e897bb3785edc (patch)
tree5a89a9205e86dd4ece68258f39e3a4943a5338f5 /Build/source/texk/dvipdfmx/src/tt_glyf.c
parent5e5667f37e392a9c676b5c89b304d5bcdacce9ff (diff)
Reduce dvipdfmx/xdvipdfmx diffs
git-svn-id: svn://tug.org/texlive/trunk@28796 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx/src/tt_glyf.c')
-rw-r--r--Build/source/texk/dvipdfmx/src/tt_glyf.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/Build/source/texk/dvipdfmx/src/tt_glyf.c b/Build/source/texk/dvipdfmx/src/tt_glyf.c
index c258a784f65..661ed8693ee 100644
--- a/Build/source/texk/dvipdfmx/src/tt_glyf.c
+++ b/Build/source/texk/dvipdfmx/src/tt_glyf.c
@@ -2,7 +2,7 @@
This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2007-2012 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2002-2012 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team.
This program is free software; you can redistribute it and/or modify
@@ -215,7 +215,13 @@ tt_build_tables (sfnt *sfont, struct tt_glyphs *g)
ASSERT(g);
- if (sfont == NULL || sfont->stream == NULL)
+ if (sfont == NULL ||
+#ifdef XETEX
+ sfont->ft_face == NULL
+#else
+ sfont->stream == NULL
+#endif
+ )
ERROR("File not opened.");
if (sfont->type != SFNT_TYPE_TRUETYPE &&
@@ -520,7 +526,13 @@ tt_get_metrics (sfnt *sfont, struct tt_glyphs *g)
ASSERT(g);
- if (sfont == NULL || sfont->stream == NULL)
+ if (sfont == NULL ||
+#ifdef XETEX
+ sfont->ft_face == NULL
+#else
+ sfont->stream == NULL
+#endif
+ )
ERROR("File not opened.");
if (sfont->type != SFNT_TYPE_TRUETYPE &&