summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/font
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-03-09 22:53:09 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-03-09 22:53:09 +0000
commit5fb8104fddfa73649ef0fde6b7b0cbfd53def358 (patch)
tree830d92cde3f9d6b168b949a28704a0c8960b55e9 /Build/source/texk/web2c/luatexdir/font
parent1f16f479df5678daa28b623d9d747b84b3bd0e30 (diff)
web2c/luatexdir: sync sith the upstream
git-svn-id: svn://tug.org/texlive/trunk@39981 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/font')
-rw-r--r--Build/source/texk/web2c/luatexdir/font/vfovf.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/font/writecff.w6
2 files changed, 5 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/vfovf.w b/Build/source/texk/web2c/luatexdir/font/vfovf.w
index 80b35f9ea22..df970ff4d11 100644
--- a/Build/source/texk/web2c/luatexdir/font/vfovf.w
+++ b/Build/source/texk/web2c/luatexdir/font/vfovf.w
@@ -217,7 +217,7 @@ vf_def_font(internal_font_number f, unsigned char *vf_buffer, int *vf_cr)
four_quarters cs;
memory_word tmp_w; /* accumulator */
int junk;
- unsigned long checksum;
+ unsigned int checksum;
cs.b0 = vf_buffer[(*vf_cr)];
cs.b1 = vf_buffer[(*vf_cr) + 1];
cs.b2 = vf_buffer[(*vf_cr) + 2];
diff --git a/Build/source/texk/web2c/luatexdir/font/writecff.w b/Build/source/texk/web2c/luatexdir/font/writecff.w
index 3f4a4e58879..5955104845f 100644
--- a/Build/source/texk/web2c/luatexdir/font/writecff.w
+++ b/Build/source/texk/web2c/luatexdir/font/writecff.w
@@ -3353,7 +3353,6 @@ void write_cid_cff(PDF pdf, cff_font * cffont, fd_entry * fd)
((2 * (unsigned) cid_count) * sizeof(unsigned char)));
memset(CIDToGIDMap, 0, (size_t) (2 * cid_count));
-
glyph = xtalloc(1, glw_entry);
/* insert notdef */
glyph->id = 0;
@@ -3367,7 +3366,10 @@ void write_cid_cff(PDF pdf, cff_font * cffont, fd_entry * fd)
for (cid = 0; cid <= CID_MAX; cid++) {
glyph->id = (unsigned) cid;
if (avl_find(fd->gl_tree, glyph) != NULL) {
- gid = (card16) cff_charsets_lookup(cffont, (card16) cid);
+ /*
+ gid = (card16) cff_charsets_lookup(cffont, (card16) cid);
+ */
+ gid = (card16) cid;
CIDToGIDMap[2 * cid] = (unsigned char) ((gid >> 8) & 0xff);
CIDToGIDMap[2 * cid + 1] = (unsigned char) (gid & 0xff);
last_cid = (card16) cid;