summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/cid.c
diff options
context:
space:
mode:
authorJjgod Jiang <gzjjgod@gmail.com>2015-05-01 18:55:18 +0000
committerJjgod Jiang <gzjjgod@gmail.com>2015-05-01 18:55:18 +0000
commit5e6b94f3a7e84d822b9ef4e879bad736772a442a (patch)
treed809f66b3cefea98d4eb9a20c014a1d7e8fd08a9 /Build/source/texk/dvipdfm-x/cid.c
parentade74033ac5eb78a9d1218cbcad8d8c86c57a8dc (diff)
Combine all Type 0 open functions into one
They share a large chunk of the same code, so really shouldn't be split. git-svn-id: svn://tug.org/texlive/trunk@37142 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/cid.c')
-rw-r--r--Build/source/texk/dvipdfm-x/cid.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/Build/source/texk/dvipdfm-x/cid.c b/Build/source/texk/dvipdfm-x/cid.c
index ccfc0c711b9..dc2da3e8b77 100644
--- a/Build/source/texk/dvipdfm-x/cid.c
+++ b/Build/source/texk/dvipdfm-x/cid.c
@@ -621,12 +621,13 @@ CIDFont_cache_find (const char *map_name,
if (font_id == __cache->num) {
font = CIDFont_new();
- if (CIDFont_type0_open(font, map_name, cmap_csi, opt) < 0 &&
- CIDFont_type2_open(font, map_name, cmap_csi, opt) < 0 &&
- CIDFont_type0_t1open(font, map_name, cmap_csi, opt) < 0 &&
- CIDFont_type0_t1copen(font, map_name, cmap_csi, opt) < 0 &&
- CIDFont_base_open (font, map_name, cmap_csi, opt) < 0
- ) {
+ if (CIDFont_type0_open(font, map_name, cmap_csi, opt, 0) < 0 &&
+ CIDFont_type2_open(font, map_name, cmap_csi, opt) < 0 &&
+ CIDFont_type0_open(font, map_name, cmap_csi, opt,
+ CIDFONT_FLAG_TYPE1) < 0 &&
+ CIDFont_type0_open(font, map_name, cmap_csi, opt,
+ CIDFONT_FLAG_TYPE1C) < 0 &&
+ CIDFont_base_open (font, map_name, cmap_csi, opt) < 0) {
CIDFont_release(font);
release_opt(opt);
return -1;