summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-05-01 22:36:58 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-05-01 22:36:58 +0000
commit66908189c7dd3376ffaf39a9eaf9e9afeae73729 (patch)
treee64b637b3044560ab981b091ba3bf115d4f6843b
parente49e8bc0b7e9222bc4e40d2e3b0298262c78380a (diff)
dvipdfm-x/cidtype0.c: Support old compilers.
git-svn-id: svn://tug.org/texlive/trunk@37147 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype0.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index e376208fbcd..7c10bd589e4 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-01 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * cidtype0.c: Support old compilers.
+
2015-05-01 Jiang Jiang <gzjjgod@gmail.com>
* cidtype0.c, cidtype0.h, cid.c: Combine all Type 0 open functions
diff --git a/Build/source/texk/dvipdfm-x/cidtype0.c b/Build/source/texk/dvipdfm-x/cidtype0.c
index 4e89907589c..8bdcf4d7a29 100644
--- a/Build/source/texk/dvipdfm-x/cidtype0.c
+++ b/Build/source/texk/dvipdfm-x/cidtype0.c
@@ -551,6 +551,7 @@ CIDFont_type0_try_open (const char *name,
CIDType0Info *info)
{
unsigned long offset = 0;
+ int is_cid;
CIDFontInfo_init(info);
@@ -580,7 +581,7 @@ CIDFont_type0_try_open (const char *name,
if (!info->cffont)
return CID_OPEN_ERROR_CANNOT_OPEN_CFF_FONT;
- int is_cid = info->cffont->flag & FONTTYPE_CIDFONT;
+ is_cid = info->cffont->flag & FONTTYPE_CIDFONT;
if (required_cid != is_cid) {
CIDFontInfo_close(info);
return required_cid ? CID_OPEN_ERROR_NOT_CIDFONT
@@ -623,6 +624,7 @@ CIDFont_type0_dofont (CIDFont *font)
char *used_chars;
unsigned char *CIDToGIDMap = NULL;
CIDType0Error error;
+ CIDType0Info info;
ASSERT(font);
@@ -645,7 +647,6 @@ CIDFont_type0_dofont (CIDFont *font)
used_chars = CIDFont_type0_get_used_chars(font);
- CIDType0Info info;
error = CIDFont_type0_try_open(font->ident, CIDFont_get_opt_index(font),
1, &info);
if (error != CID_OPEN_ERROR_NO_ERROR) {
@@ -1056,6 +1057,7 @@ CIDFont_type0_t1cdofont (CIDFont *font)
char *used_chars;
double default_width, nominal_width;
CIDType0Error error;
+ CIDType0Info info;
ASSERT(font);
@@ -1068,7 +1070,6 @@ CIDFont_type0_t1cdofont (CIDFont *font)
used_chars = CIDFont_type0_get_used_chars(font);
- CIDType0Info info;
error = CIDFont_type0_try_open(font->ident, CIDFont_get_opt_index(font),
0, &info);
if (error != CID_OPEN_ERROR_NO_ERROR) {