summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJjgod Jiang <gzjjgod@gmail.com>2014-08-03 11:26:22 +0000
committerJjgod Jiang <gzjjgod@gmail.com>2014-08-03 11:26:22 +0000
commit3b694f435dcd9dc4addcb764ba0d8aa4ffd01185 (patch)
treec31c4c6dec3dc552697feac3e627405eef8a2911 /Build
parent1831e6f2bd9fb7d5c72bedc49b6a7cebad7957c0 (diff)
Better fix for r34757
git-svn-id: svn://tug.org/texlive/trunk@34805 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfm-x/tt_cmap.c38
2 files changed, 21 insertions, 22 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 051c0126588..1504839cfa5 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-03 Jiang Jiang <gzjjgod@gmail.com>
+
+ * tt_cmap.c (sfnt_get_glyphname, handle_subst_glyphs): Fix error on
+ glyph name lookup.
+
2014-08-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* pdfobj.c: Fix a typo in check_for_pdf().
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c
index 757ad48fff7..4638b8628be 100644
--- a/Build/source/texk/dvipdfm-x/tt_cmap.c
+++ b/Build/source/texk/dvipdfm-x/tt_cmap.c
@@ -841,28 +841,15 @@ static int is_PUA_or_presentation (unsigned int uni)
}
static char*
-sfnt_get_glyphname(sfnt *sfont, USHORT gid) {
+sfnt_get_glyphname(struct tt_post_table *post, cff_font *cffont, USHORT gid)
+{
char* name = NULL;
- struct tt_post_table *post;
- post = tt_read_post_table(sfont);
- if (post) {
+ if (post)
name = tt_get_glyphname(post, gid);
- tt_release_post_table(post);
- }
-
- if (!name) {
- unsigned long offset = 0;
- cff_font *cffont = NULL;
- offset = sfnt_find_table_pos(sfont, "CFF ");
- if (offset > 0) {
- cffont = cff_open(sfont->stream, offset, 0);
-
- name = cff_get_glyphname(cffont, gid);
- cff_close(cffont);
- }
- }
+ if (!name && cffont && gid - 1 < cffont->charsets->num_entries)
+ name = cff_get_glyphname(cffont, gid);
return name;
}
@@ -879,10 +866,14 @@ sfnt_get_glyphname(sfnt *sfont, USHORT gid) {
static USHORT
handle_subst_glyphs (CMap *cmap,
CMap *cmap_add, const char *used_glyphs,
- sfnt *sfont)
+ sfnt *sfont, cff_font *cffont)
{
USHORT count;
USHORT i, gid;
+ struct tt_post_table *post = NULL;
+
+ if (!cmap_add)
+ post = tt_read_post_table(sfont);
for (count = 0, i = 0; i < 8192; i++) {
int j;
@@ -905,7 +896,7 @@ handle_subst_glyphs (CMap *cmap,
char* name;
long unicodes[MAX_UNICODES];
int unicode_count = -1;
- name = sfnt_get_glyphname(sfont, gid);
+ name = sfnt_get_glyphname(post, cffont, gid);
if (name) {
unicode_count = agl_get_unicodes(name, unicodes, MAX_UNICODES);
}
@@ -962,6 +953,9 @@ handle_subst_glyphs (CMap *cmap,
}
}
+ if (post)
+ tt_release_post_table(post);
+
return count;
}
@@ -1056,7 +1050,7 @@ create_ToUnicode_cmap4 (struct cmap4 *map,
}
}
- count += handle_subst_glyphs(cmap, cmap_add, used_glyphs_copy, sfont);
+ count += handle_subst_glyphs(cmap, cmap_add, used_glyphs_copy, sfont, cffont);
if (count < 1)
stream = NULL;
@@ -1128,7 +1122,7 @@ create_ToUnicode_cmap12 (struct cmap12 *map,
}
}
- count += handle_subst_glyphs(cmap, cmap_add, used_glyphs_copy, sfont);
+ count += handle_subst_glyphs(cmap, cmap_add, used_glyphs_copy, sfont, cffont);
if (count < 1)
stream = NULL;