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

Simplify how we handle Type3 fonts without a /FontDescriptor dictionary

Browse Source 
Part of this is very old code, which we can now simplify a little bit.
This commit is contained in:
Jonas Jenwald 2025-05-19 13:19:45 +02:00
parent 5f5d9dfc28
commit c02ea0c681
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/evaluator.js
View File

@ -4313,12 +4313,9 @@ class PartialEvaluator {
if (!descriptor) { if (!descriptor) {
if (isType3Font) { if (isType3Font) {
const bbox = lookupNormalRect(dict.getArray("FontBBox"), [0, 0, 0, 0]);
// FontDescriptor is only required for Type3 fonts when the document // FontDescriptor is only required for Type3 fonts when the document
// is a tagged pdf. Create a barbebones one to get by. // is a tagged pdf.
descriptor = new Dict(null); descriptor = Dict.empty;
descriptor.set("FontName", Name.get(type));
descriptor.set("FontBBox", bbox);
} else { } else {
// Before PDF 1.5 if the font was one of the base 14 fonts, having a // Before PDF 1.5 if the font was one of the base 14 fonts, having a
// FontDescriptor was not required. // FontDescriptor was not required.
@ -4422,8 +4419,8 @@ class PartialEvaluator {
const baseFontStr = baseFont?.name; const baseFontStr = baseFont?.name;
if (isType3Font) { if (isType3Font) {
if (!fontNameStr) { if (!fontNameStr) {
// The Type3 font has a /FontDescriptor, however it's incomplete, hence // Since the /FontDescriptor is optional in Type3 fonts, ensure that we
// why we didn't create a barbebones one above (fixes issue19954.pdf). // always have a "valid" /FontName (fixes issue19954.pdf).
fontName = Name.get(type); fontName = Name.get(type);
} }
} else if (fontNameStr !== baseFontStr) { } else if (fontNameStr !== baseFontStr) {
@ -4444,8 +4441,8 @@ class PartialEvaluator {
) { ) {
fontName = null; fontName = null;
} }
fontName ||= baseFont;
} }
fontName ||= baseFont;
if (!(fontName instanceof Name)) { if (!(fontName instanceof Name)) {
throw new FormatError("invalid font name"); throw new FormatError("invalid font name");
@ -4523,7 +4520,7 @@ class PartialEvaluator {
); );
const bbox = lookupNormalRect( const bbox = lookupNormalRect(
descriptor.getArray("FontBBox") || dict.getArray("FontBBox"), descriptor.getArray("FontBBox") || dict.getArray("FontBBox"),
undefined isType3Font ? [0, 0, 0, 0] : undefined
); );
let ascent = descriptor.get("Ascent"); let ascent = descriptor.get("Ascent");
if (typeof ascent !== "number") { if (typeof ascent !== "number") {
@ -4711,9 +4708,9 @@ class TranslatedFont {
const fontResources = this.dict.get("Resources") || resources; const fontResources = this.dict.get("Resources") || resources;
const charProcOperatorList = Object.create(null); const charProcOperatorList = Object.create(null);
const fontBBox = Util.normalizeRect(font.bbox || [0, 0, 0, 0]), const [x0, y0, x1, y1] = font.bbox,
width = fontBBox[2] - fontBBox[0], width = x1 - x0,
height = fontBBox[3] - fontBBox[1]; height = y1 - y0;
const fontBBoxSize = Math.hypot(width, height); const fontBBoxSize = Math.hypot(width, height);
for (const key of charProcs.getKeys()) { for (const key of charProcs.getKeys()) {