Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-06-22 16:05:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21469 from calixteman/issue21466

Browse Source 
Avoid too long BlueScale value when rewriting a CFF font
This commit is contained in:
calixteman 2026-06-18 21:43:05 +02:00 committed by GitHub
commit e20c810dd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/cff_parser.js
View File

@ -902,10 +902,14 @@ class CFFParser {
// BlueScale up only misaligns/collapses overshooting glyphs (notably
// with macOS's Core Text rasterizer). Only apply the lower clamp when
// its target does not exceed the default.
// Round the bound in order to avoid too long operand (issue 21466).
const PRECISION = 1e5;
const lowerBound = 0.5 / maxZoneHeight;
const minBlueScale =
lowerBound <= DEFAULT_BLUE_SCALE ? lowerBound : -Infinity;
const maxBlueScale = 1 / maxZoneHeight;
lowerBound <= DEFAULT_BLUE_SCALE
? Math.ceil(lowerBound * PRECISION) / PRECISION
: -Infinity;
const maxBlueScale = Math.floor(PRECISION / maxZoneHeight) / PRECISION;
const clamped = MathClamp(blueScale, minBlueScale, maxBlueScale);
if (clamped !== blueScale) {
privateDict.setByName("BlueScale", clamped);

23
test/unit/cff_parser_spec.js
View File

@ -389,6 +389,29 @@ describe("CFFParser", function () {
);
});
it("clamps BlueScale to a short decimal so the recompiled operand stays compact", function () {
// maxZoneHeight = 13 gives lower bound (0.5 / 13 = 0.038461538461538464)
// which is too long (issue 21466).
cff.topDict.privateDict = new CFFPrivateDict(cff.strings);
cff.topDict.privateDict.setByName(
"BlueValues",
[-13, 13, 530, 13, 220, 13, 30, 13]
);
cff.topDict.privateDict.setByName("BlueScale", 0.01);
cff.topDict.setByName("Private", [0, 0]);
const fontDataShortBlueScale = new CFFCompiler(cff).compile();
const reparsedCff = new CFFParser(
new Stream(fontDataShortBlueScale),
{},
SEAC_ANALYSIS_ENABLED
).parse();
const blueScale = reparsedCff.topDict.privateDict.getByName("BlueScale");
expect(blueScale).toEqual(0.03847);
expect(new CFFCompiler(cff).encodeFloat(blueScale).length).toBeLessThan(6);
});
it("refuses to add topDict key with invalid value (bug 1068432)", function () {
const topDict = cff.topDict;
const defaultValue = topDict.getByName("UnderlinePosition");