Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong dict data offset when there is many charstrings

Browse Source
This commit is contained in:
Vivien Nicolas 2011-08-26 17:18:18 +02:00
parent 1cf4fc8782
commit 4a320705c0
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fonts.js
View File

@ -1848,7 +1848,7 @@ CFF.prototype = {
if (count == 0)
return '\x00\x00\x00';
var data = String.fromCharCode(count >> 8, count & 0xff);
var data = String.fromCharCode((count >> 8) & 0xFF, count & 0xff);
// Next byte contains the offset size use to reference object in the file
// Actually we're using 0x04 to be sure to be able to store everything
@ -1881,9 +1881,7 @@ CFF.prototype = {
String.fromCharCode((value >> 8) & 0xFF) +
String.fromCharCode(value & 0xFF);
} else if (value >= (-2147483648) && value <= 2147483647) {
value ^= 0xffffffff;
value += 1;
return '\xff' +
return '\x1d' +
String.fromCharCode((value >> 24) & 0xFF) +
String.fromCharCode((value >> 16) & 0xFF) +
String.fromCharCode((value >> 8) & 0xFF) +
@ -2021,8 +2019,8 @@ CFF.prototype = {
'topDict': (function topDict(self) {
return function() {
var header = '\x00\x01\x01\x01';
var dict =
'\x00\x01\x01\x01\x30' +
'\xf8\x1b\x00' + // version
'\xf8\x1c\x01' + // Notice
'\xf8\x1d\x02' + // FullName
@ -2037,19 +2035,29 @@ CFF.prototype = {
var offset = fields.header.length +
fields.names.length +
(dict.length + (4 + 4 + 7)) +
(header.length + 1) +
(dict.length + (4 + 4)) +
fields.strings.length +
fields.globalSubrs.length;
// If the offset if over 32767, encodeNumber is going to return
// 5 bytes to encode the position instead of 3.
if ((offset + fields.charstrings.length) > 32767) {
offset += 9;
} else {
offset += 7;
}
dict += self.encodeNumber(offset) + '\x0f'; // Charset
offset = offset + (glyphs.length * 2) + 1;
dict += self.encodeNumber(offset) + '\x11'; // Charstrings
dict += self.encodeNumber(fields.private.length);
offset = offset + fields.charstrings.length;
dict += self.encodeNumber(fields.private.length);
dict += self.encodeNumber(offset) + '\x12'; // Private
return dict;
return header + String.fromCharCode(dict.length + 1) + dict;
};
})(this),

10
pdf.js
View File

@ -4294,6 +4294,10 @@ var PartialEvaluator = (function() {
if (fontDict.has('ToUnicode')) {
encodingMap['empty'] = true;
var glyphsMap = {};
for (var p in glyphMap)
glyphsMap[glyphMap[p]] = encodingMap[p];
var cmapObj = xref.fetchIfRef(fontDict.get('ToUnicode'));
if (IsName(cmapObj)) {
error('ToUnicode file cmap translation not implemented');
@ -4425,16 +4429,12 @@ var PartialEvaluator = (function() {
glyphWidths[unicode++] = widths[i];
}
var glyphsMap = {};
for (var p in glyphMap)
glyphsMap[glyphMap[p]] = encodingMap[p];
var properties = {
type: subType.name,
subtype: fileType,
widths: glyphWidths,
encoding: encodingMap,
glyphs: glyphsMap,
glyphs: glyphsMap || GlyphsUnicode,
builtInEncoding: builtInEncoding,
charset: charset,
firstChar: fontDict.get('FirstChar'),