summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype0.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 2daed04ff11..ef7308c474b 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,5 +1,9 @@
2015-04-27 Jiang Jiang <gzjjgod@gmail.com>
+ * cidtype0.c: Fix TTC support for Type 1 Composite and Type 0 fonts.
+
+2015-04-27 Jiang Jiang <gzjjgod@gmail.com>
+
* dpxfile.c: Ignore empty file in filetype checking.
2015-04-26 Jiang Jiang <gzjjgod@gmail.com>
diff --git a/Build/source/texk/dvipdfm-x/cidtype0.c b/Build/source/texk/dvipdfm-x/cidtype0.c
index f7e6b441a40..b4e19a7f845 100644
--- a/Build/source/texk/dvipdfm-x/cidtype0.c
+++ b/Build/source/texk/dvipdfm-x/cidtype0.c
@@ -529,7 +529,7 @@ CIDFont_type0_dofont (CIDFont *font)
if (offset == 0)
ERROR("Not a CFF/OpenType font (2)?");
- cffont = cff_open(fp, offset, font->options->index);
+ cffont = cff_open(fp, offset, 0);
if (!cffont)
ERROR("Could not open CFF font.");
if (!(cffont->flag & FONTTYPE_CIDFONT))
@@ -755,7 +755,7 @@ CIDFont_type0_open (CIDFont *font, const char *name,
return -1;
}
- cffont = cff_open(sfont->stream, offset, opt->index);
+ cffont = cff_open(sfont->stream, offset, 0);
if (!cffont) {
ERROR("Cannot read CFF font data");
}
@@ -934,7 +934,7 @@ CIDFont_type0_t1cdofont (CIDFont *font)
if (offset == 0)
ERROR("Not a CFF/OpenType font (6)?");
- cffont = cff_open(fp, offset, font->options->index);
+ cffont = cff_open(fp, offset, 0);
if (!cffont)
ERROR("Could not open CFF font.");
if (cffont->flag & FONTTYPE_CIDFONT)
@@ -1190,7 +1190,7 @@ CIDFont_type0_t1copen (CIDFont *font, const char *name,
return -1;
}
- cffont = cff_open(fp, offset, opt->index);
+ cffont = cff_open(fp, offset, 0);
if (!cffont) {
ERROR("Cannot read CFF font data");
}