mirror of
https://github.com/mozilla/pdf.js.git
synced 2026-08-02 20:37:21 +02:00
Recover CFF FontBBox with negative coordinates encoded as unsigned 16-bit
It fixes #21312.
This commit is contained in:
parent
5f2691e77d
commit
9391296036
@ -17,6 +17,7 @@ import {
|
|||||||
bytesToString,
|
bytesToString,
|
||||||
FormatError,
|
FormatError,
|
||||||
info,
|
info,
|
||||||
|
isArrayEqual,
|
||||||
shadow,
|
shadow,
|
||||||
stringToBytes,
|
stringToBytes,
|
||||||
Util,
|
Util,
|
||||||
@ -33,6 +34,20 @@ import { DataBuilder } from "./data_builder.js";
|
|||||||
// Maximum subroutine call depth of type 2 charstrings. Matches OTS.
|
// Maximum subroutine call depth of type 2 charstrings. Matches OTS.
|
||||||
const MAX_SUBR_NESTING = 10;
|
const MAX_SUBR_NESTING = 10;
|
||||||
|
|
||||||
|
function looksLikeUnsigned16BitNegative(coord) {
|
||||||
|
return coord > 0x7fff && coord <= 0xffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
function recoverSigned16BitBBox(bbox, onlyLowerLeft = false) {
|
||||||
|
return Util.normalizeRect(
|
||||||
|
bbox.map((coord, i) =>
|
||||||
|
(!onlyLowerLeft || i < 2) && looksLikeUnsigned16BitNegative(coord)
|
||||||
|
? coord - 0x10000
|
||||||
|
: coord
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The CFF class takes a Type1 file and wrap it into a
|
* The CFF class takes a Type1 file and wrap it into a
|
||||||
* 'Compact Font Format' which itself embed Type2 charstrings.
|
* 'Compact Font Format' which itself embed Type2 charstrings.
|
||||||
@ -268,13 +283,36 @@ class CFFParser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let fontBBox = topDict.getByName("FontBBox");
|
let fontBBox = topDict.getByName("FontBBox");
|
||||||
if (fontBBox?.every(coord => coord === 0) && properties.bbox) {
|
const descriptorBBox = properties.bbox?.some(coord => coord !== 0)
|
||||||
fontBBox = Util.normalizeRect(
|
? recoverSigned16BitBBox(properties.bbox)
|
||||||
properties.bbox.map(coord =>
|
: null;
|
||||||
coord > 0x7fff && coord <= 0xffff ? coord - 0x10000 : coord
|
const cffBBoxHasUnsignedLowerLeft = fontBBox
|
||||||
)
|
?.slice(0, 2)
|
||||||
);
|
.some(looksLikeUnsigned16BitNegative);
|
||||||
|
const cffBBoxHasUnsignedCoords = fontBBox?.some(
|
||||||
|
looksLikeUnsigned16BitNegative
|
||||||
|
);
|
||||||
|
if (fontBBox?.every(coord => coord === 0) && descriptorBBox) {
|
||||||
|
// The CFF FontBBox is empty, hence fall back to the FontDescriptor bbox.
|
||||||
|
fontBBox = descriptorBBox;
|
||||||
topDict.setByName("FontBBox", fontBBox);
|
topDict.setByName("FontBBox", fontBBox);
|
||||||
|
} else if (cffBBoxHasUnsignedCoords) {
|
||||||
|
const recoveredFontBBox = recoverSigned16BitBBox(fontBBox);
|
||||||
|
const descriptorCorroborates =
|
||||||
|
descriptorBBox &&
|
||||||
|
properties.bbox.some(coord => coord < 0) &&
|
||||||
|
!properties.bbox.some(looksLikeUnsigned16BitNegative) &&
|
||||||
|
isArrayEqual(recoveredFontBBox, descriptorBBox);
|
||||||
|
|
||||||
|
if (descriptorCorroborates || cffBBoxHasUnsignedLowerLeft) {
|
||||||
|
// Some Ghostscript-generated CFF fonts encode negative lower-left
|
||||||
|
// coordinates as unsigned 16-bit values. Preserve large upper-right
|
||||||
|
// coordinates unless the descriptor independently confirms the repair.
|
||||||
|
fontBBox = descriptorCorroborates
|
||||||
|
? recoveredFontBBox
|
||||||
|
: recoverSigned16BitBBox(fontBBox, /* onlyLowerLeft = */ true);
|
||||||
|
topDict.setByName("FontBBox", fontBBox);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (fontBBox?.some(coord => coord !== 0)) {
|
if (fontBBox?.some(coord => coord !== 0)) {
|
||||||
// adjusting ascent/descent
|
// adjusting ascent/descent
|
||||||
|
|||||||
1
test/pdfs/.gitignore
vendored
1
test/pdfs/.gitignore
vendored
@ -923,3 +923,4 @@
|
|||||||
!issue18032.pdf
|
!issue18032.pdf
|
||||||
!Embedded_font.pdf
|
!Embedded_font.pdf
|
||||||
!issue18548_reduced.pdf
|
!issue18548_reduced.pdf
|
||||||
|
!issue_cff_unsigned_bbox.pdf
|
||||||
|
|||||||
BIN
test/pdfs/issue_cff_unsigned_bbox.pdf
Normal file
BIN
test/pdfs/issue_cff_unsigned_bbox.pdf
Normal file
Binary file not shown.
@ -14320,5 +14320,12 @@
|
|||||||
"firstPage": 1,
|
"firstPage": 1,
|
||||||
"lastPage": 1,
|
"lastPage": 1,
|
||||||
"type": "eq"
|
"type": "eq"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "issue_cff_unsigned_bbox",
|
||||||
|
"file": "pdfs/issue_cff_unsigned_bbox.pdf",
|
||||||
|
"md5": "d2606e2c6cc9e679b8b88c2800c6e1a9",
|
||||||
|
"rounds": 1,
|
||||||
|
"type": "eq"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@ -154,6 +154,90 @@ describe("CFFParser", function () {
|
|||||||
expect(properties.ascentScaled).toEqual(true);
|
expect(properties.ascentScaled).toEqual(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("repairs a FontBBox with unsigned-encoded negative coordinates", function () {
|
||||||
|
// [-456, -305, 2158, 989] encoded as unsigned 16-bit values; produced
|
||||||
|
// by some Ghostscript-generated CFF fonts.
|
||||||
|
cff.topDict.setByName("FontBBox", [65080, 65231, 2158, 989]);
|
||||||
|
const fontDataRepaired = new CFFCompiler(cff).compile();
|
||||||
|
|
||||||
|
const properties = {
|
||||||
|
bbox: [-456, -305, 2158, 989],
|
||||||
|
};
|
||||||
|
const reparsedCff = new CFFParser(
|
||||||
|
new Stream(fontDataRepaired),
|
||||||
|
properties,
|
||||||
|
SEAC_ANALYSIS_ENABLED
|
||||||
|
).parse();
|
||||||
|
|
||||||
|
expect(reparsedCff.topDict.getByName("FontBBox")).toEqual([
|
||||||
|
-456, -305, 2158, 989,
|
||||||
|
]);
|
||||||
|
expect(properties.ascent).toEqual(989);
|
||||||
|
expect(properties.descent).toEqual(-305);
|
||||||
|
expect(properties.ascentScaled).toEqual(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("doesn't replace a repairable FontBBox with an empty descriptor bbox", function () {
|
||||||
|
cff.topDict.setByName("FontBBox", [65080, 65231, 2158, 989]);
|
||||||
|
const fontDataRepaired = new CFFCompiler(cff).compile();
|
||||||
|
|
||||||
|
const properties = {
|
||||||
|
bbox: [0, 0, 0, 0],
|
||||||
|
};
|
||||||
|
const reparsedCff = new CFFParser(
|
||||||
|
new Stream(fontDataRepaired),
|
||||||
|
properties,
|
||||||
|
SEAC_ANALYSIS_ENABLED
|
||||||
|
).parse();
|
||||||
|
|
||||||
|
expect(reparsedCff.topDict.getByName("FontBBox")).toEqual([
|
||||||
|
-456, -305, 2158, 989,
|
||||||
|
]);
|
||||||
|
expect(properties.ascent).toEqual(989);
|
||||||
|
expect(properties.descent).toEqual(-305);
|
||||||
|
expect(properties.ascentScaled).toEqual(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("repairs unsigned-encoded negative FontBBox without descriptor data", function () {
|
||||||
|
cff.topDict.setByName("FontBBox", [65080, 65231, 2158, 989]);
|
||||||
|
const fontDataRepaired = new CFFCompiler(cff).compile();
|
||||||
|
|
||||||
|
const properties = {};
|
||||||
|
const reparsedCff = new CFFParser(
|
||||||
|
new Stream(fontDataRepaired),
|
||||||
|
properties,
|
||||||
|
SEAC_ANALYSIS_ENABLED
|
||||||
|
).parse();
|
||||||
|
|
||||||
|
expect(reparsedCff.topDict.getByName("FontBBox")).toEqual([
|
||||||
|
-456, -305, 2158, 989,
|
||||||
|
]);
|
||||||
|
expect(properties.ascent).toEqual(989);
|
||||||
|
expect(properties.descent).toEqual(-305);
|
||||||
|
expect(properties.ascentScaled).toEqual(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves large positive upper FontBBox coordinates", function () {
|
||||||
|
cff.topDict.setByName("FontBBox", [0, -305, 40000, 989]);
|
||||||
|
const fontDataRepaired = new CFFCompiler(cff).compile();
|
||||||
|
|
||||||
|
const properties = {
|
||||||
|
bbox: [0, -305, 40000, 989],
|
||||||
|
};
|
||||||
|
const reparsedCff = new CFFParser(
|
||||||
|
new Stream(fontDataRepaired),
|
||||||
|
properties,
|
||||||
|
SEAC_ANALYSIS_ENABLED
|
||||||
|
).parse();
|
||||||
|
|
||||||
|
expect(reparsedCff.topDict.getByName("FontBBox")).toEqual([
|
||||||
|
0, -305, 40000, 989,
|
||||||
|
]);
|
||||||
|
expect(properties.ascent).toEqual(989);
|
||||||
|
expect(properties.descent).toEqual(-305);
|
||||||
|
expect(properties.ascentScaled).toEqual(true);
|
||||||
|
});
|
||||||
|
|
||||||
it("repairs likely Ghostscript-zeroed FDArray private defaults", function () {
|
it("repairs likely Ghostscript-zeroed FDArray private defaults", function () {
|
||||||
cff.isCIDFont = true;
|
cff.isCIDFont = true;
|
||||||
cff.topDict.setByName("ROS", [0, 0, 0]);
|
cff.topDict.setByName("ROS", [0, 0, 0]);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user