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

Address review comment for pull #419

Browse Source
This commit is contained in:
Vivien Nicolas 2011-09-01 01:16:40 +02:00
parent 59c4ba0fb9
commit 81e1485e14
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fonts.js
View File

@ -2207,32 +2207,29 @@ var Type2CFF = (function() {
var nominalWidth = privDict['nominalWidthX']; var nominalWidth = privDict['nominalWidthX'];
var charstrings = []; var charstrings = [];
var differences = properties.differences;
var index = 0, code = 0;
var kCmapGlyphOffset = 0xE000; var kCmapGlyphOffset = 0xE000;
var differences = properties.differences;
var index = 0;
for (var i = 1; i < charsets.length; i++) { for (var i = 1; i < charsets.length; i++) {
var code = -1;
var glyph = charsets[i]; var glyph = charsets[i];
if (differences.length) { for (var j = index; j < differences.length; j++) {
for (var j = index; j < differences.length; j++) { if (differences[j]) {
if (differences[j]) { index = j;
index = j; code = differences.indexOf(glyph);
break; break;
}
} }
code = differences.indexOf(glyph);
if (code == -1)
code = properties.glyphs[glyph] || index;
} else {
code = GlyphsUnicode[glyph] || index;
index = code;
} }
if (!code) if (code == -1)
continue; index = code = properties.glyphs[glyph] || index;
var width = widths[code] || defaultWidth; var width = widths[code] || defaultWidth;
properties.encoding[index] = index + kCmapGlyphOffset; properties.encoding[index] = index + kCmapGlyphOffset;
charstrings.push({unicode: code + kCmapGlyphOffset, width: width, gid: i}); charstrings.push({
unicode: code + kCmapGlyphOffset,
width: width, gid: i
});
index++; index++;
} }

8
pdf.js
View File

@ -4281,10 +4281,6 @@ var PartialEvaluator = (function() {
case 'Type1': case 'Type1':
baseEncoding = Encodings.StandardEncoding.slice(); baseEncoding = Encodings.StandardEncoding.slice();
break; break;
case 'Type3':
// There is no baseEncoding for a Type3 font, the 'Encoding'
// entry is required and should provide a complete encoding
break;
default: default:
warn('Unknown type of font: ' + fontType); warn('Unknown type of font: ' + fontType);
break; break;
@ -4308,10 +4304,6 @@ var PartialEvaluator = (function() {
glyphsMap[glyph] = encodingMap[i] = GlyphsUnicode[glyph] || i; glyphsMap[glyph] = encodingMap[i] = GlyphsUnicode[glyph] || i;
} }
if (fontType == 'Type3')
log(glyphsMap);
if (fontType == 'TrueType' && fontDict.has('ToUnicode') && differences) { if (fontType == 'TrueType' && fontDict.has('ToUnicode') && differences) {
var cmapObj = xref.fetchIfRef(fontDict.get('ToUnicode')); var cmapObj = xref.fetchIfRef(fontDict.get('ToUnicode'));
if (IsName(cmapObj)) { if (IsName(cmapObj)) {