pdf-parser.js 5.2.26 → 5.2.28

package/dist/image/jpeg2000-codestream.cjs

@@ -15,6 +15,11 @@ const MARKER_COM = 65380;
 const MARKER_SOT = 65424;
 const MARKER_SOD = 65427;
 const MARKER_EOC = 65497;
+const BITS_PER_BYTE = 8;
+const HEX_RADIX = 16;
+const NIBBLE_MASK = 15;
+const NIBBLE_BITS = 4;
+const UINT16_MODULUS = 65536;
 var MarkerCursor = class {
 	data;
 	position;
@@ -32,10 +37,10 @@ var MarkerCursor = class {
 		return value;
 	}
 	uint16() {
-		return this.uint8() << 8 | this.uint8();
+		return this.uint8() << BITS_PER_BYTE | this.uint8();
 	}
 	uint32() {
-		return this.uint16() * 65536 + this.uint16();
+		return this.uint16() * UINT16_MODULUS + this.uint16();
 	}
 	bytes(length) {
 		if (length < 0 || this.position + length > this.data.length) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("a JPEG 2000 marker segment declares more data than the codestream carries");
@@ -44,6 +49,9 @@ var MarkerCursor = class {
 		return slice;
 	}
 };
+const SIZ_COMPONENT_RECORD_SIZE = 3;
+const SSIZ_SIGNED_BIT = 128;
+const SSIZ_BIT_DEPTH_MASK = 127;
 function readImageSize(cursor, segmentEnd) {
 	cursor.uint16();
 	const xsiz = cursor.uint32();
@@ -56,13 +64,13 @@ function readImageSize(cursor, segmentEnd) {
 	const ytosiz = cursor.uint32();
 	const count = cursor.uint16();
 	if (count === 0) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("SIZ declares zero components");
-	if (cursor.position + count * 3 > segmentEnd) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`SIZ declares ${String(count)} components but its own length leaves room for fewer`);
+	if (cursor.position + count * SIZ_COMPONENT_RECORD_SIZE > segmentEnd) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`SIZ declares ${String(count)} components but its own length leaves room for fewer`);
 	const components = [];
 	for (let i = 0; i < count; i++) {
 		const ssiz = cursor.uint8();
 		components.push({
-			signed: (ssiz & 128) !== 0,
-			bitDepth: (ssiz & 127) + 1,
+			signed: (ssiz & SSIZ_SIGNED_BIT) !== 0,
+			bitDepth: (ssiz & SSIZ_BIT_DEPTH_MASK) + 1,
 			dx: cursor.uint8(),
 			dy: cursor.uint8()
 		});
@@ -82,20 +90,21 @@ function readImageSize(cursor, segmentEnd) {
 	};
 }
 const DEFAULT_PRECINCT_EXPONENT = 15;
+const CODE_BLOCK_AREA_EXPONENT_MAX = 12;
 function readCodingStyleParameters(cursor, explicitPrecincts) {
 	const decompositionLevels = cursor.uint8();
-	const codeBlockWidthExp = (cursor.uint8() & 15) + 2;
-	const codeBlockHeightExp = (cursor.uint8() & 15) + 2;
+	const codeBlockWidthExp = (cursor.uint8() & NIBBLE_MASK) + 2;
+	const codeBlockHeightExp = (cursor.uint8() & NIBBLE_MASK) + 2;
 	const codeBlockStyle = cursor.uint8();
 	const transformCode = cursor.uint8();
 	if (transformCode !== 0 && transformCode !== 1) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`SPcod/SPcoc declares transformation ${String(transformCode)}, which is neither of the two ISO/IEC 15444-1 defines`);
-	if (codeBlockWidthExp + codeBlockHeightExp > 12) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`code-block size 2^${String(codeBlockWidthExp)} by 2^${String(codeBlockHeightExp)} is outside the range ISO/IEC 15444-1 Table A.18 permits`);
+	if (codeBlockWidthExp + codeBlockHeightExp > CODE_BLOCK_AREA_EXPONENT_MAX) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`code-block size 2^${String(codeBlockWidthExp)} by 2^${String(codeBlockHeightExp)} is outside the range ISO/IEC 15444-1 Table A.18 permits`);
 	const precinctSizes = [];
 	if (explicitPrecincts) for (let r = 0; r <= decompositionLevels; r++) {
 		const packed = cursor.uint8();
 		precinctSizes.push({
-			ppx: packed & 15,
-			ppy: packed >> 4 & 15
+			ppx: packed & NIBBLE_MASK,
+			ppy: packed >> NIBBLE_BITS & NIBBLE_MASK
 		});
 	}
 	else for (let r = 0; r <= decompositionLevels; r++) precinctSizes.push({
@@ -111,6 +120,7 @@ function readCodingStyleParameters(cursor, explicitPrecincts) {
 		precinctSizes
 	};
 }
+const SCOD_USE_EPH_BIT = 4;
 function readCodingDefaults(cursor) {
 	const progressionOrders = [
 		"LRCP",
@@ -131,17 +141,22 @@ function readCodingDefaults(cursor) {
 		layers,
 		multipleComponentTransform,
 		useSop: (scod & 2) !== 0,
-		useEph: (scod & 4) !== 0
+		useEph: (scod & SCOD_USE_EPH_BIT) !== 0
 	};
 }
+const SQCD_GUARD_BITS_SHIFT = 5;
+const SQCD_STYLE_MASK = 31;
+const SPQCD_NONE_EXPONENT_SHIFT = 3;
+const SPQCD_EXPONENT_SHIFT = 11;
+const SPQCD_MANTISSA_MASK = 2047;
 function readQuantization(cursor, segmentEnd) {
 	const sq = cursor.uint8();
-	const guardBits = sq >> 5;
-	const styleCode = sq & 31;
+	const guardBits = sq >> SQCD_GUARD_BITS_SHIFT;
+	const styleCode = sq & SQCD_STYLE_MASK;
 	const stepSizes = [];
 	if (styleCode === 0) {
 		while (cursor.position < segmentEnd) stepSizes.push({
-			exponent: cursor.uint8() >> 3,
+			exponent: cursor.uint8() >> SPQCD_NONE_EXPONENT_SHIFT,
 			mantissa: 0
 		});
 		return {
@@ -154,8 +169,8 @@ function readQuantization(cursor, segmentEnd) {
 		while (cursor.position + 1 < segmentEnd) {
 			const packed = cursor.uint16();
 			stepSizes.push({
-				exponent: packed >> 11,
-				mantissa: packed & 2047
+				exponent: packed >> SPQCD_EXPONENT_SHIFT,
+				mantissa: packed & SPQCD_MANTISSA_MASK
 			});
 		}
 		return {
@@ -166,8 +181,9 @@ function readQuantization(cursor, segmentEnd) {
 	}
 	throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`QCD/QCC declares quantization style ${String(styleCode)}, which ISO/IEC 15444-1 Table A.28 does not define`);
 }
+const COMPONENT_INDEX_WIDTH_THRESHOLD = 257;
 function readComponentIndex(cursor, componentCount) {
-	return componentCount < 257 ? cursor.uint8() : cursor.uint16();
+	return componentCount < COMPONENT_INDEX_WIDTH_THRESHOLD ? cursor.uint8() : cursor.uint16();
 }
 function emptyHeader() {
 	return {
@@ -201,11 +217,20 @@ function freezeHeader(header) {
 	};
 	return base;
 }
+var CodestreamComments = class {
+	#texts = [];
+	add(text) {
+		this.#texts.push(text);
+	}
+	texts() {
+		return this.#texts;
+	}
+};
 function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	const length = cursor.uint16();
-	if (length < 2) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`marker segment 0x${marker.toString(16)} declares a length of ${String(length)}, which is shorter than the length field itself`);
+	if (length < 2) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`marker segment 0x${marker.toString(HEX_RADIX)} declares a length of ${String(length)}, which is shorter than the length field itself`);
 	const segmentEnd = cursor.position + length - 2;
-	if (segmentEnd > cursor.data.length) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`marker segment 0x${marker.toString(16)} declares more data than the codestream carries`);
+	if (segmentEnd > cursor.data.length) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`marker segment 0x${marker.toString(HEX_RADIX)} declares more data than the codestream carries`);
 	if (marker === MARKER_COD) header.cod = readCodingDefaults(cursor);
 	else if (marker === MARKER_COC) {
 		const component = readComponentIndex(cursor, componentCount);
@@ -220,7 +245,7 @@ function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	else if (marker === MARKER_COM) {
 		const registration = cursor.uint16();
 		const body = cursor.bytes(segmentEnd - cursor.position);
-		if (registration === 1) comments.push(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
+		if (registration === 1) comments.add(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
 	}
 	cursor.position = segmentEnd;
 }
@@ -228,15 +253,16 @@ function validateMainHeader(header) {
 	if (header.cod === void 0) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("the main header carries no COD marker, so no coding style is defined for any tile");
 	if (header.qcd === void 0) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("the main header carries no QCD marker, so no quantization is defined for any tile");
 }
+const MIN_HEADER_BYTES = 4;
 function parseJpeg2000Codestream(data) {
 	const cursor = new MarkerCursor(data);
-	if (cursor.remaining < 4 || cursor.uint16() !== MARKER_SOC) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("codestream does not begin with an SOC marker");
+	if (cursor.remaining < MIN_HEADER_BYTES || cursor.uint16() !== MARKER_SOC) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("codestream does not begin with an SOC marker");
 	if (cursor.uint16() !== MARKER_SIZ) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("the SOC marker is not immediately followed by SIZ, which ISO/IEC 15444-1 A.3 requires");
 	const sizLength = cursor.uint16();
 	const sizEnd = cursor.position + sizLength - 2;
 	const siz = readImageSize(cursor, sizEnd);
 	cursor.position = sizEnd;
-	const comments = [];
+	const comments = new CodestreamComments();
 	const main = emptyHeader();
 	const tileParts = [];
 	let sawEoc = false;
@@ -250,10 +276,10 @@ function parseJpeg2000Codestream(data) {
 		if (marker === MARKER_PPM) throw new require_image_jpeg2000_errors.Jpeg2000UnsupportedError("the codestream carries a PPM marker (packed packet headers in the main header), an organisation this decoder does not reassemble");
 		if (marker === MARKER_SOT) {
 			cursor.position -= 2;
-			readTilePart(cursor, siz.components.length, tileParts, comments);
+			tileParts.push(readTilePart(cursor, siz.components.length, comments));
 			continue;
 		}
-		if (marker === MARKER_SOD || marker === MARKER_SOC) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`unexpected marker 0x${marker.toString(16)} in the main header`);
+		if (marker === MARKER_SOD || marker === MARKER_SOC) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`unexpected marker 0x${marker.toString(HEX_RADIX)} in the main header`);
 		readHeaderSegment(marker, cursor, main, siz.components.length, comments);
 	}
 	validateMainHeader(main);
@@ -264,17 +290,18 @@ function parseJpeg2000Codestream(data) {
 		siz,
 		main: freezeHeader(main),
 		tileParts,
-		comments,
+		comments: comments.texts(),
 		numTilesWide,
 		numTilesHigh,
 		truncated: !sawEoc
 	};
 }
-function readTilePart(cursor, componentCount, tileParts, comments) {
+const SOT_SEGMENT_LENGTH = 10;
+function readTilePart(cursor, componentCount, comments) {
 	const sotStart = cursor.position;
 	cursor.uint16();
 	const lsot = cursor.uint16();
-	if (lsot !== 10) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`SOT declares a length of ${String(lsot)}, but ISO/IEC 15444-1 A.4.2 fixes it at 10`);
+	if (lsot !== SOT_SEGMENT_LENGTH) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`SOT declares a length of ${String(lsot)}, but ISO/IEC 15444-1 A.4.2 fixes it at 10`);
 	const tileIndex = cursor.uint16();
 	const psot = cursor.uint32();
 	const partIndex = cursor.uint8();
@@ -284,7 +311,7 @@ function readTilePart(cursor, componentCount, tileParts, comments) {
 		if (cursor.remaining < 2) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("a tile-part header ended without an SOD marker");
 		const marker = cursor.uint16();
 		if (marker === MARKER_SOD) break;
-		if (marker === MARKER_SOT || marker === MARKER_EOC) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`a tile-part header ended at marker 0x${marker.toString(16)} rather than at SOD`);
+		if (marker === MARKER_SOT || marker === MARKER_EOC) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`a tile-part header ended at marker 0x${marker.toString(HEX_RADIX)} rather than at SOD`);
 		readHeaderSegment(marker, cursor, header, componentCount, comments);
 	}
 	const dataStart = cursor.position;
@@ -292,17 +319,19 @@ function readTilePart(cursor, componentCount, tileParts, comments) {
 	const dataEnd = Math.min(declaredEnd, cursor.data.length);
 	if (dataEnd < dataStart) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("a tile-part declares a Psot shorter than its own header");
 	const trimmedEnd = trimTrailingEoc(cursor.data, dataEnd);
-	tileParts.push({
+	cursor.position = dataEnd;
+	return {
 		tileIndex,
 		partIndex,
 		header: freezeHeader(header),
 		dataStart,
 		dataEnd: trimmedEnd
-	});
-	cursor.position = dataEnd;
+	};
 }
+const MARKER_EOC_HIGH_BYTE = 255;
+const MARKER_EOC_LOW_BYTE = 217;
 function trimTrailingEoc(data, end) {
-	if (data[end - 2] === 255 && data[end - 1] === 217) return end - 2;
+	if (data[end - 2] === MARKER_EOC_HIGH_BYTE && data[end - 1] === MARKER_EOC_LOW_BYTE) return end - 2;
 	return end;
 }
 //#endregion

package/dist/image/jpeg2000-codestream.js

@@ -14,6 +14,11 @@ const MARKER_COM = 65380;
 const MARKER_SOT = 65424;
 const MARKER_SOD = 65427;
 const MARKER_EOC = 65497;
+const BITS_PER_BYTE = 8;
+const HEX_RADIX = 16;
+const NIBBLE_MASK = 15;
+const NIBBLE_BITS = 4;
+const UINT16_MODULUS = 65536;
 var MarkerCursor = class {
 	data;
 	position;
@@ -31,10 +36,10 @@ var MarkerCursor = class {
 		return value;
 	}
 	uint16() {
-		return this.uint8() << 8 | this.uint8();
+		return this.uint8() << BITS_PER_BYTE | this.uint8();
 	}
 	uint32() {
-		return this.uint16() * 65536 + this.uint16();
+		return this.uint16() * UINT16_MODULUS + this.uint16();
 	}
 	bytes(length) {
 		if (length < 0 || this.position + length > this.data.length) throw new Jpeg2000ParseError("a JPEG 2000 marker segment declares more data than the codestream carries");
@@ -43,6 +48,9 @@ var MarkerCursor = class {
 		return slice;
 	}
 };
+const SIZ_COMPONENT_RECORD_SIZE = 3;
+const SSIZ_SIGNED_BIT = 128;
+const SSIZ_BIT_DEPTH_MASK = 127;
 function readImageSize(cursor, segmentEnd) {
 	cursor.uint16();
 	const xsiz = cursor.uint32();
@@ -55,13 +63,13 @@ function readImageSize(cursor, segmentEnd) {
 	const ytosiz = cursor.uint32();
 	const count = cursor.uint16();
 	if (count === 0) throw new Jpeg2000ParseError("SIZ declares zero components");
-	if (cursor.position + count * 3 > segmentEnd) throw new Jpeg2000ParseError(`SIZ declares ${String(count)} components but its own length leaves room for fewer`);
+	if (cursor.position + count * SIZ_COMPONENT_RECORD_SIZE > segmentEnd) throw new Jpeg2000ParseError(`SIZ declares ${String(count)} components but its own length leaves room for fewer`);
 	const components = [];
 	for (let i = 0; i < count; i++) {
 		const ssiz = cursor.uint8();
 		components.push({
-			signed: (ssiz & 128) !== 0,
-			bitDepth: (ssiz & 127) + 1,
+			signed: (ssiz & SSIZ_SIGNED_BIT) !== 0,
+			bitDepth: (ssiz & SSIZ_BIT_DEPTH_MASK) + 1,
 			dx: cursor.uint8(),
 			dy: cursor.uint8()
 		});
@@ -81,20 +89,21 @@ function readImageSize(cursor, segmentEnd) {
 	};
 }
 const DEFAULT_PRECINCT_EXPONENT = 15;
+const CODE_BLOCK_AREA_EXPONENT_MAX = 12;
 function readCodingStyleParameters(cursor, explicitPrecincts) {
 	const decompositionLevels = cursor.uint8();
-	const codeBlockWidthExp = (cursor.uint8() & 15) + 2;
-	const codeBlockHeightExp = (cursor.uint8() & 15) + 2;
+	const codeBlockWidthExp = (cursor.uint8() & NIBBLE_MASK) + 2;
+	const codeBlockHeightExp = (cursor.uint8() & NIBBLE_MASK) + 2;
 	const codeBlockStyle = cursor.uint8();
 	const transformCode = cursor.uint8();
 	if (transformCode !== 0 && transformCode !== 1) throw new Jpeg2000ParseError(`SPcod/SPcoc declares transformation ${String(transformCode)}, which is neither of the two ISO/IEC 15444-1 defines`);
-	if (codeBlockWidthExp + codeBlockHeightExp > 12) throw new Jpeg2000ParseError(`code-block size 2^${String(codeBlockWidthExp)} by 2^${String(codeBlockHeightExp)} is outside the range ISO/IEC 15444-1 Table A.18 permits`);
+	if (codeBlockWidthExp + codeBlockHeightExp > CODE_BLOCK_AREA_EXPONENT_MAX) throw new Jpeg2000ParseError(`code-block size 2^${String(codeBlockWidthExp)} by 2^${String(codeBlockHeightExp)} is outside the range ISO/IEC 15444-1 Table A.18 permits`);
 	const precinctSizes = [];
 	if (explicitPrecincts) for (let r = 0; r <= decompositionLevels; r++) {
 		const packed = cursor.uint8();
 		precinctSizes.push({
-			ppx: packed & 15,
-			ppy: packed >> 4 & 15
+			ppx: packed & NIBBLE_MASK,
+			ppy: packed >> NIBBLE_BITS & NIBBLE_MASK
 		});
 	}
 	else for (let r = 0; r <= decompositionLevels; r++) precinctSizes.push({
@@ -110,6 +119,7 @@ function readCodingStyleParameters(cursor, explicitPrecincts) {
 		precinctSizes
 	};
 }
+const SCOD_USE_EPH_BIT = 4;
 function readCodingDefaults(cursor) {
 	const progressionOrders = [
 		"LRCP",
@@ -130,17 +140,22 @@ function readCodingDefaults(cursor) {
 		layers,
 		multipleComponentTransform,
 		useSop: (scod & 2) !== 0,
-		useEph: (scod & 4) !== 0
+		useEph: (scod & SCOD_USE_EPH_BIT) !== 0
 	};
 }
+const SQCD_GUARD_BITS_SHIFT = 5;
+const SQCD_STYLE_MASK = 31;
+const SPQCD_NONE_EXPONENT_SHIFT = 3;
+const SPQCD_EXPONENT_SHIFT = 11;
+const SPQCD_MANTISSA_MASK = 2047;
 function readQuantization(cursor, segmentEnd) {
 	const sq = cursor.uint8();
-	const guardBits = sq >> 5;
-	const styleCode = sq & 31;
+	const guardBits = sq >> SQCD_GUARD_BITS_SHIFT;
+	const styleCode = sq & SQCD_STYLE_MASK;
 	const stepSizes = [];
 	if (styleCode === 0) {
 		while (cursor.position < segmentEnd) stepSizes.push({
-			exponent: cursor.uint8() >> 3,
+			exponent: cursor.uint8() >> SPQCD_NONE_EXPONENT_SHIFT,
 			mantissa: 0
 		});
 		return {
@@ -153,8 +168,8 @@ function readQuantization(cursor, segmentEnd) {
 		while (cursor.position + 1 < segmentEnd) {
 			const packed = cursor.uint16();
 			stepSizes.push({
-				exponent: packed >> 11,
-				mantissa: packed & 2047
+				exponent: packed >> SPQCD_EXPONENT_SHIFT,
+				mantissa: packed & SPQCD_MANTISSA_MASK
 			});
 		}
 		return {
@@ -165,8 +180,9 @@ function readQuantization(cursor, segmentEnd) {
 	}
 	throw new Jpeg2000ParseError(`QCD/QCC declares quantization style ${String(styleCode)}, which ISO/IEC 15444-1 Table A.28 does not define`);
 }
+const COMPONENT_INDEX_WIDTH_THRESHOLD = 257;
 function readComponentIndex(cursor, componentCount) {
-	return componentCount < 257 ? cursor.uint8() : cursor.uint16();
+	return componentCount < COMPONENT_INDEX_WIDTH_THRESHOLD ? cursor.uint8() : cursor.uint16();
 }
 function emptyHeader() {
 	return {
@@ -200,11 +216,20 @@ function freezeHeader(header) {
 	};
 	return base;
 }
+var CodestreamComments = class {
+	#texts = [];
+	add(text) {
+		this.#texts.push(text);
+	}
+	texts() {
+		return this.#texts;
+	}
+};
 function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	const length = cursor.uint16();
-	if (length < 2) throw new Jpeg2000ParseError(`marker segment 0x${marker.toString(16)} declares a length of ${String(length)}, which is shorter than the length field itself`);
+	if (length < 2) throw new Jpeg2000ParseError(`marker segment 0x${marker.toString(HEX_RADIX)} declares a length of ${String(length)}, which is shorter than the length field itself`);
 	const segmentEnd = cursor.position + length - 2;
-	if (segmentEnd > cursor.data.length) throw new Jpeg2000ParseError(`marker segment 0x${marker.toString(16)} declares more data than the codestream carries`);
+	if (segmentEnd > cursor.data.length) throw new Jpeg2000ParseError(`marker segment 0x${marker.toString(HEX_RADIX)} declares more data than the codestream carries`);
 	if (marker === MARKER_COD) header.cod = readCodingDefaults(cursor);
 	else if (marker === MARKER_COC) {
 		const component = readComponentIndex(cursor, componentCount);
@@ -219,7 +244,7 @@ function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	else if (marker === MARKER_COM) {
 		const registration = cursor.uint16();
 		const body = cursor.bytes(segmentEnd - cursor.position);
-		if (registration === 1) comments.push(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
+		if (registration === 1) comments.add(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
 	}
 	cursor.position = segmentEnd;
 }
@@ -227,15 +252,16 @@ function validateMainHeader(header) {
 	if (header.cod === void 0) throw new Jpeg2000ParseError("the main header carries no COD marker, so no coding style is defined for any tile");
 	if (header.qcd === void 0) throw new Jpeg2000ParseError("the main header carries no QCD marker, so no quantization is defined for any tile");
 }
+const MIN_HEADER_BYTES = 4;
 function parseJpeg2000Codestream(data) {
 	const cursor = new MarkerCursor(data);
-	if (cursor.remaining < 4 || cursor.uint16() !== MARKER_SOC) throw new Jpeg2000ParseError("codestream does not begin with an SOC marker");
+	if (cursor.remaining < MIN_HEADER_BYTES || cursor.uint16() !== MARKER_SOC) throw new Jpeg2000ParseError("codestream does not begin with an SOC marker");
 	if (cursor.uint16() !== MARKER_SIZ) throw new Jpeg2000ParseError("the SOC marker is not immediately followed by SIZ, which ISO/IEC 15444-1 A.3 requires");
 	const sizLength = cursor.uint16();
 	const sizEnd = cursor.position + sizLength - 2;
 	const siz = readImageSize(cursor, sizEnd);
 	cursor.position = sizEnd;
-	const comments = [];
+	const comments = new CodestreamComments();
 	const main = emptyHeader();
 	const tileParts = [];
 	let sawEoc = false;
@@ -249,10 +275,10 @@ function parseJpeg2000Codestream(data) {
 		if (marker === MARKER_PPM) throw new Jpeg2000UnsupportedError("the codestream carries a PPM marker (packed packet headers in the main header), an organisation this decoder does not reassemble");
 		if (marker === MARKER_SOT) {
 			cursor.position -= 2;
-			readTilePart(cursor, siz.components.length, tileParts, comments);
+			tileParts.push(readTilePart(cursor, siz.components.length, comments));
 			continue;
 		}
-		if (marker === MARKER_SOD || marker === MARKER_SOC) throw new Jpeg2000ParseError(`unexpected marker 0x${marker.toString(16)} in the main header`);
+		if (marker === MARKER_SOD || marker === MARKER_SOC) throw new Jpeg2000ParseError(`unexpected marker 0x${marker.toString(HEX_RADIX)} in the main header`);
 		readHeaderSegment(marker, cursor, main, siz.components.length, comments);
 	}
 	validateMainHeader(main);
@@ -263,17 +289,18 @@ function parseJpeg2000Codestream(data) {
 		siz,
 		main: freezeHeader(main),
 		tileParts,
-		comments,
+		comments: comments.texts(),
 		numTilesWide,
 		numTilesHigh,
 		truncated: !sawEoc
 	};
 }
-function readTilePart(cursor, componentCount, tileParts, comments) {
+const SOT_SEGMENT_LENGTH = 10;
+function readTilePart(cursor, componentCount, comments) {
 	const sotStart = cursor.position;
 	cursor.uint16();
 	const lsot = cursor.uint16();
-	if (lsot !== 10) throw new Jpeg2000ParseError(`SOT declares a length of ${String(lsot)}, but ISO/IEC 15444-1 A.4.2 fixes it at 10`);
+	if (lsot !== SOT_SEGMENT_LENGTH) throw new Jpeg2000ParseError(`SOT declares a length of ${String(lsot)}, but ISO/IEC 15444-1 A.4.2 fixes it at 10`);
 	const tileIndex = cursor.uint16();
 	const psot = cursor.uint32();
 	const partIndex = cursor.uint8();
@@ -283,7 +310,7 @@ function readTilePart(cursor, componentCount, tileParts, comments) {
 		if (cursor.remaining < 2) throw new Jpeg2000ParseError("a tile-part header ended without an SOD marker");
 		const marker = cursor.uint16();
 		if (marker === MARKER_SOD) break;
-		if (marker === MARKER_SOT || marker === MARKER_EOC) throw new Jpeg2000ParseError(`a tile-part header ended at marker 0x${marker.toString(16)} rather than at SOD`);
+		if (marker === MARKER_SOT || marker === MARKER_EOC) throw new Jpeg2000ParseError(`a tile-part header ended at marker 0x${marker.toString(HEX_RADIX)} rather than at SOD`);
 		readHeaderSegment(marker, cursor, header, componentCount, comments);
 	}
 	const dataStart = cursor.position;
@@ -291,17 +318,19 @@ function readTilePart(cursor, componentCount, tileParts, comments) {
 	const dataEnd = Math.min(declaredEnd, cursor.data.length);
 	if (dataEnd < dataStart) throw new Jpeg2000ParseError("a tile-part declares a Psot shorter than its own header");
 	const trimmedEnd = trimTrailingEoc(cursor.data, dataEnd);
-	tileParts.push({
+	cursor.position = dataEnd;
+	return {
 		tileIndex,
 		partIndex,
 		header: freezeHeader(header),
 		dataStart,
 		dataEnd: trimmedEnd
-	});
-	cursor.position = dataEnd;
+	};
 }
+const MARKER_EOC_HIGH_BYTE = 255;
+const MARKER_EOC_LOW_BYTE = 217;
 function trimTrailingEoc(data, end) {
-	if (data[end - 2] === 255 && data[end - 1] === 217) return end - 2;
+	if (data[end - 2] === MARKER_EOC_HIGH_BYTE && data[end - 1] === MARKER_EOC_LOW_BYTE) return end - 2;
 	return end;
 }
 //#endregion

package/dist/image/jpeg2000-dwt.cjs

@@ -30,13 +30,14 @@ function interleave(source, bounds, write) {
 	for (let v = sub.hV0; v < sub.hV1; v++) for (let u = sub.llU0; u < sub.llU1; u++) write(2 * u, 2 * v + 1, source.lh(u, v));
 	for (let v = sub.hV0; v < sub.hV1; v++) for (let u = sub.hU0; u < sub.hU1; u++) write(2 * u + 1, 2 * v + 1, source.hh(u, v));
 }
+const LOW_PASS_UPDATE_DIVISOR = 4;
 function inverse53Filter(buffer, i0, i1) {
 	const base = EXTENSION_MARGIN - i0;
 	const first = Math.floor(i0 / 2) - 1;
 	const last = Math.floor(i1 / 2) + 1;
 	for (let n = first; n <= last; n++) {
 		const index = base + 2 * n;
-		buffer[index] = (buffer[index] ?? 0) - Math.floor(((buffer[index - 1] ?? 0) + (buffer[index + 1] ?? 0) + 2) / 4);
+		buffer[index] = (buffer[index] ?? 0) - Math.floor(((buffer[index - 1] ?? 0) + (buffer[index + 1] ?? 0) + 2) / LOW_PASS_UPDATE_DIVISOR);
 	}
 	for (let n = first; n < last; n++) {
 		const index = base + 2 * n + 1;

package/dist/image/jpeg2000-dwt.js

@@ -29,13 +29,14 @@ function interleave(source, bounds, write) {
 	for (let v = sub.hV0; v < sub.hV1; v++) for (let u = sub.llU0; u < sub.llU1; u++) write(2 * u, 2 * v + 1, source.lh(u, v));
 	for (let v = sub.hV0; v < sub.hV1; v++) for (let u = sub.hU0; u < sub.hU1; u++) write(2 * u + 1, 2 * v + 1, source.hh(u, v));
 }
+const LOW_PASS_UPDATE_DIVISOR = 4;
 function inverse53Filter(buffer, i0, i1) {
 	const base = EXTENSION_MARGIN - i0;
 	const first = Math.floor(i0 / 2) - 1;
 	const last = Math.floor(i1 / 2) + 1;
 	for (let n = first; n <= last; n++) {
 		const index = base + 2 * n;
-		buffer[index] = (buffer[index] ?? 0) - Math.floor(((buffer[index - 1] ?? 0) + (buffer[index + 1] ?? 0) + 2) / 4);
+		buffer[index] = (buffer[index] ?? 0) - Math.floor(((buffer[index - 1] ?? 0) + (buffer[index + 1] ?? 0) + 2) / LOW_PASS_UPDATE_DIVISOR);
 	}
 	for (let n = first; n < last; n++) {
 		const index = base + 2 * n + 1;

package/dist/image/jpeg2000-t1.cjs

@@ -15,7 +15,9 @@ const STYLE_TERMINATE_ALL = 4;
 const STYLE_VERTICALLY_CAUSAL = 8;
 const STYLE_SEGMENTATION_SYMBOLS = 32;
 const SEGMENTATION_SYMBOL = 10;
+const SEGMENTATION_SYMBOL_MSB_SHIFT = 3;
 const STRIPE_HEIGHT = 4;
+const HEX_RADIX = 16;
 const PASS_SIGNIFICANCE = 0;
 const PASS_REFINEMENT = 1;
 const PASS_CLEANUP = 2;
@@ -23,25 +25,33 @@ function throwForUnsupportedStyle(style) {
 	if ((style & STYLE_SELECTIVE_BYPASS) !== 0) throw new require_image_jpeg2000_errors.Jpeg2000UnsupportedError("the code-block style enables selective arithmetic coding bypass (lazy mode), which splits a code-block into raw and arithmetically coded segments this decoder does not read");
 	if ((style & STYLE_TERMINATE_ALL) !== 0) throw new require_image_jpeg2000_errors.Jpeg2000UnsupportedError("the code-block style terminates the arithmetic coder on every coding pass, which splits a code-block into one segment per pass this decoder does not read");
 }
+const ZC_CONTEXT_3 = 3;
+const ZC_CONTEXT_4 = 4;
+const ZC_CONTEXT_5 = 5;
+const ZC_CONTEXT_6 = 6;
+const ZC_CONTEXT_7 = 7;
+const ZC_CONTEXT_8 = 8;
+const HH_DIAGONAL_NEIGHBOURS_HIGH = 3;
 function zeroCodingContext(subband, horizontal, vertical, diagonal) {
 	if (subband === "HH") {
 		const straight = horizontal + vertical;
-		if (diagonal >= 3) return 8;
-		if (diagonal === 2) return straight >= 1 ? 7 : 6;
-		if (diagonal === 1) return straight >= 2 ? 5 : straight === 1 ? 4 : 3;
+		if (diagonal >= HH_DIAGONAL_NEIGHBOURS_HIGH) return ZC_CONTEXT_8;
+		if (diagonal === 2) return straight >= 1 ? ZC_CONTEXT_7 : ZC_CONTEXT_6;
+		if (diagonal === 1) return straight >= 2 ? ZC_CONTEXT_5 : straight === 1 ? ZC_CONTEXT_4 : ZC_CONTEXT_3;
 		return straight >= 2 ? 2 : straight === 1 ? 1 : 0;
 	}
 	const primary = subband === "HL" ? vertical : horizontal;
 	const secondary = subband === "HL" ? horizontal : vertical;
-	if (primary === 2) return 8;
+	if (primary === 2) return ZC_CONTEXT_8;
 	if (primary === 1) {
-		if (secondary >= 1) return 7;
-		return diagonal >= 1 ? 6 : 5;
+		if (secondary >= 1) return ZC_CONTEXT_7;
+		return diagonal >= 1 ? ZC_CONTEXT_6 : ZC_CONTEXT_5;
 	}
-	if (secondary === 2) return 4;
-	if (secondary === 1) return 3;
+	if (secondary === 2) return ZC_CONTEXT_4;
+	if (secondary === 1) return ZC_CONTEXT_3;
 	return diagonal >= 2 ? 2 : diagonal === 1 ? 1 : 0;
 }
+const SIGN_CONTEXT_TABLE_ROW_STRIDE = 3;
 const SIGN_XOR_FLAG = 8;
 const SIGN_CONTEXT_TABLE = [
 	12,
@@ -102,7 +112,7 @@ function decodeJpeg2000CodeBlock(options) {
 		const below = belowVisible(y, stripeEnd);
 		const horizontal = clampToUnit(contribution(n - 1) + contribution(n + 1));
 		const vertical = clampToUnit(contribution(n - stride) + (below ? contribution(n + stride) : 0));
-		const packed = SIGN_CONTEXT_TABLE[(horizontal + 1) * 3 + (vertical + 1)] ?? 0;
+		const packed = SIGN_CONTEXT_TABLE[(horizontal + 1) * SIGN_CONTEXT_TABLE_ROW_STRIDE + (vertical + 1)] ?? 0;
 		const decision = mq.decode(contexts, SIGN_CONTEXT_BASE + (packed & -9));
 		negative[n] = decision ^ ((packed & SIGN_XOR_FLAG) !== 0 ? 1 : 0);
 	};
@@ -160,8 +170,8 @@ function decodeJpeg2000CodeBlock(options) {
 			}
 		}
 		if (segmentationSymbols) {
-			const symbol = mq.decode(contexts, UNIFORM_CONTEXT) << 3 | mq.decode(contexts, UNIFORM_CONTEXT) << 2 | mq.decode(contexts, UNIFORM_CONTEXT) << 1 | mq.decode(contexts, UNIFORM_CONTEXT);
-			if (symbol !== SEGMENTATION_SYMBOL) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`a cleanup pass ended with segmentation symbol 0x${symbol.toString(16)} rather than the 0xA ISO/IEC 15444-1 D.3.4 requires, so this code-block's coded data is corrupt`);
+			const symbol = mq.decode(contexts, UNIFORM_CONTEXT) << SEGMENTATION_SYMBOL_MSB_SHIFT | mq.decode(contexts, UNIFORM_CONTEXT) << 2 | mq.decode(contexts, UNIFORM_CONTEXT) << 1 | mq.decode(contexts, UNIFORM_CONTEXT);
+			if (symbol !== SEGMENTATION_SYMBOL) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`a cleanup pass ended with segmentation symbol 0x${symbol.toString(HEX_RADIX)} rather than the 0xA ISO/IEC 15444-1 D.3.4 requires, so this code-block's coded data is corrupt`);
 		}
 		codedThisPlane.fill(0);
 	};