summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorJjgod Jiang <gzjjgod@gmail.com>2015-04-25 13:49:46 +0000
committerJjgod Jiang <gzjjgod@gmail.com>2015-04-25 13:49:46 +0000
commit617788c107775973c8fe287ffb8ca28719cd2fe5 (patch)
treebd25a44191d7b1fb7448322447b7aef7b556903d /Build/source
parentc52e8b1c67289f8bfe6287709e4f168311dfb68b (diff)
Be more permissive about CFF dict parsing
Ignore CFF dict with unknown opcode instead of treating it as an error and immediately bail out. git-svn-id: svn://tug.org/texlive/trunk@37046 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfm-x/cff_dict.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 279e04fa8bb..edbfdbc02c1 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,5 +1,10 @@
2015-04-25 Jiang Jiang <gzjjgod@gmail.com>
+ * cff_dict.c: Be more permissive in CFF dict parsing, fix Yuppy SC
+ and Yuppy TC fonts support.
+
+2015-04-25 Jiang Jiang <gzjjgod@gmail.com>
+
* sfnt.c: Fix Mac TrueType font support.
bug found by Richard Koch <richardmoncriefkoch@icloud.com>.
diff --git a/Build/source/texk/dvipdfm-x/cff_dict.c b/Build/source/texk/dvipdfm-x/cff_dict.c
index d3543acf4db..8c30b7d13ab 100644
--- a/Build/source/texk/dvipdfm-x/cff_dict.c
+++ b/Build/source/texk/dvipdfm-x/cff_dict.c
@@ -301,7 +301,8 @@ static void add_dict (cff_dict *dict,
argtype = dict_operator[id].argtype;
if (dict_operator[id].opname == NULL || argtype < 0) {
- *status = CFF_ERROR_PARSE_ERROR;
+ /* YuppySC-Regular.otf from OS X for instance uses op id 37, simply ignore
+ this dict instead of treat it as parsing error. */
return;
}