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 glyph 0 in CIDFontType2 that has a CIDToGIDMap stream

Browse source
This commit is contained in:
Jani Pehkonen 2019-05-07 18:44:37 +03:00
parent 83f6de3cf8
commit 05c527f035
5 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/core/evaluator.js
View file

@ -1827,7 +1827,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
extractDataStructures:
function PartialEvaluator_extractDataStructures(dict, baseDict,
properties) {
var xref = this.xref;
let xref = this.xref, cidToGidBytes;
// 9.10.2
var toUnicode = (dict.get('ToUnicode') || baseDict.get('ToUnicode'));
var toUnicodePromise = toUnicode ?
@ -1846,7 +1846,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var cidToGidMap = dict.get('CIDToGIDMap');
if (isStream(cidToGidMap)) {
properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
cidToGidBytes = cidToGidMap.getBytes();
}
}
@ -1929,8 +1929,12 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
return toUnicodePromise.then((toUnicode) => {
properties.toUnicode = toUnicode;
return this.buildToUnicode(properties);
}).then(function (toUnicode) {
}).then((toUnicode) => {
properties.toUnicode = toUnicode;
if (cidToGidBytes) {
properties.cidToGidMap = this.readCidToGidMap(cidToGidBytes,
toUnicode);
}
return properties;
});
},
@ -2146,18 +2150,17 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
return Promise.resolve(null);
},
readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
readCidToGidMap(glyphsData, toUnicode) {
// Extract the encoding from the CIDToGIDMap
var glyphsData = cidToGidStream.getBytes();
// Set encoding 0 to later verify the font has an encoding
var result = [];
for (var j = 0, jj = glyphsData.length; j < jj; j++) {
var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
if (glyphID === 0) {
const code = j >> 1;
if (glyphID === 0 && !toUnicode.has(code)) {
continue;
}
var code = j >> 1;
result[code] = glyphID;
}
return result;

11
src/core/fonts.js
View file

@ -1606,7 +1606,8 @@ var Font = (function FontClosure() {
};
}
function sanitizeMetrics(font, header, metrics, numGlyphs) {
function sanitizeMetrics(font, header, metrics, numGlyphs,
dupFirstEntry) {
if (!header) {
if (metrics) {
metrics.data = null;
@ -1649,6 +1650,11 @@ var Font = (function FontClosure() {
// the use of |numMissing * 2| when initializing the typed array.
var entries = new Uint8Array(metrics.length + numMissing * 2);
entries.set(metrics.data);
if (dupFirstEntry) {
// Set the sidebearing value of the duplicated glyph.
entries[metrics.length] = metrics.data[2];
entries[metrics.length + 1] = metrics.data[3];
}
metrics.data = entries;
}
}
@ -2366,7 +2372,8 @@ var Font = (function FontClosure() {
// Ensure the hmtx table contains the advance width and
// sidebearings information for numGlyphs in the maxp table
sanitizeMetrics(font, tables['hhea'], tables['hmtx'], numGlyphsOut);
sanitizeMetrics(font, tables['hhea'], tables['hmtx'], numGlyphsOut,
dupFirstEntry);
if (!tables['head']) {
throw new FormatError('Required "head" table is not found');