pdf-parser.js 5.2.13 → 5.2.14

package/dist/image/jpeg2000-t2.cjs

@@ -1,12 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_image_jpeg2000_errors = require("./jpeg2000-errors.cjs");
+const require_image_jpeg2000_dwt = require("./jpeg2000-dwt.cjs");
 const require_image_jpeg2000_tagtree = require("./jpeg2000-tagtree.cjs");
 //#region src/image/jpeg2000-t2.ts
-const HIGHER_RESOLUTION_BANDS = [
-	"HL",
-	"LH",
-	"HH"
-];
 const SUBBAND_GAIN_LOG2 = {
 	LL: 0,
 	HL: 1,
@@ -50,10 +46,9 @@ function precinctGrid(bounds, ppx, ppy) {
 }
 function tileHasSubdividedPrecincts(siz, tileX, tileY, codingPerComponent) {
 	const tile = tileBounds(siz, tileX, tileY);
-	for (let c = 0; c < siz.components.length; c++) {
-		const size = siz.components[c];
+	for (const [c, size] of siz.components.entries()) {
 		const coding = codingPerComponent[c];
-		if (size === void 0 || coding === void 0) continue;
+		if (coding === void 0) continue;
 		const component = componentBounds(tile, size.dx, size.dy);
 		for (let r = 0; r <= coding.decompositionLevels; r++) {
 			const precinctSize = coding.precinctSizes[r];
@@ -65,7 +60,6 @@ function tileHasSubdividedPrecincts(siz, tileX, tileY, codingPerComponent) {
 	return false;
 }
 function bandCoordinate(componentCoordinate, levels, orientation) {
-	if (levels === 0) return componentCoordinate;
 	const half = 2 ** (levels - 1);
 	return Math.ceil((componentCoordinate - half * orientation) / (2 * half));
 }
@@ -137,6 +131,11 @@ function buildTileGeometry(siz, tileX, tileY, codingPerComponent, quantizationPe
 		if (componentSize === void 0 || coding === void 0 || quantization === void 0) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`no coding style or quantization is defined for component ${String(c)}`);
 		const bounds = componentBounds(tile, componentSize.dx, componentSize.dy);
 		const levels = coding.decompositionLevels;
+		const higherResolutionBands = [
+			"HL",
+			"LH",
+			"HH"
+		];
 		const resolutions = [];
 		for (let r = 0; r <= levels; r++) {
 			const level = resolutionBounds(bounds, levels, r);
@@ -148,7 +147,7 @@ function buildTileGeometry(siz, tileX, tileY, codingPerComponent, quantizationPe
 			const { wide: precinctsWide, high: precinctsHigh } = precinctGrid(level, ppx, ppy);
 			const bandPpx = r === 0 ? ppx : ppx - 1;
 			const bandPpy = r === 0 ? ppy : ppy - 1;
-			const bandTypes = r === 0 ? ["LL"] : HIGHER_RESOLUTION_BANDS;
+			const bandTypes = r === 0 ? ["LL"] : higherResolutionBands;
 			const subbands = [];
 			for (let b = 0; b < bandTypes.length; b++) {
 				const type = bandTypes[b] ?? "LL";
@@ -229,23 +228,29 @@ function buildPacketSequence(tile, order, layers) {
 		});
 	};
 	if (order === "LRCP") {
-		for (let l = 0; l < layers; l++) for (let r = 0; r < maxResolutions; r++) for (let c = 0; c < tile.components.length; c++) for (let p = 0; p < precinctCount(c, r); p++) push(l, r, c, p);
+		for (let l = 0; l < layers; l++) require_image_jpeg2000_dwt.times(maxResolutions, (r) => {
+			for (const [c] of tile.components.entries()) for (let p = 0; p < precinctCount(c, r); p++) push(l, r, c, p);
+		});
 		return packets;
 	}
 	if (order === "RLCP") {
-		for (let r = 0; r < maxResolutions; r++) for (let l = 0; l < layers; l++) for (let c = 0; c < tile.components.length; c++) for (let p = 0; p < precinctCount(c, r); p++) push(l, r, c, p);
+		require_image_jpeg2000_dwt.times(maxResolutions, (r) => {
+			for (let l = 0; l < layers; l++) for (const [c] of tile.components.entries()) for (let p = 0; p < precinctCount(c, r); p++) push(l, r, c, p);
+		});
 		return packets;
 	}
-	for (let c = 0; c < tile.components.length; c++) for (let r = 0; r < maxResolutions; r++) if (precinctCount(c, r) > 1) throw new require_image_jpeg2000_errors.Jpeg2000UnsupportedError(`progression order ${order} is only decoded here when every resolution level holds a single precinct, and this codestream subdivides at least one of them`);
+	for (const [c] of tile.components.entries()) require_image_jpeg2000_dwt.times(maxResolutions, (r) => {
+		if (precinctCount(c, r) > 1) throw new require_image_jpeg2000_errors.Jpeg2000UnsupportedError(`progression order ${order} is only decoded here when every resolution level holds a single precinct, and this codestream subdivides at least one of them`);
+	});
 	if (order === "RPCL") {
-		for (let r = 0; r < maxResolutions; r++) for (let c = 0; c < tile.components.length; c++) for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
-		return packets;
-	}
-	if (order === "PCRL") {
-		for (let c = 0; c < tile.components.length; c++) for (let r = 0; r < maxResolutions; r++) for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
+		require_image_jpeg2000_dwt.times(maxResolutions, (r) => {
+			for (const [c] of tile.components.entries()) for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
+		});
 		return packets;
 	}
-	for (let c = 0; c < tile.components.length; c++) for (let r = 0; r < maxResolutions; r++) for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
+	for (const [c] of tile.components.entries()) require_image_jpeg2000_dwt.times(maxResolutions, (r) => {
+		for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
+	});
 	return packets;
 }
 const MARKER_SOP_HIGH = 255;
@@ -255,7 +260,7 @@ const SOP_SEGMENT_BYTES = 6;
 const EPH_MARKER_BYTES = 2;
 function readTilePackets(data, start, end, tile, sequence, options) {
 	let position = start;
-	for (let packetIndex = 0; packetIndex < sequence.length; packetIndex++) {
+	for (let packetIndex = 0; packetIndex !== sequence.length; packetIndex++) {
 		const packet = sequence[packetIndex];
 		if (packet === void 0) break;
 		if (position >= end) {
@@ -263,9 +268,8 @@ function readTilePackets(data, start, end, tile, sequence, options) {
 			return position;
 		}
 		if (options.useSop && position + SOP_SEGMENT_BYTES <= end && data[position] === MARKER_SOP_HIGH && data[position + 1] === MARKER_SOP_LOW) position += SOP_SEGMENT_BYTES;
-		const component = tile.components[packet.component];
-		const resolution = component?.resolutions[packet.resolution];
-		if (component === void 0 || resolution === void 0) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("the progression sequence names a resolution level the tile does not have");
+		const resolution = tile.components[packet.component]?.resolutions[packet.resolution];
+		if (resolution === void 0) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("the progression sequence names a resolution level the tile does not have");
 		const reader = new require_image_jpeg2000_tagtree.PacketBitReader(data, position, end);
 		const included = [];
 		const lengths = [];
@@ -274,12 +278,10 @@ function readTilePackets(data, start, end, tile, sequence, options) {
 			if (precinct === void 0) continue;
 			for (const block of precinct.codeBlocks) {
 				if (!(block.included ? reader.readBit() === 1 : precinct.inclusion.decode(reader, block.gridX, block.gridY, packet.layer + 1))) continue;
-				if (!block.included) {
-					block.included = true;
-					let threshold = 1;
-					while (!precinct.zeroBitPlaneTree.decode(reader, block.gridX, block.gridY, threshold)) threshold++;
-					block.zeroBitPlanes = threshold - 1;
-				}
+				block.included = true;
+				let threshold = 1;
+				while (!precinct.zeroBitPlaneTree.decode(reader, block.gridX, block.gridY, threshold)) threshold++;
+				block.zeroBitPlanes = threshold - 1;
 				const passes = readCodingPasses(reader);
 				while (reader.readBit() === 1) block.lblock++;
 				const lengthBits = block.lblock + Math.floor(Math.log2(passes));
@@ -292,10 +294,8 @@ function readTilePackets(data, start, end, tile, sequence, options) {
 		reader.alignToByte();
 		position = reader.offset;
 		if (options.useEph && position + EPH_MARKER_BYTES <= end && data[position] === MARKER_SOP_HIGH && data[position + 1] === MARKER_EPH_LOW) position += EPH_MARKER_BYTES;
-		for (let i = 0; i < included.length; i++) {
-			const block = included[i];
+		for (const [i, block] of included.entries()) {
 			const length = lengths[i] ?? 0;
-			if (block === void 0) continue;
 			const chunkEnd = Math.min(position + length, end);
 			if (chunkEnd < position + length) options.onWarning("a code-block declares more coded bytes than the tile carries; decoding it from the bytes that did arrive");
 			block.chunks.push({

package/dist/image/jpeg2000-t2.d.cts

@@ -76,4 +76,4 @@ interface PacketReadOptions {
 }
 declare function readTilePackets(data: Uint8Array<ArrayBuffer>, start: number, end: number, tile: Jpeg2000TileGeometry, sequence: readonly PacketPosition[], options: PacketReadOptions): number;
 //#endregion
-export { Jpeg2000CodeBlock, Jpeg2000Precinct, Jpeg2000Resolution, Jpeg2000Subband, Jpeg2000TileComponent, Jpeg2000TileGeometry, PacketReadOptions, buildPacketSequence, buildTileGeometry, readTilePackets, subbandGainLog2, tileHasSubdividedPrecincts };
+export { Jpeg2000CodeBlock, Jpeg2000Precinct, Jpeg2000Resolution, Jpeg2000Subband, Jpeg2000TileComponent, Jpeg2000TileGeometry, PacketPosition, PacketReadOptions, buildPacketSequence, buildTileGeometry, readTilePackets, subbandGainLog2, tileHasSubdividedPrecincts };

package/dist/image/jpeg2000-t2.d.ts

@@ -76,4 +76,4 @@ interface PacketReadOptions {
 }
 declare function readTilePackets(data: Uint8Array<ArrayBuffer>, start: number, end: number, tile: Jpeg2000TileGeometry, sequence: readonly PacketPosition[], options: PacketReadOptions): number;
 //#endregion
-export { Jpeg2000CodeBlock, Jpeg2000Precinct, Jpeg2000Resolution, Jpeg2000Subband, Jpeg2000TileComponent, Jpeg2000TileGeometry, PacketReadOptions, buildPacketSequence, buildTileGeometry, readTilePackets, subbandGainLog2, tileHasSubdividedPrecincts };
+export { Jpeg2000CodeBlock, Jpeg2000Precinct, Jpeg2000Resolution, Jpeg2000Subband, Jpeg2000TileComponent, Jpeg2000TileGeometry, PacketPosition, PacketReadOptions, buildPacketSequence, buildTileGeometry, readTilePackets, subbandGainLog2, tileHasSubdividedPrecincts };

package/dist/image/jpeg2000-t2.js

@@ -1,11 +1,7 @@
 import { Jpeg2000ParseError, Jpeg2000UnsupportedError } from "./jpeg2000-errors.js";
+import { times } from "./jpeg2000-dwt.js";
 import { PacketBitReader, TagTree } from "./jpeg2000-tagtree.js";
 //#region src/image/jpeg2000-t2.ts
-const HIGHER_RESOLUTION_BANDS = [
-	"HL",
-	"LH",
-	"HH"
-];
 const SUBBAND_GAIN_LOG2 = {
 	LL: 0,
 	HL: 1,
@@ -49,10 +45,9 @@ function precinctGrid(bounds, ppx, ppy) {
 }
 function tileHasSubdividedPrecincts(siz, tileX, tileY, codingPerComponent) {
 	const tile = tileBounds(siz, tileX, tileY);
-	for (let c = 0; c < siz.components.length; c++) {
-		const size = siz.components[c];
+	for (const [c, size] of siz.components.entries()) {
 		const coding = codingPerComponent[c];
-		if (size === void 0 || coding === void 0) continue;
+		if (coding === void 0) continue;
 		const component = componentBounds(tile, size.dx, size.dy);
 		for (let r = 0; r <= coding.decompositionLevels; r++) {
 			const precinctSize = coding.precinctSizes[r];
@@ -64,7 +59,6 @@ function tileHasSubdividedPrecincts(siz, tileX, tileY, codingPerComponent) {
 	return false;
 }
 function bandCoordinate(componentCoordinate, levels, orientation) {
-	if (levels === 0) return componentCoordinate;
 	const half = 2 ** (levels - 1);
 	return Math.ceil((componentCoordinate - half * orientation) / (2 * half));
 }
@@ -136,6 +130,11 @@ function buildTileGeometry(siz, tileX, tileY, codingPerComponent, quantizationPe
 		if (componentSize === void 0 || coding === void 0 || quantization === void 0) throw new Jpeg2000ParseError(`no coding style or quantization is defined for component ${String(c)}`);
 		const bounds = componentBounds(tile, componentSize.dx, componentSize.dy);
 		const levels = coding.decompositionLevels;
+		const higherResolutionBands = [
+			"HL",
+			"LH",
+			"HH"
+		];
 		const resolutions = [];
 		for (let r = 0; r <= levels; r++) {
 			const level = resolutionBounds(bounds, levels, r);
@@ -147,7 +146,7 @@ function buildTileGeometry(siz, tileX, tileY, codingPerComponent, quantizationPe
 			const { wide: precinctsWide, high: precinctsHigh } = precinctGrid(level, ppx, ppy);
 			const bandPpx = r === 0 ? ppx : ppx - 1;
 			const bandPpy = r === 0 ? ppy : ppy - 1;
-			const bandTypes = r === 0 ? ["LL"] : HIGHER_RESOLUTION_BANDS;
+			const bandTypes = r === 0 ? ["LL"] : higherResolutionBands;
 			const subbands = [];
 			for (let b = 0; b < bandTypes.length; b++) {
 				const type = bandTypes[b] ?? "LL";
@@ -228,23 +227,29 @@ function buildPacketSequence(tile, order, layers) {
 		});
 	};
 	if (order === "LRCP") {
-		for (let l = 0; l < layers; l++) for (let r = 0; r < maxResolutions; r++) for (let c = 0; c < tile.components.length; c++) for (let p = 0; p < precinctCount(c, r); p++) push(l, r, c, p);
+		for (let l = 0; l < layers; l++) times(maxResolutions, (r) => {
+			for (const [c] of tile.components.entries()) for (let p = 0; p < precinctCount(c, r); p++) push(l, r, c, p);
+		});
 		return packets;
 	}
 	if (order === "RLCP") {
-		for (let r = 0; r < maxResolutions; r++) for (let l = 0; l < layers; l++) for (let c = 0; c < tile.components.length; c++) for (let p = 0; p < precinctCount(c, r); p++) push(l, r, c, p);
+		times(maxResolutions, (r) => {
+			for (let l = 0; l < layers; l++) for (const [c] of tile.components.entries()) for (let p = 0; p < precinctCount(c, r); p++) push(l, r, c, p);
+		});
 		return packets;
 	}
-	for (let c = 0; c < tile.components.length; c++) for (let r = 0; r < maxResolutions; r++) if (precinctCount(c, r) > 1) throw new Jpeg2000UnsupportedError(`progression order ${order} is only decoded here when every resolution level holds a single precinct, and this codestream subdivides at least one of them`);
+	for (const [c] of tile.components.entries()) times(maxResolutions, (r) => {
+		if (precinctCount(c, r) > 1) throw new Jpeg2000UnsupportedError(`progression order ${order} is only decoded here when every resolution level holds a single precinct, and this codestream subdivides at least one of them`);
+	});
 	if (order === "RPCL") {
-		for (let r = 0; r < maxResolutions; r++) for (let c = 0; c < tile.components.length; c++) for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
-		return packets;
-	}
-	if (order === "PCRL") {
-		for (let c = 0; c < tile.components.length; c++) for (let r = 0; r < maxResolutions; r++) for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
+		times(maxResolutions, (r) => {
+			for (const [c] of tile.components.entries()) for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
+		});
 		return packets;
 	}
-	for (let c = 0; c < tile.components.length; c++) for (let r = 0; r < maxResolutions; r++) for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
+	for (const [c] of tile.components.entries()) times(maxResolutions, (r) => {
+		for (let l = 0; l < layers; l++) if (precinctCount(c, r) > 0) push(l, r, c, 0);
+	});
 	return packets;
 }
 const MARKER_SOP_HIGH = 255;
@@ -254,7 +259,7 @@ const SOP_SEGMENT_BYTES = 6;
 const EPH_MARKER_BYTES = 2;
 function readTilePackets(data, start, end, tile, sequence, options) {
 	let position = start;
-	for (let packetIndex = 0; packetIndex < sequence.length; packetIndex++) {
+	for (let packetIndex = 0; packetIndex !== sequence.length; packetIndex++) {
 		const packet = sequence[packetIndex];
 		if (packet === void 0) break;
 		if (position >= end) {
@@ -262,9 +267,8 @@ function readTilePackets(data, start, end, tile, sequence, options) {
 			return position;
 		}
 		if (options.useSop && position + SOP_SEGMENT_BYTES <= end && data[position] === MARKER_SOP_HIGH && data[position + 1] === MARKER_SOP_LOW) position += SOP_SEGMENT_BYTES;
-		const component = tile.components[packet.component];
-		const resolution = component?.resolutions[packet.resolution];
-		if (component === void 0 || resolution === void 0) throw new Jpeg2000ParseError("the progression sequence names a resolution level the tile does not have");
+		const resolution = tile.components[packet.component]?.resolutions[packet.resolution];
+		if (resolution === void 0) throw new Jpeg2000ParseError("the progression sequence names a resolution level the tile does not have");
 		const reader = new PacketBitReader(data, position, end);
 		const included = [];
 		const lengths = [];
@@ -273,12 +277,10 @@ function readTilePackets(data, start, end, tile, sequence, options) {
 			if (precinct === void 0) continue;
 			for (const block of precinct.codeBlocks) {
 				if (!(block.included ? reader.readBit() === 1 : precinct.inclusion.decode(reader, block.gridX, block.gridY, packet.layer + 1))) continue;
-				if (!block.included) {
-					block.included = true;
-					let threshold = 1;
-					while (!precinct.zeroBitPlaneTree.decode(reader, block.gridX, block.gridY, threshold)) threshold++;
-					block.zeroBitPlanes = threshold - 1;
-				}
+				block.included = true;
+				let threshold = 1;
+				while (!precinct.zeroBitPlaneTree.decode(reader, block.gridX, block.gridY, threshold)) threshold++;
+				block.zeroBitPlanes = threshold - 1;
 				const passes = readCodingPasses(reader);
 				while (reader.readBit() === 1) block.lblock++;
 				const lengthBits = block.lblock + Math.floor(Math.log2(passes));
@@ -291,10 +293,8 @@ function readTilePackets(data, start, end, tile, sequence, options) {
 		reader.alignToByte();
 		position = reader.offset;
 		if (options.useEph && position + EPH_MARKER_BYTES <= end && data[position] === MARKER_SOP_HIGH && data[position + 1] === MARKER_EPH_LOW) position += EPH_MARKER_BYTES;
-		for (let i = 0; i < included.length; i++) {
-			const block = included[i];
+		for (const [i, block] of included.entries()) {
 			const length = lengths[i] ?? 0;
-			if (block === void 0) continue;
 			const chunkEnd = Math.min(position + length, end);
 			if (chunkEnd < position + length) options.onWarning("a code-block declares more coded bytes than the tile carries; decoding it from the bytes that did arrive");
 			block.chunks.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-parser.js",
-  "version": "5.2.13",
+  "version": "5.2.14",
   "description": "Hand-written, dependency-minimal PDF codec: parses arbitrary real-world PDFs and generates new ones, built on its own codec-owned LayoutDocument item model and Zod 4 codecs.",
   "type": "module",
   "repository": {