Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Xavier Fung 2012-07-12 16:45:21 +08:00
commit 3088de6b6e

View File

@ -2773,14 +2773,16 @@ var Font = (function FontClosure() {
} }
} }
for (var index in newGlyphUnicodes) { for (var index in newGlyphUnicodes) {
var unicode = newGlyphUnicodes[index]; if (newGlyphUnicodes.hasOwnProperty(index)) {
if (reverseMap[unicode]) { var unicode = newGlyphUnicodes[index];
// avoiding assigning to the same unicode if (reverseMap[unicode]) {
glyphs[index].unicode = unusedUnicode++; // avoiding assigning to the same unicode
continue; glyphs[index].unicode = unusedUnicode++;
continue;
}
glyphs[index].unicode = unicode;
reverseMap[unicode] = index;
} }
glyphs[index].unicode = unicode;
reverseMap[unicode] = index;
} }
this.useToFontChar = true; this.useToFontChar = true;
} }