pdf-raster-cpu 1.0.1 → 1.0.3

package/dist/index.cjs

@@ -1,50 +1,62 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let byte_codec = require("byte-codec");
+function firstSampleAtOrAfter(coordinate) {
+	return Math.max(0, Math.ceil(coordinate * 4 - .5));
+}
+function lastSampleBefore(coordinate, sizePx) {
+	return Math.min(4 * sizePx - 1, Math.floor(coordinate * 4 - .5));
+}
 var CoverageMask = class {
 	widthPx;
 	heightPx;
 	counts;
+	markedFirst;
+	markedLast;
 	constructor(widthPx, heightPx) {
 		this.widthPx = widthPx;
 		this.heightPx = heightPx;
 		this.counts = new Uint16Array(widthPx * heightPx);
+		this.markedFirst = this.counts.length;
+		this.markedLast = 0;
 	}
 	reset() {
 		this.counts.fill(0);
+		this.markedFirst = this.counts.length;
+		this.markedLast = 0;
 	}
 	countAt(pixelIndex) {
 		return this.counts[pixelIndex] ?? 0;
 	}
+	markedRange() {
+		return {
+			first: this.markedFirst,
+			last: this.markedLast
+		};
+	}
 	fillPolygons(polygons, fillRule) {
-		if (polygons.length === 0) return;
-		let minY = Infinity;
-		let maxY = -Infinity;
+		const boundedYs = [];
 		for (const polygon of polygons) {
 			if (polygon.length < 3) continue;
-			for (const point of polygon) {
-				minY = Math.min(minY, point.y);
-				maxY = Math.max(maxY, point.y);
-			}
+			for (const point of polygon) boundedYs.push(point.y);
 		}
-		if (maxY <= minY) return;
-		const rowMin = Math.max(0, Math.ceil(minY * 4 - .5));
-		const rowMax = Math.min(4 * this.heightPx - 1, Math.floor(maxY * 4 - .5));
+		if (boundedYs.length === 0) return;
+		const rowMin = firstSampleAtOrAfter(boundedYs.reduce((lowest, y) => Math.min(lowest, y)));
+		const rowMax = lastSampleBefore(boundedYs.reduce((highest, y) => Math.max(highest, y)), this.heightPx);
 		const crossings = [];
 		for (let row = rowMin; row <= rowMax; row++) {
 			const y = (row + .5) / 4;
 			crossings.length = 0;
-			for (const polygon of polygons) for (let i = 0; i < polygon.length; i++) {
-				const a = polygon[i];
+			for (const polygon of polygons) for (const [i, a] of polygon.entries()) {
 				const b = polygon[(i + 1) % polygon.length];
-				if (a === void 0 || b === void 0) continue;
-				if (a.y <= y === b.y <= y) continue;
+				if (b === void 0) continue;
+				const aAtOrAboveRow = a.y <= y;
+				if (aAtOrAboveRow === b.y <= y) continue;
 				const t = (y - a.y) / (b.y - a.y);
 				crossings.push({
 					x: a.x + t * (b.x - a.x),
-					dir: b.y > a.y ? 1 : -1
+					downward: aAtOrAboveRow
 				});
 			}
-			if (crossings.length === 0) continue;
 			crossings.sort((p, q) => p.x - q.x);
 			const pixelRowBase = Math.floor(row / 4) * this.widthPx;
 			let spanStartX;
@@ -58,9 +70,10 @@ var CoverageMask = class {
 					}
 					continue;
 				}
-				const previous = winding;
-				winding += crossing.dir;
-				if (previous === 0 && winding !== 0) spanStartX = crossing.x;
+				const wasZero = winding === 0;
+				if (crossing.downward) winding++;
+				else winding--;
+				if (wasZero) spanStartX = crossing.x;
 				else if (spanStartX !== void 0 && winding === 0) {
 					this.markSpan(pixelRowBase, spanStartX, crossing.x);
 					spanStartX = void 0;
@@ -70,12 +83,16 @@ var CoverageMask = class {
 	}
 	markSpan(pixelRowBase, startX, endX) {
 		if (endX <= startX) return;
-		const columnFirst = Math.max(0, Math.ceil(startX * 4 - .5));
-		const columnLast = Math.min(4 * this.widthPx - 1, Math.floor(endX * 4 - .5));
+		const columnFirst = firstSampleAtOrAfter(startX);
+		const columnLast = lastSampleBefore(endX, this.widthPx);
 		for (let c = columnFirst; c <= columnLast; c++) {
 			const cellIndex = pixelRowBase + Math.floor(c / 4);
 			const cell = this.counts[cellIndex];
-			if (cell !== void 0) this.counts[cellIndex] = cell + 1;
+			if (cell !== void 0) {
+				this.counts[cellIndex] = cell + 1;
+				this.markedFirst = Math.min(this.markedFirst, cellIndex);
+				this.markedLast = Math.max(this.markedLast, cellIndex);
+			}
 		}
 	}
 };
@@ -156,10 +173,9 @@ function strokeOutlinePolygons(subpaths, widthPx, dashPx) {
 	const half = Math.max(widthPx, 1) / 2;
 	const polygons = [];
 	const emitPiece = (piece) => {
-		for (let i = 0; i + 1 < piece.length; i++) {
-			const p = piece[i];
+		for (const [i, p] of piece.entries()) {
 			const q = piece[i + 1];
-			if (p === void 0 || q === void 0) continue;
+			if (q === void 0) continue;
 			const d = unitDirection(p, q);
 			if (d === void 0) continue;
 			const n = {
@@ -185,11 +201,10 @@ function strokeOutlinePolygons(subpaths, widthPx, dashPx) {
 				}
 			]);
 		}
-		for (let i = 1; i + 1 < piece.length; i++) {
-			const vertex = piece[i];
+		for (const [i, vertex] of piece.entries()) {
 			const before = piece[i - 1];
 			const after = piece[i + 1];
-			if (vertex === void 0 || before === void 0 || after === void 0) continue;
+			if (before === void 0 || after === void 0) continue;
 			emitJoinWedge(polygons, vertex, before, after, half);
 		}
 	};
@@ -198,7 +213,7 @@ function strokeOutlinePolygons(subpaths, widthPx, dashPx) {
 			const first = subpath.points[0];
 			if (first === void 0) continue;
 			emitPiece(subpath.closed ? [...subpath.points, first] : subpath.points);
-			if (subpath.closed && subpath.points.length >= 3) {
+			if (subpath.closed) {
 				const last = subpath.points[subpath.points.length - 1];
 				const second = subpath.points[1];
 				if (last !== void 0 && second !== void 0) emitJoinWedge(polygons, first, last, second, half);
@@ -215,14 +230,20 @@ function emitJoinWedge(polygons, vertex, before, after, half) {
 	if (d1 === void 0 || d2 === void 0) return;
 	const cross = d1.x * d2.y - d1.y * d2.x;
 	if (Math.abs(cross) < 1e-12) return;
-	const side = cross > 0 ? -1 : 1;
-	const n1 = {
-		x: -d1.y * side,
-		y: d1.x * side
+	const outward = turnsOutwardPositive(cross);
+	const n1 = outward ? {
+		x: d1.y,
+		y: -d1.x
+	} : {
+		x: -d1.y,
+		y: d1.x
 	};
-	const n2 = {
-		x: -d2.y * side,
-		y: d2.x * side
+	const n2 = outward ? {
+		x: d2.y,
+		y: -d2.x
+	} : {
+		x: -d2.y,
+		y: d2.x
 	};
 	const a1 = {
 		x: vertex.x + n1.x * half,
@@ -232,10 +253,9 @@ function emitJoinWedge(polygons, vertex, before, after, half) {
 		x: vertex.x + n2.x * half,
 		y: vertex.y + n2.y * half
 	};
-	const dot = n1.x * n2.x + n1.y * n2.y;
-	const denominator = 1 + dot;
+	const denominator = 1 + (n1.x * n2.x + n1.y * n2.y);
 	let wedge;
-	if (denominator > 1e-12 && miterRatio(dot) <= 10) {
+	if (takesMiterBranch(denominator)) {
 		const scale = half / denominator;
 		wedge = [
 			a1,
@@ -251,17 +271,22 @@ function emitJoinWedge(polygons, vertex, before, after, half) {
 		vertex,
 		a2
 	];
-	polygons.push(polygonSignedArea(wedge) < 0 ? [...wedge] : [...wedge].reverse());
+	polygons.push(withNegativeWinding(wedge));
+}
+function turnsOutwardPositive(cross) {
+	return cross > 0;
+}
+function takesMiterBranch(denominator) {
+	return 2 <= 100 * denominator;
 }
-function miterRatio(dot) {
-	return Math.sqrt(2 + 2 * dot) / (1 + dot);
+function withNegativeWinding(polygon) {
+	return polygonSignedArea(polygon) < 0 ? [...polygon] : [...polygon].reverse();
 }
 function polygonSignedArea(polygon) {
 	let area = 0;
-	for (let i = 0; i < polygon.length; i++) {
-		const a = polygon[i];
+	for (const [i, a] of polygon.entries()) {
 		const b = polygon[(i + 1) % polygon.length];
-		if (a === void 0 || b === void 0) continue;
+		if (b === void 0) continue;
 		area += a.x * b.y - b.x * a.y;
 	}
 	return area;
@@ -278,17 +303,17 @@ function unitDirection(p, q) {
 }
 function dashPolyline(subpath, dashPx) {
 	if (!dashPx.some((length) => length > 0)) return [];
-	const pattern = dashPx.length % 2 === 1 ? [...dashPx, ...dashPx] : dashPx;
-	const points = subpath.closed ? [...subpath.points, subpath.points[0]] : subpath.points;
-	const start = points[0];
+	const pattern = [...dashPx, ...dashPx];
+	const start = subpath.points[0];
 	if (start === void 0) return [];
+	const points = subpath.closed ? [...subpath.points, start] : subpath.points;
 	const pieces = [];
 	const endOnPiece = () => {
 		if (current.length >= 2) pieces.push(current);
 		current = [];
 	};
 	const atBoundary = () => {
-		if (index % 2 === 0) endOnPiece();
+		endOnPiece();
 		for (;;) {
 			index = (index + 1) % pattern.length;
 			const entry = pattern[index];
@@ -307,16 +332,15 @@ function dashPolyline(subpath, dashPx) {
 	if (firstEntry !== void 0 && firstEntry > 0) {
 		remaining = firstEntry;
 		current = [cursor];
-	} else atBoundary();
-	for (let i = 0; i + 1 < points.length; i++) {
-		const from = points[i];
+	}
+	for (const [i, from] of points.entries()) {
 		const to = points[i + 1];
-		if (from === void 0 || to === void 0) continue;
+		if (to === void 0) continue;
 		const direction = unitDirection(from, to);
 		if (direction === void 0) continue;
 		cursor = from;
 		let segmentRemaining = Math.hypot(to.x - from.x, to.y - from.y);
-		while (segmentRemaining > 0 && remaining > 0) {
+		while (segmentRemaining > 0) {
 			const step = Math.min(segmentRemaining, remaining);
 			cursor = {
 				x: cursor.x + direction.x * step,
@@ -328,7 +352,7 @@ function dashPolyline(subpath, dashPx) {
 			if (remaining === 0) atBoundary();
 		}
 	}
-	if (current.length > 0) endOnPiece();
+	endOnPiece();
 	return pieces;
 }
 //#endregion
@@ -351,6 +375,9 @@ var CpuRasteriser = class {
 		};
 		this.decodedImages.clear();
 	}
+	decodedImageForTesting(bytes) {
+		return this.decodedImages.get(decodeCacheKey(bytes));
+	}
 	draw(op) {
 		if (op.kind === "fillRect") {
 			this.fillRectOp(op);
@@ -380,10 +407,9 @@ var CpuRasteriser = class {
 	fillRectOp(op) {
 		const { geometry, canvas } = this.requirePage("draw");
 		const left = Math.max(op.xPx, 0);
-		const right = Math.min(op.xPx + op.widthPx, geometry.widthPx);
 		const top = Math.max(op.yPx, 0);
-		const bottom = Math.min(op.yPx + op.heightPx, geometry.heightPx);
-		if (right <= left || bottom <= top) return;
+		const right = Math.max(Math.min(op.xPx + op.widthPx, geometry.widthPx), left);
+		const bottom = Math.max(Math.min(op.yPx + op.heightPx, geometry.heightPx), top);
 		const colour = colourBytes(op.color);
 		const columnStart = Math.floor(left);
 		const columnEnd = Math.ceil(right);
@@ -391,11 +417,9 @@ var CpuRasteriser = class {
 		const rowEnd = Math.ceil(bottom);
 		for (let row = rowStart; row < rowEnd; row++) {
 			const coverageY = pixelOverlap(row, top, bottom);
-			if (coverageY === 0) continue;
 			const rowBase = row * geometry.widthPx;
 			for (let column = columnStart; column < columnEnd; column++) {
 				const coverage = coverageY * pixelOverlap(column, left, right);
-				if (coverage === 0) continue;
 				this.blendPixel(canvas, rowBase + column, colour, coverage);
 			}
 		}
@@ -430,27 +454,21 @@ var CpuRasteriser = class {
 		mask.reset();
 		mask.fillPolygons([quad], "nonzero");
 		const inverse = invertMatrix(op.matrix);
-		const rowStart = Math.max(0, Math.floor(Math.min(...quad.map((corner) => corner.y))));
-		const rowEnd = Math.min(geometry.heightPx, Math.ceil(Math.max(...quad.map((corner) => corner.y))));
-		const columnStart = Math.max(0, Math.floor(Math.min(...quad.map((corner) => corner.x))));
-		const columnEnd = Math.min(geometry.widthPx, Math.ceil(Math.max(...quad.map((corner) => corner.x))));
-		for (let row = rowStart; row < rowEnd; row++) {
-			const rowBase = row * geometry.widthPx;
-			for (let column = columnStart; column < columnEnd; column++) {
-				const samples = mask.countAt(rowBase + column);
-				if (samples === 0) continue;
-				const [u, v] = inverse(column + .5, row + .5);
-				const [r, g, b, a] = sampleBilinear(source, u, v);
-				this.blendPixel(canvas, rowBase + column, {
-					r,
-					g,
-					b
-				}, samples / 16 * a);
-			}
+		const { first, last } = mask.markedRange();
+		for (let i = first; i <= last; i++) {
+			const samples = mask.countAt(i);
+			const row = Math.floor(i / geometry.widthPx);
+			const [u, v] = inverse(i % geometry.widthPx + .5, row + .5);
+			const [r, g, b, a] = sampleBilinear(source, u, v);
+			this.blendPixel(canvas, i, {
+				r,
+				g,
+				b
+			}, samples / 16 * a);
 		}
 	}
 	decodeCached(bytes) {
-		const key = `${bytes.length}:${(0, byte_codec.crc32)(bytes)}`;
+		const key = decodeCacheKey(bytes);
 		const cached = this.decodedImages.get(key);
 		if (cached !== void 0) return cached;
 		const decoded = (0, byte_codec.decodePng)(bytes);
@@ -459,10 +477,9 @@ var CpuRasteriser = class {
 	}
 	blendMask(canvas, mask, color) {
 		const colour = colourBytes(color);
-		const pixels = mask.widthPx * mask.heightPx;
-		for (let i = 0; i < pixels; i++) {
+		const { first, last } = mask.markedRange();
+		for (let i = first; i <= last; i++) {
 			const samples = mask.countAt(i);
-			if (samples === 0) continue;
 			this.blendPixel(canvas, i, colour, samples / 16);
 		}
 	}
@@ -480,8 +497,11 @@ function colourBytes(color) {
 		b: Math.round(color.b * 255)
 	};
 }
+function decodeCacheKey(bytes) {
+	return `${bytes.length}:${(0, byte_codec.crc32)(bytes)}`;
+}
 function pixelOverlap(index, edgeLow, edgeHigh) {
-	return Math.max(0, Math.min(index + 1, edgeHigh) - Math.max(index, edgeLow));
+	return Math.min(index + 1, edgeHigh) - Math.max(index, edgeLow);
 }
 function quadCorners(matrix) {
 	const [a, b, c, d, e, f] = matrix;
@@ -512,8 +532,8 @@ function sampleBilinear(source, u, v) {
 	const sy = Math.min(Math.max(clampedV * source.height - .5, 0), source.height - 1);
 	const x0 = Math.floor(sx);
 	const y0 = Math.floor(sy);
-	const x1 = Math.min(x0 + 1, source.width - 1);
-	const y1 = Math.min(y0 + 1, source.height - 1);
+	const x1 = x0 + 1;
+	const y1 = y0 + 1;
 	const fx = sx - x0;
 	const fy = sy - y0;
 	const channelCount = source.channels === 1 ? 1 : 3;

package/dist/index.d.cts

@@ -1,3 +1,4 @@
+import { RawImage } from "byte-codec";
 import { PageRasteriser, RasterDrawOp, RasterPageGeometry } from "pdf-codec/raster";
 //#region src/rasteriser.d.ts
 interface RasterCpuDiagnostic {
@@ -14,6 +15,7 @@ declare class CpuRasteriser implements PageRasteriser {
   private readonly decodedImages;
   constructor(options?: CpuRasteriserOptions);
   beginPage(geometry: RasterPageGeometry): void;
+  decodedImageForTesting(bytes: Uint8Array<ArrayBuffer>): RawImage | undefined;
   draw(op: RasterDrawOp): void;
   finish(): Uint8Array<ArrayBuffer>;
   private requirePage;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { RawImage } from "byte-codec";
 import { PageRasteriser, RasterDrawOp, RasterPageGeometry } from "pdf-codec/raster";
 //#region src/rasteriser.d.ts
 interface RasterCpuDiagnostic {
@@ -14,6 +15,7 @@ declare class CpuRasteriser implements PageRasteriser {
   private readonly decodedImages;
   constructor(options?: CpuRasteriserOptions);
   beginPage(geometry: RasterPageGeometry): void;
+  decodedImageForTesting(bytes: Uint8Array<ArrayBuffer>): RawImage | undefined;
   draw(op: RasterDrawOp): void;
   finish(): Uint8Array<ArrayBuffer>;
   private requirePage;

package/dist/index.js

@@ -1,49 +1,61 @@
 import { crc32, decodePng, encodePng } from "byte-codec";
+function firstSampleAtOrAfter(coordinate) {
+	return Math.max(0, Math.ceil(coordinate * 4 - .5));
+}
+function lastSampleBefore(coordinate, sizePx) {
+	return Math.min(4 * sizePx - 1, Math.floor(coordinate * 4 - .5));
+}
 var CoverageMask = class {
 	widthPx;
 	heightPx;
 	counts;
+	markedFirst;
+	markedLast;
 	constructor(widthPx, heightPx) {
 		this.widthPx = widthPx;
 		this.heightPx = heightPx;
 		this.counts = new Uint16Array(widthPx * heightPx);
+		this.markedFirst = this.counts.length;
+		this.markedLast = 0;
 	}
 	reset() {
 		this.counts.fill(0);
+		this.markedFirst = this.counts.length;
+		this.markedLast = 0;
 	}
 	countAt(pixelIndex) {
 		return this.counts[pixelIndex] ?? 0;
 	}
+	markedRange() {
+		return {
+			first: this.markedFirst,
+			last: this.markedLast
+		};
+	}
 	fillPolygons(polygons, fillRule) {
-		if (polygons.length === 0) return;
-		let minY = Infinity;
-		let maxY = -Infinity;
+		const boundedYs = [];
 		for (const polygon of polygons) {
 			if (polygon.length < 3) continue;
-			for (const point of polygon) {
-				minY = Math.min(minY, point.y);
-				maxY = Math.max(maxY, point.y);
-			}
+			for (const point of polygon) boundedYs.push(point.y);
 		}
-		if (maxY <= minY) return;
-		const rowMin = Math.max(0, Math.ceil(minY * 4 - .5));
-		const rowMax = Math.min(4 * this.heightPx - 1, Math.floor(maxY * 4 - .5));
+		if (boundedYs.length === 0) return;
+		const rowMin = firstSampleAtOrAfter(boundedYs.reduce((lowest, y) => Math.min(lowest, y)));
+		const rowMax = lastSampleBefore(boundedYs.reduce((highest, y) => Math.max(highest, y)), this.heightPx);
 		const crossings = [];
 		for (let row = rowMin; row <= rowMax; row++) {
 			const y = (row + .5) / 4;
 			crossings.length = 0;
-			for (const polygon of polygons) for (let i = 0; i < polygon.length; i++) {
-				const a = polygon[i];
+			for (const polygon of polygons) for (const [i, a] of polygon.entries()) {
 				const b = polygon[(i + 1) % polygon.length];
-				if (a === void 0 || b === void 0) continue;
-				if (a.y <= y === b.y <= y) continue;
+				if (b === void 0) continue;
+				const aAtOrAboveRow = a.y <= y;
+				if (aAtOrAboveRow === b.y <= y) continue;
 				const t = (y - a.y) / (b.y - a.y);
 				crossings.push({
 					x: a.x + t * (b.x - a.x),
-					dir: b.y > a.y ? 1 : -1
+					downward: aAtOrAboveRow
 				});
 			}
-			if (crossings.length === 0) continue;
 			crossings.sort((p, q) => p.x - q.x);
 			const pixelRowBase = Math.floor(row / 4) * this.widthPx;
 			let spanStartX;
@@ -57,9 +69,10 @@ var CoverageMask = class {
 					}
 					continue;
 				}
-				const previous = winding;
-				winding += crossing.dir;
-				if (previous === 0 && winding !== 0) spanStartX = crossing.x;
+				const wasZero = winding === 0;
+				if (crossing.downward) winding++;
+				else winding--;
+				if (wasZero) spanStartX = crossing.x;
 				else if (spanStartX !== void 0 && winding === 0) {
 					this.markSpan(pixelRowBase, spanStartX, crossing.x);
 					spanStartX = void 0;
@@ -69,12 +82,16 @@ var CoverageMask = class {
 	}
 	markSpan(pixelRowBase, startX, endX) {
 		if (endX <= startX) return;
-		const columnFirst = Math.max(0, Math.ceil(startX * 4 - .5));
-		const columnLast = Math.min(4 * this.widthPx - 1, Math.floor(endX * 4 - .5));
+		const columnFirst = firstSampleAtOrAfter(startX);
+		const columnLast = lastSampleBefore(endX, this.widthPx);
 		for (let c = columnFirst; c <= columnLast; c++) {
 			const cellIndex = pixelRowBase + Math.floor(c / 4);
 			const cell = this.counts[cellIndex];
-			if (cell !== void 0) this.counts[cellIndex] = cell + 1;
+			if (cell !== void 0) {
+				this.counts[cellIndex] = cell + 1;
+				this.markedFirst = Math.min(this.markedFirst, cellIndex);
+				this.markedLast = Math.max(this.markedLast, cellIndex);
+			}
 		}
 	}
 };
@@ -155,10 +172,9 @@ function strokeOutlinePolygons(subpaths, widthPx, dashPx) {
 	const half = Math.max(widthPx, 1) / 2;
 	const polygons = [];
 	const emitPiece = (piece) => {
-		for (let i = 0; i + 1 < piece.length; i++) {
-			const p = piece[i];
+		for (const [i, p] of piece.entries()) {
 			const q = piece[i + 1];
-			if (p === void 0 || q === void 0) continue;
+			if (q === void 0) continue;
 			const d = unitDirection(p, q);
 			if (d === void 0) continue;
 			const n = {
@@ -184,11 +200,10 @@ function strokeOutlinePolygons(subpaths, widthPx, dashPx) {
 				}
 			]);
 		}
-		for (let i = 1; i + 1 < piece.length; i++) {
-			const vertex = piece[i];
+		for (const [i, vertex] of piece.entries()) {
 			const before = piece[i - 1];
 			const after = piece[i + 1];
-			if (vertex === void 0 || before === void 0 || after === void 0) continue;
+			if (before === void 0 || after === void 0) continue;
 			emitJoinWedge(polygons, vertex, before, after, half);
 		}
 	};
@@ -197,7 +212,7 @@ function strokeOutlinePolygons(subpaths, widthPx, dashPx) {
 			const first = subpath.points[0];
 			if (first === void 0) continue;
 			emitPiece(subpath.closed ? [...subpath.points, first] : subpath.points);
-			if (subpath.closed && subpath.points.length >= 3) {
+			if (subpath.closed) {
 				const last = subpath.points[subpath.points.length - 1];
 				const second = subpath.points[1];
 				if (last !== void 0 && second !== void 0) emitJoinWedge(polygons, first, last, second, half);
@@ -214,14 +229,20 @@ function emitJoinWedge(polygons, vertex, before, after, half) {
 	if (d1 === void 0 || d2 === void 0) return;
 	const cross = d1.x * d2.y - d1.y * d2.x;
 	if (Math.abs(cross) < 1e-12) return;
-	const side = cross > 0 ? -1 : 1;
-	const n1 = {
-		x: -d1.y * side,
-		y: d1.x * side
+	const outward = turnsOutwardPositive(cross);
+	const n1 = outward ? {
+		x: d1.y,
+		y: -d1.x
+	} : {
+		x: -d1.y,
+		y: d1.x
 	};
-	const n2 = {
-		x: -d2.y * side,
-		y: d2.x * side
+	const n2 = outward ? {
+		x: d2.y,
+		y: -d2.x
+	} : {
+		x: -d2.y,
+		y: d2.x
 	};
 	const a1 = {
 		x: vertex.x + n1.x * half,
@@ -231,10 +252,9 @@ function emitJoinWedge(polygons, vertex, before, after, half) {
 		x: vertex.x + n2.x * half,
 		y: vertex.y + n2.y * half
 	};
-	const dot = n1.x * n2.x + n1.y * n2.y;
-	const denominator = 1 + dot;
+	const denominator = 1 + (n1.x * n2.x + n1.y * n2.y);
 	let wedge;
-	if (denominator > 1e-12 && miterRatio(dot) <= 10) {
+	if (takesMiterBranch(denominator)) {
 		const scale = half / denominator;
 		wedge = [
 			a1,
@@ -250,17 +270,22 @@ function emitJoinWedge(polygons, vertex, before, after, half) {
 		vertex,
 		a2
 	];
-	polygons.push(polygonSignedArea(wedge) < 0 ? [...wedge] : [...wedge].reverse());
+	polygons.push(withNegativeWinding(wedge));
+}
+function turnsOutwardPositive(cross) {
+	return cross > 0;
+}
+function takesMiterBranch(denominator) {
+	return 2 <= 100 * denominator;
 }
-function miterRatio(dot) {
-	return Math.sqrt(2 + 2 * dot) / (1 + dot);
+function withNegativeWinding(polygon) {
+	return polygonSignedArea(polygon) < 0 ? [...polygon] : [...polygon].reverse();
 }
 function polygonSignedArea(polygon) {
 	let area = 0;
-	for (let i = 0; i < polygon.length; i++) {
-		const a = polygon[i];
+	for (const [i, a] of polygon.entries()) {
 		const b = polygon[(i + 1) % polygon.length];
-		if (a === void 0 || b === void 0) continue;
+		if (b === void 0) continue;
 		area += a.x * b.y - b.x * a.y;
 	}
 	return area;
@@ -277,17 +302,17 @@ function unitDirection(p, q) {
 }
 function dashPolyline(subpath, dashPx) {
 	if (!dashPx.some((length) => length > 0)) return [];
-	const pattern = dashPx.length % 2 === 1 ? [...dashPx, ...dashPx] : dashPx;
-	const points = subpath.closed ? [...subpath.points, subpath.points[0]] : subpath.points;
-	const start = points[0];
+	const pattern = [...dashPx, ...dashPx];
+	const start = subpath.points[0];
 	if (start === void 0) return [];
+	const points = subpath.closed ? [...subpath.points, start] : subpath.points;
 	const pieces = [];
 	const endOnPiece = () => {
 		if (current.length >= 2) pieces.push(current);
 		current = [];
 	};
 	const atBoundary = () => {
-		if (index % 2 === 0) endOnPiece();
+		endOnPiece();
 		for (;;) {
 			index = (index + 1) % pattern.length;
 			const entry = pattern[index];
@@ -306,16 +331,15 @@ function dashPolyline(subpath, dashPx) {
 	if (firstEntry !== void 0 && firstEntry > 0) {
 		remaining = firstEntry;
 		current = [cursor];
-	} else atBoundary();
-	for (let i = 0; i + 1 < points.length; i++) {
-		const from = points[i];
+	}
+	for (const [i, from] of points.entries()) {
 		const to = points[i + 1];
-		if (from === void 0 || to === void 0) continue;
+		if (to === void 0) continue;
 		const direction = unitDirection(from, to);
 		if (direction === void 0) continue;
 		cursor = from;
 		let segmentRemaining = Math.hypot(to.x - from.x, to.y - from.y);
-		while (segmentRemaining > 0 && remaining > 0) {
+		while (segmentRemaining > 0) {
 			const step = Math.min(segmentRemaining, remaining);
 			cursor = {
 				x: cursor.x + direction.x * step,
@@ -327,7 +351,7 @@ function dashPolyline(subpath, dashPx) {
 			if (remaining === 0) atBoundary();
 		}
 	}
-	if (current.length > 0) endOnPiece();
+	endOnPiece();
 	return pieces;
 }
 //#endregion
@@ -350,6 +374,9 @@ var CpuRasteriser = class {
 		};
 		this.decodedImages.clear();
 	}
+	decodedImageForTesting(bytes) {
+		return this.decodedImages.get(decodeCacheKey(bytes));
+	}
 	draw(op) {
 		if (op.kind === "fillRect") {
 			this.fillRectOp(op);
@@ -379,10 +406,9 @@ var CpuRasteriser = class {
 	fillRectOp(op) {
 		const { geometry, canvas } = this.requirePage("draw");
 		const left = Math.max(op.xPx, 0);
-		const right = Math.min(op.xPx + op.widthPx, geometry.widthPx);
 		const top = Math.max(op.yPx, 0);
-		const bottom = Math.min(op.yPx + op.heightPx, geometry.heightPx);
-		if (right <= left || bottom <= top) return;
+		const right = Math.max(Math.min(op.xPx + op.widthPx, geometry.widthPx), left);
+		const bottom = Math.max(Math.min(op.yPx + op.heightPx, geometry.heightPx), top);
 		const colour = colourBytes(op.color);
 		const columnStart = Math.floor(left);
 		const columnEnd = Math.ceil(right);
@@ -390,11 +416,9 @@ var CpuRasteriser = class {
 		const rowEnd = Math.ceil(bottom);
 		for (let row = rowStart; row < rowEnd; row++) {
 			const coverageY = pixelOverlap(row, top, bottom);
-			if (coverageY === 0) continue;
 			const rowBase = row * geometry.widthPx;
 			for (let column = columnStart; column < columnEnd; column++) {
 				const coverage = coverageY * pixelOverlap(column, left, right);
-				if (coverage === 0) continue;
 				this.blendPixel(canvas, rowBase + column, colour, coverage);
 			}
 		}
@@ -429,27 +453,21 @@ var CpuRasteriser = class {
 		mask.reset();
 		mask.fillPolygons([quad], "nonzero");
 		const inverse = invertMatrix(op.matrix);
-		const rowStart = Math.max(0, Math.floor(Math.min(...quad.map((corner) => corner.y))));
-		const rowEnd = Math.min(geometry.heightPx, Math.ceil(Math.max(...quad.map((corner) => corner.y))));
-		const columnStart = Math.max(0, Math.floor(Math.min(...quad.map((corner) => corner.x))));
-		const columnEnd = Math.min(geometry.widthPx, Math.ceil(Math.max(...quad.map((corner) => corner.x))));
-		for (let row = rowStart; row < rowEnd; row++) {
-			const rowBase = row * geometry.widthPx;
-			for (let column = columnStart; column < columnEnd; column++) {
-				const samples = mask.countAt(rowBase + column);
-				if (samples === 0) continue;
-				const [u, v] = inverse(column + .5, row + .5);
-				const [r, g, b, a] = sampleBilinear(source, u, v);
-				this.blendPixel(canvas, rowBase + column, {
-					r,
-					g,
-					b
-				}, samples / 16 * a);
-			}
+		const { first, last } = mask.markedRange();
+		for (let i = first; i <= last; i++) {
+			const samples = mask.countAt(i);
+			const row = Math.floor(i / geometry.widthPx);
+			const [u, v] = inverse(i % geometry.widthPx + .5, row + .5);
+			const [r, g, b, a] = sampleBilinear(source, u, v);
+			this.blendPixel(canvas, i, {
+				r,
+				g,
+				b
+			}, samples / 16 * a);
 		}
 	}
 	decodeCached(bytes) {
-		const key = `${bytes.length}:${crc32(bytes)}`;
+		const key = decodeCacheKey(bytes);
 		const cached = this.decodedImages.get(key);
 		if (cached !== void 0) return cached;
 		const decoded = decodePng(bytes);
@@ -458,10 +476,9 @@ var CpuRasteriser = class {
 	}
 	blendMask(canvas, mask, color) {
 		const colour = colourBytes(color);
-		const pixels = mask.widthPx * mask.heightPx;
-		for (let i = 0; i < pixels; i++) {
+		const { first, last } = mask.markedRange();
+		for (let i = first; i <= last; i++) {
 			const samples = mask.countAt(i);
-			if (samples === 0) continue;
 			this.blendPixel(canvas, i, colour, samples / 16);
 		}
 	}
@@ -479,8 +496,11 @@ function colourBytes(color) {
 		b: Math.round(color.b * 255)
 	};
 }
+function decodeCacheKey(bytes) {
+	return `${bytes.length}:${crc32(bytes)}`;
+}
 function pixelOverlap(index, edgeLow, edgeHigh) {
-	return Math.max(0, Math.min(index + 1, edgeHigh) - Math.max(index, edgeLow));
+	return Math.min(index + 1, edgeHigh) - Math.max(index, edgeLow);
 }
 function quadCorners(matrix) {
 	const [a, b, c, d, e, f] = matrix;
@@ -511,8 +531,8 @@ function sampleBilinear(source, u, v) {
 	const sy = Math.min(Math.max(clampedV * source.height - .5, 0), source.height - 1);
 	const x0 = Math.floor(sx);
 	const y0 = Math.floor(sy);
-	const x1 = Math.min(x0 + 1, source.width - 1);
-	const y1 = Math.min(y0 + 1, source.height - 1);
+	const x1 = x0 + 1;
+	const y1 = y0 + 1;
 	const fx = sx - x0;
 	const fy = sy - y0;
 	const channelCount = source.channels === 1 ? 1 : 3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-raster-cpu",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Pure-software reference backend for pdf-codec's PageRasteriser port: an RGBA scanline rasteriser that renders a page (or a located figure region) to PNG bytes with no canvas dependency, on any Worker-isomorphic runtime.",
   "type": "module",
   "repository": {
@@ -78,8 +78,8 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "byte-codec": "1.5.1",
-    "pdf-codec": "4.8.1"
+    "byte-codec": "1.5.2",
+    "pdf-codec": "4.8.2"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",