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

Ask chromium to shut up on font/otf mimetype by using another wrong mimetype and fix a few more 'strict mode' errrors

Browse Source
This commit is contained in:
Vivien Nicolas 2011-06-19 03:04:15 +02:00
parent 7517256e54
commit a46ebe73ff
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fonts.js
View File

@ -93,7 +93,7 @@ var Font = function(aName, aFile, aProperties) {
switch (aProperties.type) { switch (aProperties.type) {
case "Type1": case "Type1":
var cff = new CFF(aName, aFile, aProperties); var cff = new CFF(aName, aFile, aProperties);
this.mimetype = "font/otf"; this.mimetype = "font/opentype";
// Wrap the CFF data inside an OTF font file // Wrap the CFF data inside an OTF font file
this.font = this.cover(aName, cff, aProperties); this.font = this.cover(aName, cff, aProperties);
@ -112,7 +112,7 @@ var Font = function(aName, aFile, aProperties) {
cache: Object.create(null) cache: Object.create(null)
}; };
this.mimetype = "font/ttf"; this.mimetype = "font/opentype";
var ttf = new TrueType(aFile); var ttf = new TrueType(aFile);
this.font = ttf.data; this.font = ttf.data;
break; break;
@ -392,7 +392,7 @@ Font.prototype = {
"undefined" // Designer "undefined" // Designer
]; ];
name = [ var name = [
0x00, 0x00, // format 0x00, 0x00, // format
0x00, 0x0A, // Number of names Record 0x00, 0x0A, // Number of names Record
0x00, 0x7E // Storage 0x00, 0x7E // Storage
@ -703,7 +703,7 @@ var TrueType = function(aFile) {
// missing, which means that we need to rebuild the font in order to pass // missing, which means that we need to rebuild the font in order to pass
// the sanitizer. // the sanitizer.
if (requiredTables.length && requiredTables[0] == "OS/2") { if (requiredTables.length && requiredTables[0] == "OS/2") {
OS2 = [ var OS2 = [
0x00, 0x03, // version 0x00, 0x03, // version
0x02, 0x24, // xAvgCharWidth 0x02, 0x24, // xAvgCharWidth
0x01, 0xF4, // usWeightClass 0x01, 0xF4, // usWeightClass
@ -793,10 +793,14 @@ var TrueType = function(aFile) {
offsets.currentOffset++; offsets.currentOffset++;
} }
this.data = ttf; var fontData = [];
for (var i = 0; i < offsets.currentOffset; i++)
fontData.push(ttf[i]);
this.data = fontData;
return; return;
} else if (requiredTables.lenght) { } else if (requiredTables.lenght) {
error("Table " + requiredTables[0] + " is missing from the TruType font"); error("Table " + requiredTables[0] + " is missing from the TrueType font");
} else { } else {
this.data = aFile; this.data = aFile;
} }