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

Address review comments of #409

Browse Source
This commit is contained in:
Vivien Nicolas 2011-08-31 13:42:10 +02:00
parent fbf92068b0
commit 19c6cef7cc
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fonts.js
View File

@ -415,10 +415,8 @@ var Font = (function Font() {
this.mimetype = 'font/opentype'; this.mimetype = 'font/opentype';
var subtype = properties.subtype; var subtype = properties.subtype;
if (subtype === 'Type1C') var cff = (subtype === 'Type1C') ? new Type2CFF(file, properties)
var cff = new Type2CFF(file, properties); : new CFF(name, file, properties);
else
var cff = new CFF(name, file, properties);
// Wrap the CFF data inside an OTF font file // Wrap the CFF data inside an OTF font file
data = this.convert(name, cff, properties); data = this.convert(name, cff, properties);
@ -2161,16 +2159,16 @@ var Type2CFF = (function() {
var bytes = this.bytes; var bytes = this.bytes;
var privateInfo = topDict['Private']; var privateInfo = topDict.Private;
var privOffset = privateInfo[1], privLength = privateInfo[0]; var privOffset = privateInfo[1], privLength = privateInfo[0];
var privBytes = bytes.subarray(privOffset, privOffset + privLength); var privBytes = bytes.subarray(privOffset, privOffset + privLength);
baseDict = this.parseDict(privBytes); baseDict = this.parseDict(privBytes);
var privDict = this.getPrivDict(baseDict, strings); var privDict = this.getPrivDict(baseDict, strings);
var charStrings = this.parseIndex(topDict['CharStrings']); var charStrings = this.parseIndex(topDict.CharStrings);
var charset = this.parseCharsets(topDict['charset'], var charset = this.parseCharsets(topDict.charset,
charStrings.length, strings); charStrings.length, strings);
var hasSupplement = this.parseEncoding(topDict['Encoding'], properties, var hasSupplement = this.parseEncoding(topDict.Encoding, properties,
strings, charset); strings, charset);
// The font sanitizer does not support CFF encoding with a // The font sanitizer does not support CFF encoding with a
@ -2179,7 +2177,7 @@ var Type2CFF = (function() {
// the top dictionary to let the sanitizer think the font use // the top dictionary to let the sanitizer think the font use
// StandardEncoding, that's a lie but that's ok. // StandardEncoding, that's a lie but that's ok.
if (hasSupplement) if (hasSupplement)
bytes[topDict['Encoding']] = 0; bytes[topDict.Encoding] = 0;
// charstrings contains info about glyphs (one element per glyph // charstrings contains info about glyphs (one element per glyph
// containing mappings for {unicode, width}) // containing mappings for {unicode, width})
@ -2258,7 +2256,6 @@ var Type2CFF = (function() {
encoding[index] = gid++; encoding[index] = gid++;
} }
} else { } else {
var format = bytes[pos++]; var format = bytes[pos++];
switch (format & 0x7f) { switch (format & 0x7f) {
case 0: case 0: