From e37dcaa02961976c580069d3c14a4efaf9bb2b21 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Tue, 30 Apr 2024 08:47:14 +0200 Subject: [PATCH] Introduce helper functions for parsing /Matrix and /BBox arrays --- src/core/annotation.js | 47 +++++++++++++++--------------------------- src/core/core_utils.js | 19 +++++++++++++++++ src/core/document.js | 10 +++++---- src/core/evaluator.js | 40 ++++++++++++++--------------------- src/core/pattern.js | 16 ++++++-------- 5 files changed, 63 insertions(+), 69 deletions(-) diff --git a/src/core/annotation.js b/src/core/annotation.js index 2995965dd69c1f..1402f32ead63c1 100644 --- a/src/core/annotation.js +++ b/src/core/annotation.js @@ -44,6 +44,9 @@ import { getRotationMatrix, isAscii, isNumberArray, + lookupMatrix, + lookupNormalRect, + lookupRect, numberToString, stringToUTF16String, } from "./core_utils.js"; @@ -915,9 +918,7 @@ class Annotation { * @param {Array} rectangle - The rectangle array with exactly four entries */ setRectangle(rectangle) { - this.rectangle = isNumberArray(rectangle, 4) - ? Util.normalizeRect(rectangle) - : [0, 0, 0, 0]; + this.rectangle = lookupNormalRect(rectangle, [0, 0, 0, 0]); } /** @@ -1150,14 +1151,11 @@ class Annotation { ["ExtGState", "ColorSpace", "Pattern", "Shading", "XObject", "Font"], appearance ); - let bbox = appearanceDict.getArray("BBox"); - if (!isNumberArray(bbox, 4)) { - bbox = [0, 0, 1, 1]; - } - let matrix = appearanceDict.getArray("Matrix"); - if (!isNumberArray(matrix, 6)) { - matrix = [1, 0, 0, 1, 0, 0]; - } + const bbox = lookupRect(appearanceDict.getArray("BBox"), [0, 0, 1, 1]); + const matrix = lookupMatrix( + appearanceDict.getArray("Matrix"), + IDENTITY_MATRIX + ); const transform = getTransformMatrix(rect, bbox, matrix); const opList = new OperatorList(); @@ -1254,14 +1252,8 @@ class Annotation { if (text.length > 1 || text[0]) { const appearanceDict = this.appearance.dict; - let bbox = appearanceDict.getArray("BBox"); - if (!isNumberArray(bbox, 4)) { - bbox = null; - } - let matrix = appearanceDict.getArray("Matrix"); - if (!isNumberArray(matrix, 6)) { - matrix = null; - } + const bbox = lookupRect(appearanceDict.getArray("BBox"), null); + const matrix = lookupMatrix(appearanceDict.getArray("Matrix"), null); this.data.textPosition = this._transformPoint( firstPosition, @@ -2987,8 +2979,10 @@ class ButtonWidgetAnnotation extends WidgetAnnotation { : this.uncheckedAppearance; if (appearance) { const savedAppearance = this.appearance; - const matrix = appearance.dict.getArray("Matrix"); - const savedMatrix = isNumberArray(matrix, 6) ? matrix : IDENTITY_MATRIX; + const savedMatrix = lookupMatrix( + appearance.dict.getArray("Matrix"), + IDENTITY_MATRIX + ); if (rotation) { appearance.dict.set( @@ -3753,11 +3747,7 @@ class PopupAnnotation extends Annotation { warn("Popup annotation has a missing or invalid parent annotation."); return; } - - const parentRect = parentItem.getArray("Rect"); - this.data.parentRect = isNumberArray(parentRect, 4) - ? Util.normalizeRect(parentRect) - : null; + this.data.parentRect = lookupNormalRect(parentItem.getArray("Rect"), null); const rt = parentItem.get("RT"); if (isName(rt, AnnotationReplyType.GROUP)) { @@ -4045,10 +4035,7 @@ class LineAnnotation extends MarkupAnnotation { this.data.hasOwnCanvas = this.data.noRotate; this.data.noHTML = false; - let lineCoordinates = dict.getArray("L"); - if (!isNumberArray(lineCoordinates, 4)) { - lineCoordinates = [0, 0, 0, 0]; - } + const lineCoordinates = lookupRect(dict.getArray("L"), [0, 0, 0, 0]); this.data.lineCoordinates = Util.normalizeRect(lineCoordinates); if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) { diff --git a/src/core/core_utils.js b/src/core/core_utils.js index e62efc123d93f7..a84373d1614ac8 100644 --- a/src/core/core_utils.js +++ b/src/core/core_utils.js @@ -19,6 +19,7 @@ import { BaseException, objectSize, stringToPDFString, + Util, warn, } from "../shared/util.js"; import { Dict, isName, Ref, RefSet } from "./primitives.js"; @@ -248,6 +249,21 @@ function isNumberArray(arr, len) { ); } +// Returns the matrix, or the fallback value if it's invalid. +function lookupMatrix(arr, fallback) { + return isNumberArray(arr, 6) ? arr : fallback; +} + +// Returns the rectangle, or the fallback value if it's invalid. +function lookupRect(arr, fallback) { + return isNumberArray(arr, 4) ? arr : fallback; +} + +// Returns the normalized rectangle, or the fallback value if it's invalid. +function lookupNormalRect(arr, fallback) { + return isNumberArray(arr, 4) ? Util.normalizeRect(arr) : fallback; +} + /** * AcroForm field names use an array like notation to refer to * repeated XFA elements e.g. foo.bar[nnn]. @@ -671,6 +687,9 @@ export { isNumberArray, isWhiteSpace, log2, + lookupMatrix, + lookupNormalRect, + lookupRect, MissingDataException, numberToString, ParserEOFException, diff --git a/src/core/document.js b/src/core/document.js index 41853455a6f867..8e6c2243bc82bf 100644 --- a/src/core/document.js +++ b/src/core/document.js @@ -39,8 +39,8 @@ import { collectActions, getInheritableProperty, getNewAnnotationsMap, - isNumberArray, isWhiteSpace, + lookupNormalRect, MissingDataException, PDF_VERSION_REGEXP, validateCSSFont, @@ -161,10 +161,12 @@ class Page { if (this.xfaData) { return this.xfaData.bbox; } - let box = this._getInheritableProperty(name, /* getArray = */ true); + const box = lookupNormalRect( + this._getInheritableProperty(name, /* getArray = */ true), + null + ); - if (isNumberArray(box, 4)) { - box = Util.normalizeRect(box); + if (box) { if (box[2] - box[0] > 0 && box[3] - box[1] > 0) { return box; } diff --git a/src/core/evaluator.js b/src/core/evaluator.js index a5a9cb98ea1b9e..f78d2d2e91a448 100644 --- a/src/core/evaluator.js +++ b/src/core/evaluator.js @@ -53,6 +53,7 @@ import { import { getTilingPatternIR, Pattern } from "./pattern.js"; import { getXfaFontDict, getXfaFontName } from "./xfa_fonts.js"; import { IdentityToUnicodeMap, ToUnicodeMap } from "./to_unicode_map.js"; +import { isNumberArray, lookupMatrix, lookupNormalRect } from "./core_utils.js"; import { isPDFFunction, PDFFunctionFactory } from "./function.js"; import { Lexer, Parser } from "./parser.js"; import { @@ -73,7 +74,6 @@ import { getGlyphsUnicode } from "./glyphlist.js"; import { getMetrics } from "./metrics.js"; import { getUnicodeForGlyph } from "./unicode.js"; import { ImageResizer } from "./image_resizer.js"; -import { isNumberArray } from "./core_utils.js"; import { MurmurHash3_64 } from "../shared/murmurhash3.js"; import { OperatorList } from "./operator_list.js"; import { PDFImage } from "./image.js"; @@ -460,12 +460,8 @@ class PartialEvaluator { localColorSpaceCache ) { const dict = xobj.dict; - let matrix = dict.getArray("Matrix"); - if (!isNumberArray(matrix, 6)) { - matrix = null; - } - let bbox = dict.getArray("BBox"); - bbox = isNumberArray(bbox, 4) ? Util.normalizeRect(bbox) : null; + const matrix = lookupMatrix(dict.getArray("Matrix"), null); + const bbox = lookupNormalRect(dict.getArray("BBox"), null); let optionalContent, groupOptions; if (dict.has("OC")) { @@ -1578,10 +1574,7 @@ class PartialEvaluator { localShadingPatternCache, }); if (objId) { - let matrix = dict.getArray("Matrix"); - if (!isNumberArray(matrix, 6)) { - matrix = null; - } + const matrix = lookupMatrix(dict.getArray("Matrix"), null); operatorList.addOp(fn, ["Shading", objId, matrix]); } return undefined; @@ -3268,8 +3261,8 @@ class PartialEvaluator { const currentState = stateManager.state.clone(); const xObjStateManager = new StateManager(currentState); - const matrix = xobj.dict.getArray("Matrix"); - if (isNumberArray(matrix, 6)) { + const matrix = lookupMatrix(xobj.dict.getArray("Matrix"), null); + if (matrix) { xObjStateManager.transform(matrix); } @@ -4247,10 +4240,7 @@ class PartialEvaluator { if (!descriptor) { if (isType3Font) { - let bbox = dict.getArray("FontBBox"); - if (!isNumberArray(bbox, 4)) { - bbox = [0, 0, 0, 0]; - } + const bbox = lookupNormalRect(dict.getArray("FontBBox"), [0, 0, 0, 0]); // FontDescriptor is only required for Type3 fonts when the document // is a tagged pdf. Create a barbebones one to get by. descriptor = new Dict(null); @@ -4440,14 +4430,14 @@ class PartialEvaluator { } } - let fontMatrix = dict.getArray("FontMatrix"); - if (!isNumberArray(fontMatrix, 6)) { - fontMatrix = FONT_IDENTITY_MATRIX; - } - let bbox = descriptor.getArray("FontBBox") || dict.getArray("FontBBox"); - if (!isNumberArray(bbox, 4)) { - bbox = undefined; - } + const fontMatrix = lookupMatrix( + dict.getArray("FontMatrix"), + FONT_IDENTITY_MATRIX + ); + const bbox = lookupNormalRect( + descriptor.getArray("FontBBox") || dict.getArray("FontBBox"), + undefined + ); let ascent = descriptor.get("Ascent"); if (typeof ascent !== "number") { ascent = undefined; diff --git a/src/core/pattern.js b/src/core/pattern.js index ddb810c6efe492..c21d0000b70671 100644 --- a/src/core/pattern.js +++ b/src/core/pattern.js @@ -24,6 +24,8 @@ import { import { isBooleanArray, isNumberArray, + lookupMatrix, + lookupNormalRect, MissingDataException, } from "./core_utils.js"; import { BaseStream } from "./base_stream.js"; @@ -128,8 +130,7 @@ class RadialAxialShading extends BaseShading { pdfFunctionFactory, localColorSpaceCache, }); - const bbox = dict.getArray("BBox"); - this.bbox = isNumberArray(bbox, 4) ? Util.normalizeRect(bbox) : null; + this.bbox = lookupNormalRect(dict.getArray("BBox"), null); let t0 = 0.0, t1 = 1.0; @@ -460,8 +461,7 @@ class MeshShading extends BaseShading { } const dict = stream.dict; this.shadingType = dict.get("ShadingType"); - const bbox = dict.getArray("BBox"); - this.bbox = isNumberArray(bbox, 4) ? Util.normalizeRect(bbox) : null; + this.bbox = lookupNormalRect(dict.getArray("BBox"), null); const cs = ColorSpace.parse({ cs: dict.getRaw("CS") || dict.getRaw("ColorSpace"), xref, @@ -987,12 +987,8 @@ class DummyShading extends BaseShading { } function getTilingPatternIR(operatorList, dict, color) { - let matrix = dict.getArray("Matrix"); - if (!isNumberArray(matrix, 6)) { - matrix = null; - } - let bbox = dict.getArray("BBox"); - bbox = isNumberArray(bbox, 4) ? Util.normalizeRect(bbox) : null; + const matrix = lookupMatrix(dict.getArray("Matrix"), null); + const bbox = lookupNormalRect(dict.getArray("BBox"), null); // Ensure that the pattern has a non-zero width and height, to prevent errors // in `pattern_helper.js` (fixes issue8330.pdf). if (!bbox || bbox[2] - bbox[0] === 0 || bbox[3] - bbox[1] === 0) {