Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing duplicates in cmap

Browse Source
This commit is contained in:
notmasteryet 2011-10-29 21:55:43 -05:00
parent a1d2c1c6d3
commit aaad824f77
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fonts.js
View File

@ -1432,7 +1432,7 @@ var Font = (function Font() {
var glyphCode = offsetIndex < 0 ? j : var glyphCode = offsetIndex < 0 ? j :
offsets[offsetIndex + j - start]; offsets[offsetIndex + j - start];
glyphCode = (glyphCode + delta) & 0xFFFF; glyphCode = (glyphCode + delta) & 0xFFFF;
if (glyphCode == 0) if (glyphCode == 0 || isAdaptedUnicode(j))
continue; continue;
var unicode = adaptUnicode(j); var unicode = adaptUnicode(j);
@ -1457,6 +1457,9 @@ var Font = (function Font() {
for (var j = 0; j < entryCount; j++) { for (var j = 0; j < entryCount; j++) {
var glyphCode = int16(font.getBytes(2)); var glyphCode = int16(font.getBytes(2));
var code = firstCode + j; var code = firstCode + j;
if (isAdaptedUnicode(glyphCode))
continue;
var unicode = adaptUnicode(code); var unicode = adaptUnicode(code);
glyphs.push({ unicode: unicode, code: code }); glyphs.push({ unicode: unicode, code: code });
ids.push(glyphCode); ids.push(glyphCode);
@ -2754,14 +2757,23 @@ CFF.prototype = {
var reverseMapping = {}; var reverseMapping = {};
var encoding = properties.baseEncoding; var encoding = properties.baseEncoding;
var differences = properties.differences; var differences = properties.differences;
var i, length; var usedIn = [];
var i, length, glyphName;
for (i = 0, length = encoding.length; i < length; ++i) { for (i = 0, length = encoding.length; i < length; ++i) {
if (encoding[i] && !isSpecialUnicode(i)) glyphName = encoding[i];
reverseMapping[encoding[i]] = i; if (!glyphName || isSpecialUnicode(i))
continue;
reverseMapping[glyphName] = i;
usedIn[i] = glyphName;
} }
for (i = 0, length = differences.length; i < length; ++i) { for (i = 0, length = differences.length; i < length; ++i) {
if (differences[i] && !isSpecialUnicode(i)) glyphName = differences[i];
reverseMapping[differences[i]] = i; if (!glyphName || isSpecialUnicode(i))
continue;
if (usedIn[i])
delete reverseMapping[usedIn[i]];
reverseMapping[glyphName] = i;
usedIn[i] = glyphName;
} }
reverseMapping['.notdef'] = 0; reverseMapping['.notdef'] = 0;
var unusedUnicode = kCmapGlyphOffset; var unusedUnicode = kCmapGlyphOffset;