pdf-parser.js 5.2.27 → 5.2.29

package/dist/image/jbig2-bitmap.cjs

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_image_jbig2_errors = require("./jbig2-errors.cjs");
-//#region src/image/jbig2-bitmap.ts
 const MAX_JBIG2_BITMAP_PIXELS = 1 << 26;
 var Jbig2BitmapTooLargeError = class extends require_image_jbig2_errors.Jbig2ParseError {
 	constructor(width, height) {
@@ -51,21 +50,25 @@ function combineBitmap(destination, source, x, y, operator) {
 		}
 	}
 }
+const BITS_PER_BYTE = 8;
+const BYTE_INDEX_SHIFT = 3;
+const BYTE_BIT_MASK = 7;
+const MSB_FIRST_BIT_MASK = 128;
 function packBitmapRows(bitmap, width, height) {
-	const bytesPerRow = Math.ceil(width / 8);
+	const bytesPerRow = Math.ceil(width / BITS_PER_BYTE);
 	const out = new Uint8Array(bytesPerRow * height);
 	for (let y = 0; y < height; y++) {
 		const rowStart = y * bytesPerRow;
-		for (let x = 0; x < width; x++) if (getPixel(bitmap, x, y) === 1) out[rowStart + (x >> 3)] = (out[rowStart + (x >> 3)] ?? 0) | 128 >> (x & 7);
+		for (let x = 0; x < width; x++) if (getPixel(bitmap, x, y) === 1) out[rowStart + (x >> BYTE_INDEX_SHIFT)] = (out[rowStart + (x >> BYTE_INDEX_SHIFT)] ?? 0) | MSB_FIRST_BIT_MASK >> (x & BYTE_BIT_MASK);
 	}
 	return out;
 }
 function unpackBitmapRows(packed, width, height) {
 	const bitmap = createBitmap(width, height);
-	const bytesPerRow = Math.ceil(width / 8);
+	const bytesPerRow = Math.ceil(width / BITS_PER_BYTE);
 	for (let y = 0; y < height; y++) {
 		const rowStart = y * bytesPerRow;
-		for (let x = 0; x < width; x++) bitmap.data[y * width + x] = (packed[rowStart + (x >> 3)] ?? 0) >> 7 - (x & 7) & 1;
+		for (let x = 0; x < width; x++) bitmap.data[y * width + x] = (packed[rowStart + (x >> BYTE_INDEX_SHIFT)] ?? 0) >> BYTE_BIT_MASK - (x & BYTE_BIT_MASK) & 1;
 	}
 	return bitmap;
 }

package/dist/image/jbig2-bitmap.js

@@ -1,5 +1,4 @@
 import { Jbig2ParseError } from "./jbig2-errors.js";
-//#region src/image/jbig2-bitmap.ts
 const MAX_JBIG2_BITMAP_PIXELS = 1 << 26;
 var Jbig2BitmapTooLargeError = class extends Jbig2ParseError {
 	constructor(width, height) {
@@ -50,21 +49,25 @@ function combineBitmap(destination, source, x, y, operator) {
 		}
 	}
 }
+const BITS_PER_BYTE = 8;
+const BYTE_INDEX_SHIFT = 3;
+const BYTE_BIT_MASK = 7;
+const MSB_FIRST_BIT_MASK = 128;
 function packBitmapRows(bitmap, width, height) {
-	const bytesPerRow = Math.ceil(width / 8);
+	const bytesPerRow = Math.ceil(width / BITS_PER_BYTE);
 	const out = new Uint8Array(bytesPerRow * height);
 	for (let y = 0; y < height; y++) {
 		const rowStart = y * bytesPerRow;
-		for (let x = 0; x < width; x++) if (getPixel(bitmap, x, y) === 1) out[rowStart + (x >> 3)] = (out[rowStart + (x >> 3)] ?? 0) | 128 >> (x & 7);
+		for (let x = 0; x < width; x++) if (getPixel(bitmap, x, y) === 1) out[rowStart + (x >> BYTE_INDEX_SHIFT)] = (out[rowStart + (x >> BYTE_INDEX_SHIFT)] ?? 0) | MSB_FIRST_BIT_MASK >> (x & BYTE_BIT_MASK);
 	}
 	return out;
 }
 function unpackBitmapRows(packed, width, height) {
 	const bitmap = createBitmap(width, height);
-	const bytesPerRow = Math.ceil(width / 8);
+	const bytesPerRow = Math.ceil(width / BITS_PER_BYTE);
 	for (let y = 0; y < height; y++) {
 		const rowStart = y * bytesPerRow;
-		for (let x = 0; x < width; x++) bitmap.data[y * width + x] = (packed[rowStart + (x >> 3)] ?? 0) >> 7 - (x & 7) & 1;
+		for (let x = 0; x < width; x++) bitmap.data[y * width + x] = (packed[rowStart + (x >> BYTE_INDEX_SHIFT)] ?? 0) >> BYTE_BIT_MASK - (x & BYTE_BIT_MASK) & 1;
 	}
 	return bitmap;
 }

package/dist/image/jbig2-generic.cjs

@@ -2,76 +2,252 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_image_jbig2_errors = require("./jbig2-errors.cjs");
 const require_image_jbig2_bitmap = require("./jbig2-bitmap.cjs");
 //#region src/image/jbig2-generic.ts
-function fixed(dx, dy) {
-	return {
-		kind: "fixed",
-		dx,
-		dy
-	};
-}
-function at(index) {
-	return {
-		kind: "at",
-		index
-	};
-}
 const GENERIC_TEMPLATES = [
 	[
-		at(3),
-		fixed(-1, -2),
-		fixed(0, -2),
-		fixed(1, -2),
-		at(2),
-		at(1),
-		fixed(-2, -1),
-		fixed(-1, -1),
-		fixed(0, -1),
-		fixed(1, -1),
-		fixed(2, -1),
-		at(0),
-		fixed(-4, 0),
-		fixed(-3, 0),
-		fixed(-2, 0),
-		fixed(-1, 0)
+		{
+			kind: "at",
+			index: 3
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: 0,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: 1,
+			dy: -2
+		},
+		{
+			kind: "at",
+			index: 2
+		},
+		{
+			kind: "at",
+			index: 1
+		},
+		{
+			kind: "fixed",
+			dx: -2,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 0,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 1,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 2,
+			dy: -1
+		},
+		{
+			kind: "at",
+			index: 0
+		},
+		{
+			kind: "fixed",
+			dx: -4,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -3,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -2,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: 0
+		}
 	],
 	[
-		fixed(-1, -2),
-		fixed(0, -2),
-		fixed(1, -2),
-		fixed(2, -2),
-		fixed(-2, -1),
-		fixed(-1, -1),
-		fixed(0, -1),
-		fixed(1, -1),
-		fixed(2, -1),
-		at(0),
-		fixed(-3, 0),
-		fixed(-2, 0),
-		fixed(-1, 0)
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: 0,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: 1,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: 2,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: -2,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 0,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 1,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 2,
+			dy: -1
+		},
+		{
+			kind: "at",
+			index: 0
+		},
+		{
+			kind: "fixed",
+			dx: -3,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -2,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: 0
+		}
 	],
 	[
-		fixed(-1, -2),
-		fixed(0, -2),
-		fixed(1, -2),
-		fixed(-2, -1),
-		fixed(-1, -1),
-		fixed(0, -1),
-		fixed(1, -1),
-		at(0),
-		fixed(-2, 0),
-		fixed(-1, 0)
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: 0,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: 1,
+			dy: -2
+		},
+		{
+			kind: "fixed",
+			dx: -2,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 0,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 1,
+			dy: -1
+		},
+		{
+			kind: "at",
+			index: 0
+		},
+		{
+			kind: "fixed",
+			dx: -2,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: 0
+		}
 	],
 	[
-		fixed(-3, -1),
-		fixed(-2, -1),
-		fixed(-1, -1),
-		fixed(0, -1),
-		fixed(1, -1),
-		at(0),
-		fixed(-4, 0),
-		fixed(-3, 0),
-		fixed(-2, 0),
-		fixed(-1, 0)
+		{
+			kind: "fixed",
+			dx: -3,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: -2,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 0,
+			dy: -1
+		},
+		{
+			kind: "fixed",
+			dx: 1,
+			dy: -1
+		},
+		{
+			kind: "at",
+			index: 0
+		},
+		{
+			kind: "fixed",
+			dx: -4,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -3,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -2,
+			dy: 0
+		},
+		{
+			kind: "fixed",
+			dx: -1,
+			dy: 0
+		}
 	]
 ];
 const GENERIC_SLTP_CONTEXT = [
@@ -80,12 +256,7 @@ const GENERIC_SLTP_CONTEXT = [
 	229,
 	405
 ];
-const GENERIC_CONTEXT_BITS = [
-	16,
-	13,
-	10,
-	10
-];
+const GENERIC_CONTEXT_BITS = GENERIC_TEMPLATES.map((positions) => positions.length);
 function resolveTemplate(template) {
 	const positions = GENERIC_TEMPLATES[template];
 	if (positions === void 0) throw new require_image_jbig2_errors.Jbig2UnsupportedError(`generic region declares GBTEMPLATE ${String(template)}, which is outside the 0-3 range T.88 6.2.5.3 defines`);
@@ -200,7 +371,7 @@ const REFINEMENT_TEMPLATES = [[
 	reference(1, 1)
 ]];
 const TPGRON_UNSUPPORTED = "JBIG2 refinement region sets TPGRON (typical prediction, T.88 6.3.5.6), whose per-template pseudo-context constants this decoder has no way to verify against a real encoder; refusing rather than risking a silently wrong bitmap";
-const REFINEMENT_CONTEXT_BITS = [13, 10];
+const REFINEMENT_CONTEXT_BITS = REFINEMENT_TEMPLATES.map((positions) => positions.length);
 const NOMINAL_REFINEMENT_AT = [{
 	x: -1,
 	y: -1