mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-25 17:48:07 +02:00
Fix glyph 0 in CIDFontType2 that has a CIDToGIDMap stream
This commit is contained in:
parent
83f6de3cf8
commit
05c527f035
5 changed files with 26 additions and 9 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue