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

Fix the maxp table version in font to make it visible on Windows

Browse Source
This commit is contained in:
Calixte Denizet 2023-11-10 11:48:44 +01:00
parent f1122f048e
commit 59ce1a4a3f
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/fonts.js
View File

@ -292,6 +292,13 @@ function signedInt16(b0, b1) {
return value & (1 << 15) ? value - 0x10000 : value; return value & (1 << 15) ? value - 0x10000 : value;
} }
function writeUint32(bytes, index, value) {
bytes[index + 3] = value & 0xff;
bytes[index + 2] = value >>> 8;
bytes[index + 1] = value >>> 16;
bytes[index] = value >>> 24;
}
function int32(b0, b1, b2, b3) { function int32(b0, b1, b2, b3) {
return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3; return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
} }
@ -2642,9 +2649,21 @@ class Font {
} }
font.pos = (font.start || 0) + tables.maxp.offset; font.pos = (font.start || 0) + tables.maxp.offset;
const version = font.getInt32(); let version = font.getInt32();
const numGlyphs = font.getUint16(); const numGlyphs = font.getUint16();
if (version !== 0x00010000 && version !== 0x00005000) {
// https://learn.microsoft.com/en-us/typography/opentype/spec/maxp
if (tables.maxp.length === 6) {
version = 0x0005000;
} else if (tables.maxp.length >= 32) {
version = 0x00010000;
} else {
throw new FormatError(`"maxp" table has a wrong version number`);
}
writeUint32(tables.maxp.data, 0, version);
}
if (properties.scaleFactors?.length === numGlyphs && isTrueType) { if (properties.scaleFactors?.length === numGlyphs && isTrueType) {
const { scaleFactors } = properties; const { scaleFactors } = properties;
const isGlyphLocationsLong = int16( const isGlyphLocationsLong = int16(
@ -2695,7 +2714,7 @@ class Font {
} }
let maxFunctionDefs = 0; let maxFunctionDefs = 0;
let maxSizeOfInstructions = 0; let maxSizeOfInstructions = 0;
if (version >= 0x00010000 && tables.maxp.length >= 22) { if (version >= 0x00010000 && tables.maxp.length >= 32) {
// maxZones can be invalid // maxZones can be invalid
font.pos += 8; font.pos += 8;
const maxZones = font.getUint16(); const maxZones = font.getUint16();
@ -2761,7 +2780,7 @@ class Font {
// Some fonts have incorrect maxSizeOfInstructions values, so we use // Some fonts have incorrect maxSizeOfInstructions values, so we use
// the computed value instead. // the computed value instead.
if (version >= 0x00010000 && tables.maxp.length >= 22) { if (version >= 0x00010000 && tables.maxp.length >= 32) {
tables.maxp.data[26] = glyphsInfo.maxSizeOfInstructions >> 8; tables.maxp.data[26] = glyphsInfo.maxSizeOfInstructions >> 8;
tables.maxp.data[27] = glyphsInfo.maxSizeOfInstructions & 255; tables.maxp.data[27] = glyphsInfo.maxSizeOfInstructions & 255;
} }

2
test/pdfs/issue16839.pdf.link Normal file
View File

@ -0,0 +1,2 @@
https://github.com/mozilla/pdf.js/files/12356264/250125_010823.pdf

8
test/test_manifest.json
View File

@ -8206,5 +8206,13 @@
"link": true, "link": true,
"type": "eq", "type": "eq",
"annotations": true "annotations": true
},
{
"id": "issue16839",
"file": "pdfs/issue16839.pdf",
"md5": "413fceec0ac31e079dc487bf4c5e44d8",
"rounds": 1,
"link": true,
"type": "eq"
} }
] ]