1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00

Merge pull request #909 from notmasteryet/tree-45

Fixing TrueType code-glyph assigmnent to pass sanitizer
This commit is contained in:
Brendan Dahl 2011-12-09 17:22:47 -08:00
commit 853f16085f
4 changed files with 29 additions and 2 deletions

View file

@ -1765,7 +1765,7 @@ var Font = (function FontClosure() {
var hasShortCmap = !!cmapTable.hasShortCmap;
var toUnicode = this.toUnicode;
if (toUnicode) {
if (toUnicode && toUnicode.length > 0) {
// checking if cmap is just identity map
var isIdentity = true;
for (var i = 0, ii = glyphs.length; i < ii; i++) {
@ -1776,9 +1776,22 @@ var Font = (function FontClosure() {
}
// if it is, replacing with meaningful toUnicode values
if (isIdentity) {
var usedUnicodes = [], unassignedUnicodeItems = [];
for (var i = 0, ii = glyphs.length; i < ii; i++) {
var unicode = toUnicode[i + 1] || i + 1;
var unicode = toUnicode[i + 1];
if (!unicode || unicode in usedUnicodes) {
unassignedUnicodeItems.push(i);
continue;
}
glyphs[i].unicode = unicode;
usedUnicodes[unicode] = true;
}
var unusedUnicode = kCmapGlyphOffset;
for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j++) {
var i = unassignedUnicodeItems[j];
while (unusedUnicode in usedUnicodes)
unusedUnicode++;
glyphs[i].unicode = unusedUnicode++;
}
this.useToUnicode = true;
}