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

Fix another seac regression (issue 4801)

Browse source
This commit is contained in:
Jonas Jenwald 2014-06-23 20:55:51 +02:00
parent faa9020119
commit f13c217b25
4 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/core/fonts.js
View file

@ -4110,18 +4110,28 @@ var Font = (function FontClosure() {
this.toFontChar = newMapping.toFontChar;
var numGlyphs = font.numGlyphs;
function getCharCode(charCodeToGlyphId, glyphId, addMap) {
function getCharCodes(charCodeToGlyphId, glyphId) {
var charCodes = null;
for (var charCode in charCodeToGlyphId) {
if (glyphId === charCodeToGlyphId[charCode]) {
if (!charCodes) {
charCodes = [];
}
charCodes.push(charCode | 0);
}
}
return charCodes;
}
function createCharCode(charCodeToGlyphId, glyphId) {
for (var charCode in charCodeToGlyphId) {
if (glyphId === charCodeToGlyphId[charCode]) {
return charCode | 0;
}
}
if (addMap) {
newMapping.charCodeToGlyphId[newMapping.nextAvailableFontCharCode] =
glyphId;
return newMapping.nextAvailableFontCharCode++;
}
return null;
newMapping.charCodeToGlyphId[newMapping.nextAvailableFontCharCode] =
glyphId;
return newMapping.nextAvailableFontCharCode++;
}
var seacs = font.seacs;
@ -4144,24 +4154,27 @@ var Font = (function FontClosure() {
y: seac[0] * matrix[1] + seac[1] * matrix[3] + matrix[5]
};
var charCode = getCharCode(mapping, glyphId);
if (charCode === null) {
var charCodes = getCharCodes(mapping, glyphId);
if (!charCodes) {
// There's no point in mapping it if the char code was never mapped
// to begin with.
continue;
}
// Find a fontCharCode that maps to the base and accent glyphs. If one
// doesn't exists, create it.
var charCodeToGlyphId = newMapping.charCodeToGlyphId;
var baseFontCharCode = getCharCode(charCodeToGlyphId, baseGlyphId,
true);
var accentFontCharCode = getCharCode(charCodeToGlyphId, accentGlyphId,
true);
seacMap[charCode] = {
baseFontCharCode: baseFontCharCode,
accentFontCharCode: accentFontCharCode,
accentOffset: accentOffset
};
for (var i = 0, ii = charCodes.length; i < ii; i++) {
var charCode = charCodes[i];
// Find a fontCharCode that maps to the base and accent glyphs.
// If one doesn't exists, create it.
var charCodeToGlyphId = newMapping.charCodeToGlyphId;
var baseFontCharCode = createCharCode(charCodeToGlyphId,
baseGlyphId);
var accentFontCharCode = createCharCode(charCodeToGlyphId,
accentGlyphId);
seacMap[charCode] = {
baseFontCharCode: baseFontCharCode,
accentFontCharCode: accentFontCharCode,
accentOffset: accentOffset
};
}
}
properties.seacMap = seacMap;
}