@poe-platform/safe-bash 0.1.758 → 0.1.760

package/dist/image-ast/index.browser.js

@@ -8654,6 +8654,7 @@ var messages_default2 = {
   "-5": "buffer error",
   "-6": "incompatible version"
 };
+var Z_BUF_ERROR = -5;
 var MAX_MEM_LEVEL2 = 9;
 var HEAP_SIZE2 = 573;
 var MIN_MATCH2 = 3;
@@ -30545,22 +30546,31 @@ function decodeFlate(bytes, parms, maxDecodedBytes = DEFAULT_MAX_DECODED_BYTES)
     inflated = new BoundedFlateStream(bytes, maxDecodedBytes).getBytes();
   } catch (error) {
     if (error instanceof PdfError && error.code === "E_LIMIT") throw error;
+    const wrapped = bytes[0] === 31 && bytes[1] === 139 || bytes.length >= 2 && (bytes[0] & 15) === 8 && bytes[0] >>> 4 <= 7 && (bytes[0] << 8 | bytes[1]) % 31 === 0;
     const decoder = new Inflate2({
-      raw: !(bytes[0] === 31 && bytes[1] === 139),
+      raw: !wrapped,
       chunkSize: Math.max(1, Math.min(64 * 1024, maxDecodedBytes + 1))
     });
+    const chunks = [];
     let length = 0;
     decoder.onData = (chunk) => {
       length += chunk.length;
       if (length > maxDecodedBytes) {
         throw new PdfError("E_LIMIT", "FlateDecode output exceeds maximum decoded byte budget");
       }
-      decoder.chunks.push(chunk);
+      chunks.push(chunk);
     };
-    if (!decoder.push(bytes, true) || decoder.err || !decoder.ended) {
+    const complete2 = decoder.push(bytes, true);
+    const truncated = wrapped && decoder.err === Z_BUF_ERROR && length > 0;
+    if ((!complete2 || decoder.err || !decoder.ended) && !truncated) {
       throw new PdfError("E_CAPABILITY", "Invalid FlateDecode compressed stream");
     }
-    inflated = decoder.result;
+    inflated = new Uint8Array(length);
+    let offset = 0;
+    for (const chunk of chunks) {
+      inflated.set(chunk, offset);
+      offset += chunk.length;
+    }
   }
   return applyPredictor(inflated, parms);
 }
@@ -42450,7 +42460,7 @@ function resolvePageFonts(doc, resourcesDict) {
     const glyphNames = buildFontEncodingGlyphNamesMap(encNode);
     const widths = /* @__PURE__ */ new Map();
     let defaultWidth = 556;
-    const isTwoByteCid = subtype === "Type0" || Boolean(cmap?.isTwoByte);
+    const isTwoByteCid = subtype === "Type0";
     let fontMatrix;
     let charProcs;
     let fontResources;
@@ -43903,7 +43913,7 @@ function evaluateContentStreamToDisplayList(params) {
               const [x, y] = transformPoint(st.ctm, seg.x, seg.y);
               transformedSegments.push({ kind: "cubic", x1, y1, x2, y2, x, y });
             } else if (seg.kind === "rect") {
-              if (hasRotOrShear) {
+              if (hasRotOrShear || seg.width * st.ctm[0] < 0 || seg.height * st.ctm[3] < 0) {
                 const [p0x, p0y] = transformPoint(st.ctm, seg.x, seg.y);
                 const [p1x, p1y] = transformPoint(st.ctm, seg.x + seg.width, seg.y);
                 const [p2x, p2y] = transformPoint(st.ctm, seg.x + seg.width, seg.y + seg.height);
@@ -43936,7 +43946,12 @@ function evaluateContentStreamToDisplayList(params) {
               transformedSegments.push({ kind: "close" });
             }
           }
-          if (node.clip && transformedSegments.length > 0) {
+          const applyClip = () => {
+            if (!node.clip) return;
+            st.clipPaths = [...st.clipPaths ?? [], {
+              segments: transformedSegments,
+              fillRule: node.clip === "W*" ? "evenodd" : "nonzero"
+            }];
             let cMinX = Infinity, cMinY = Infinity, cMaxX = -Infinity, cMaxY = -Infinity;
             for (const s of transformedSegments) {
               if (s.kind === "move" || s.kind === "line") {
@@ -43964,8 +43979,11 @@ function evaluateContentStreamToDisplayList(params) {
                 Math.min(st.clipRect[3], cMaxY)
               ] : [cMinX, cMinY, cMaxX, cMaxY];
             }
+          };
+          if (node.paint === "n") {
+            applyClip();
+            break;
           }
-          if (node.paint === "n") break;
           const isFill = ["f", "F", "f*", "B", "B*", "b", "b*"].includes(node.paint);
           const isStroke = ["S", "s", "B", "B*", "b", "b*"].includes(node.paint);
           let evaluatedFillPattern = false;
@@ -44098,7 +44116,10 @@ function evaluateContentStreamToDisplayList(params) {
               }
             }
           }
-          if (evaluatedFillPattern && !isStroke) break;
+          if (evaluatedFillPattern && !isStroke) {
+            applyClip();
+            break;
+          }
           const fillRule = node.paint.includes("*") ? "evenodd" : "nonzero";
           const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
           const scaledStrokeWidth = st.strokeWidth === 0 ? 0 : st.strokeWidth * ctmScale;
@@ -44118,6 +44139,7 @@ function evaluateContentStreamToDisplayList(params) {
             ...st.dashPhase !== void 0 ? { dashPhase: st.dashPhase } : {},
             ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
           } });
+          applyClip();
           break;
         }
         case "xobject": {
@@ -47441,8 +47463,8 @@ function segmentsToScreenEdges(segments, pageHeight, scale, closeSubpaths = fals
       if (closeSubpaths && hasOpenSubpath && (curX !== startX || curY !== startY)) {
         edges.push({ x0: curX, y0: curY, x1: startX, y1: startY });
       }
-      const [rx0, ry0] = toScreen(seg.x, seg.y + seg.height);
-      const [rx1, ry1] = toScreen(seg.x + seg.width, seg.y);
+      const [rx0, ry0] = toScreen(seg.x, seg.y);
+      const [rx1, ry1] = toScreen(seg.x + seg.width, seg.y + seg.height);
       edges.push(
         { x0: rx0, y0: ry0, x1: rx1, y1: ry0 },
         { x0: rx1, y0: ry0, x1: rx1, y1: ry1 },
@@ -47585,21 +47607,24 @@ function renderDisplayListToBitmap(displayList, options = {}) {
   }
   const aaVec = options.antialiasVector !== false;
   const aaTxt = options.antialiasText !== false;
-  const clipMasks = /* @__PURE__ */ new Map();
+  let cachedClips;
+  let cachedClipMask;
   const imageClipMasks = /* @__PURE__ */ new Map();
   for (const original of paintOperations(displayList)) {
     if (original.kind === "glyph" && (original.value.renderMode === 3 || !original.value.outline && !original.value.unicode.trim())) continue;
     const operation = original.kind === "glyph" ? { kind: "path", value: glyphPaint(original.value) } : original;
     const clips = original.value.clipPaths;
-    let clipMask = clips ? clipMasks.get(clips) : void 0;
+    let clipMask = clips && clips === cachedClips ? cachedClipMask : void 0;
     if (clips && !clipMask) {
       clipMask = new Uint8Array(width * height * 4).fill(255);
-      for (const segments of clips) {
+      for (const clip of clips) {
+        const { segments, fillRule } = "segments" in clip ? clip : { segments: clip, fillRule: "nonzero" };
         const layer = new Uint8Array(width * height * 4);
-        fillEdgesScanline4x4(layer, width, height, segmentsToScreenEdges(segments, displayList.height, scale, true), { r: 1, g: 1, b: 1 });
+        fillEdgesScanline4x4(layer, width, height, segmentsToScreenEdges(segments, displayList.height, scale, true), { r: 1, g: 1, b: 1 }, 1, fillRule);
         for (let i = 3; i < layer.length; i += 4) clipMask[i] = Math.round(clipMask[i] * layer[i] / 255);
       }
-      clipMasks.set(clips, clipMask);
+      cachedClips = clips;
+      cachedClipMask = clipMask;
     }
     const imageClips = original.value.clipImages;
     if (imageClips) {

package/dist/image-ast/index.js

@@ -8654,6 +8654,7 @@ var messages_default2 = {
   "-5": "buffer error",
   "-6": "incompatible version"
 };
+var Z_BUF_ERROR = -5;
 var MAX_MEM_LEVEL2 = 9;
 var HEAP_SIZE2 = 573;
 var MIN_MATCH2 = 3;
@@ -30545,22 +30546,31 @@ function decodeFlate(bytes, parms, maxDecodedBytes = DEFAULT_MAX_DECODED_BYTES)
     inflated = new BoundedFlateStream(bytes, maxDecodedBytes).getBytes();
   } catch (error) {
     if (error instanceof PdfError && error.code === "E_LIMIT") throw error;
+    const wrapped = bytes[0] === 31 && bytes[1] === 139 || bytes.length >= 2 && (bytes[0] & 15) === 8 && bytes[0] >>> 4 <= 7 && (bytes[0] << 8 | bytes[1]) % 31 === 0;
     const decoder = new Inflate2({
-      raw: !(bytes[0] === 31 && bytes[1] === 139),
+      raw: !wrapped,
       chunkSize: Math.max(1, Math.min(64 * 1024, maxDecodedBytes + 1))
     });
+    const chunks = [];
     let length = 0;
     decoder.onData = (chunk) => {
       length += chunk.length;
       if (length > maxDecodedBytes) {
         throw new PdfError("E_LIMIT", "FlateDecode output exceeds maximum decoded byte budget");
       }
-      decoder.chunks.push(chunk);
+      chunks.push(chunk);
     };
-    if (!decoder.push(bytes, true) || decoder.err || !decoder.ended) {
+    const complete2 = decoder.push(bytes, true);
+    const truncated = wrapped && decoder.err === Z_BUF_ERROR && length > 0;
+    if ((!complete2 || decoder.err || !decoder.ended) && !truncated) {
       throw new PdfError("E_CAPABILITY", "Invalid FlateDecode compressed stream");
     }
-    inflated = decoder.result;
+    inflated = new Uint8Array(length);
+    let offset = 0;
+    for (const chunk of chunks) {
+      inflated.set(chunk, offset);
+      offset += chunk.length;
+    }
   }
   return applyPredictor(inflated, parms);
 }
@@ -42450,7 +42460,7 @@ function resolvePageFonts(doc, resourcesDict) {
     const glyphNames = buildFontEncodingGlyphNamesMap(encNode);
     const widths = /* @__PURE__ */ new Map();
     let defaultWidth = 556;
-    const isTwoByteCid = subtype === "Type0" || Boolean(cmap?.isTwoByte);
+    const isTwoByteCid = subtype === "Type0";
     let fontMatrix;
     let charProcs;
     let fontResources;
@@ -43903,7 +43913,7 @@ function evaluateContentStreamToDisplayList(params) {
               const [x, y] = transformPoint(st.ctm, seg.x, seg.y);
               transformedSegments.push({ kind: "cubic", x1, y1, x2, y2, x, y });
             } else if (seg.kind === "rect") {
-              if (hasRotOrShear) {
+              if (hasRotOrShear || seg.width * st.ctm[0] < 0 || seg.height * st.ctm[3] < 0) {
                 const [p0x, p0y] = transformPoint(st.ctm, seg.x, seg.y);
                 const [p1x, p1y] = transformPoint(st.ctm, seg.x + seg.width, seg.y);
                 const [p2x, p2y] = transformPoint(st.ctm, seg.x + seg.width, seg.y + seg.height);
@@ -43936,7 +43946,12 @@ function evaluateContentStreamToDisplayList(params) {
               transformedSegments.push({ kind: "close" });
             }
           }
-          if (node.clip && transformedSegments.length > 0) {
+          const applyClip = () => {
+            if (!node.clip) return;
+            st.clipPaths = [...st.clipPaths ?? [], {
+              segments: transformedSegments,
+              fillRule: node.clip === "W*" ? "evenodd" : "nonzero"
+            }];
             let cMinX = Infinity, cMinY = Infinity, cMaxX = -Infinity, cMaxY = -Infinity;
             for (const s of transformedSegments) {
               if (s.kind === "move" || s.kind === "line") {
@@ -43964,8 +43979,11 @@ function evaluateContentStreamToDisplayList(params) {
                 Math.min(st.clipRect[3], cMaxY)
               ] : [cMinX, cMinY, cMaxX, cMaxY];
             }
+          };
+          if (node.paint === "n") {
+            applyClip();
+            break;
           }
-          if (node.paint === "n") break;
           const isFill = ["f", "F", "f*", "B", "B*", "b", "b*"].includes(node.paint);
           const isStroke = ["S", "s", "B", "B*", "b", "b*"].includes(node.paint);
           let evaluatedFillPattern = false;
@@ -44098,7 +44116,10 @@ function evaluateContentStreamToDisplayList(params) {
               }
             }
           }
-          if (evaluatedFillPattern && !isStroke) break;
+          if (evaluatedFillPattern && !isStroke) {
+            applyClip();
+            break;
+          }
           const fillRule = node.paint.includes("*") ? "evenodd" : "nonzero";
           const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
           const scaledStrokeWidth = st.strokeWidth === 0 ? 0 : st.strokeWidth * ctmScale;
@@ -44118,6 +44139,7 @@ function evaluateContentStreamToDisplayList(params) {
             ...st.dashPhase !== void 0 ? { dashPhase: st.dashPhase } : {},
             ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
           } });
+          applyClip();
           break;
         }
         case "xobject": {
@@ -47441,8 +47463,8 @@ function segmentsToScreenEdges(segments, pageHeight, scale, closeSubpaths = fals
       if (closeSubpaths && hasOpenSubpath && (curX !== startX || curY !== startY)) {
         edges.push({ x0: curX, y0: curY, x1: startX, y1: startY });
       }
-      const [rx0, ry0] = toScreen(seg.x, seg.y + seg.height);
-      const [rx1, ry1] = toScreen(seg.x + seg.width, seg.y);
+      const [rx0, ry0] = toScreen(seg.x, seg.y);
+      const [rx1, ry1] = toScreen(seg.x + seg.width, seg.y + seg.height);
       edges.push(
         { x0: rx0, y0: ry0, x1: rx1, y1: ry0 },
         { x0: rx1, y0: ry0, x1: rx1, y1: ry1 },
@@ -47585,21 +47607,24 @@ function renderDisplayListToBitmap(displayList, options = {}) {
   }
   const aaVec = options.antialiasVector !== false;
   const aaTxt = options.antialiasText !== false;
-  const clipMasks = /* @__PURE__ */ new Map();
+  let cachedClips;
+  let cachedClipMask;
   const imageClipMasks = /* @__PURE__ */ new Map();
   for (const original of paintOperations(displayList)) {
     if (original.kind === "glyph" && (original.value.renderMode === 3 || !original.value.outline && !original.value.unicode.trim())) continue;
     const operation = original.kind === "glyph" ? { kind: "path", value: glyphPaint(original.value) } : original;
     const clips = original.value.clipPaths;
-    let clipMask = clips ? clipMasks.get(clips) : void 0;
+    let clipMask = clips && clips === cachedClips ? cachedClipMask : void 0;
     if (clips && !clipMask) {
       clipMask = new Uint8Array(width * height * 4).fill(255);
-      for (const segments of clips) {
+      for (const clip of clips) {
+        const { segments, fillRule } = "segments" in clip ? clip : { segments: clip, fillRule: "nonzero" };
         const layer = new Uint8Array(width * height * 4);
-        fillEdgesScanline4x4(layer, width, height, segmentsToScreenEdges(segments, displayList.height, scale, true), { r: 1, g: 1, b: 1 });
+        fillEdgesScanline4x4(layer, width, height, segmentsToScreenEdges(segments, displayList.height, scale, true), { r: 1, g: 1, b: 1 }, 1, fillRule);
         for (let i = 3; i < layer.length; i += 4) clipMask[i] = Math.round(clipMask[i] * layer[i] / 255);
       }
-      clipMasks.set(clips, clipMask);
+      cachedClips = clips;
+      cachedClipMask = clipMask;
     }
     const imageClips = original.value.clipImages;
     if (imageClips) {

package/dist/pdf-ast/ast.d.ts

@@ -169,6 +169,11 @@ export type PdfPathSegment = {
 } | {
     readonly kind: "close";
 };
+/** A clipping intersection. Bare segment arrays retain nonzero semantics. */
+export type PdfClipPath = readonly PdfPathSegment[] | {
+    readonly segments: readonly PdfPathSegment[];
+    readonly fillRule: "nonzero" | "evenodd";
+};
 export type PdfContentNode = {
     readonly kind: "graphics-group";
     readonly ops: PdfContentNode[];
@@ -222,7 +227,7 @@ export interface PdfPlacedGlyph {
     readonly mcid?: number | undefined;
     readonly actualText?: string | undefined;
     readonly blendMode?: string | undefined;
-    readonly clipPaths?: readonly (readonly PdfPathSegment[])[] | undefined;
+    readonly clipPaths?: readonly PdfClipPath[] | undefined;
     readonly clipImages?: readonly PdfEvaluatedImage[] | undefined;
     readonly clipRect?: readonly [number, number, number, number] | undefined;
 }
@@ -241,7 +246,7 @@ export interface PdfEvaluatedPath {
     readonly dashPhase?: number | undefined;
     readonly blendMode?: string | undefined;
     readonly isClip?: boolean | undefined;
-    readonly clipPaths?: readonly (readonly PdfPathSegment[])[] | undefined;
+    readonly clipPaths?: readonly PdfClipPath[] | undefined;
     readonly clipImages?: readonly PdfEvaluatedImage[] | undefined;
     readonly clipRect?: readonly [number, number, number, number] | undefined;
 }
@@ -254,7 +259,7 @@ export interface PdfEvaluatedImage {
     readonly bitsPerComponent: number;
     readonly decodedRgba?: Uint8Array | undefined;
     readonly blendMode?: string | undefined;
-    readonly clipPaths?: readonly (readonly PdfPathSegment[])[] | undefined;
+    readonly clipPaths?: readonly PdfClipPath[] | undefined;
     readonly clipImages?: readonly PdfEvaluatedImage[] | undefined;
     readonly clipRect?: readonly [number, number, number, number] | undefined;
 }

package/dist/pdf-ast/index.js

@@ -644,6 +644,7 @@ var messages_default = {
   "-5": "buffer error",
   "-6": "incompatible version"
 };
+var Z_BUF_ERROR = -5;
 var MAX_MEM_LEVEL = 9;
 var HEAP_SIZE = 573;
 var MIN_MATCH = 3;
@@ -22735,22 +22736,31 @@ function decodeFlate(bytes, parms, maxDecodedBytes = DEFAULT_MAX_DECODED_BYTES)
     inflated = new BoundedFlateStream(bytes, maxDecodedBytes).getBytes();
   } catch (error) {
     if (error instanceof PdfError && error.code === "E_LIMIT") throw error;
+    const wrapped = bytes[0] === 31 && bytes[1] === 139 || bytes.length >= 2 && (bytes[0] & 15) === 8 && bytes[0] >>> 4 <= 7 && (bytes[0] << 8 | bytes[1]) % 31 === 0;
     const decoder = new Inflate({
-      raw: !(bytes[0] === 31 && bytes[1] === 139),
+      raw: !wrapped,
       chunkSize: Math.max(1, Math.min(64 * 1024, maxDecodedBytes + 1))
     });
+    const chunks = [];
     let length = 0;
     decoder.onData = (chunk) => {
       length += chunk.length;
       if (length > maxDecodedBytes) {
         throw new PdfError("E_LIMIT", "FlateDecode output exceeds maximum decoded byte budget");
       }
-      decoder.chunks.push(chunk);
+      chunks.push(chunk);
     };
-    if (!decoder.push(bytes, true) || decoder.err || !decoder.ended) {
+    const complete = decoder.push(bytes, true);
+    const truncated = wrapped && decoder.err === Z_BUF_ERROR && length > 0;
+    if ((!complete || decoder.err || !decoder.ended) && !truncated) {
       throw new PdfError("E_CAPABILITY", "Invalid FlateDecode compressed stream");
     }
-    inflated = decoder.result;
+    inflated = new Uint8Array(length);
+    let offset = 0;
+    for (const chunk of chunks) {
+      inflated.set(chunk, offset);
+      offset += chunk.length;
+    }
   }
   return applyPredictor(inflated, parms);
 }
@@ -35164,7 +35174,7 @@ function resolvePageFonts(doc, resourcesDict) {
     const glyphNames = buildFontEncodingGlyphNamesMap(encNode);
     const widths = /* @__PURE__ */ new Map();
     let defaultWidth = 556;
-    const isTwoByteCid = subtype === "Type0" || Boolean(cmap?.isTwoByte);
+    const isTwoByteCid = subtype === "Type0";
     let fontMatrix;
     let charProcs;
     let fontResources;
@@ -36617,7 +36627,7 @@ function evaluateContentStreamToDisplayList(params) {
               const [x, y] = transformPoint(st.ctm, seg.x, seg.y);
               transformedSegments.push({ kind: "cubic", x1, y1, x2, y2, x, y });
             } else if (seg.kind === "rect") {
-              if (hasRotOrShear) {
+              if (hasRotOrShear || seg.width * st.ctm[0] < 0 || seg.height * st.ctm[3] < 0) {
                 const [p0x, p0y] = transformPoint(st.ctm, seg.x, seg.y);
                 const [p1x, p1y] = transformPoint(st.ctm, seg.x + seg.width, seg.y);
                 const [p2x, p2y] = transformPoint(st.ctm, seg.x + seg.width, seg.y + seg.height);
@@ -36650,7 +36660,12 @@ function evaluateContentStreamToDisplayList(params) {
               transformedSegments.push({ kind: "close" });
             }
           }
-          if (node.clip && transformedSegments.length > 0) {
+          const applyClip = () => {
+            if (!node.clip) return;
+            st.clipPaths = [...st.clipPaths ?? [], {
+              segments: transformedSegments,
+              fillRule: node.clip === "W*" ? "evenodd" : "nonzero"
+            }];
             let cMinX = Infinity, cMinY = Infinity, cMaxX = -Infinity, cMaxY = -Infinity;
             for (const s of transformedSegments) {
               if (s.kind === "move" || s.kind === "line") {
@@ -36678,8 +36693,11 @@ function evaluateContentStreamToDisplayList(params) {
                 Math.min(st.clipRect[3], cMaxY)
               ] : [cMinX, cMinY, cMaxX, cMaxY];
             }
+          };
+          if (node.paint === "n") {
+            applyClip();
+            break;
           }
-          if (node.paint === "n") break;
           const isFill = ["f", "F", "f*", "B", "B*", "b", "b*"].includes(node.paint);
           const isStroke = ["S", "s", "B", "B*", "b", "b*"].includes(node.paint);
           let evaluatedFillPattern = false;
@@ -36812,7 +36830,10 @@ function evaluateContentStreamToDisplayList(params) {
               }
             }
           }
-          if (evaluatedFillPattern && !isStroke) break;
+          if (evaluatedFillPattern && !isStroke) {
+            applyClip();
+            break;
+          }
           const fillRule = node.paint.includes("*") ? "evenodd" : "nonzero";
           const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
           const scaledStrokeWidth = st.strokeWidth === 0 ? 0 : st.strokeWidth * ctmScale;
@@ -36832,6 +36853,7 @@ function evaluateContentStreamToDisplayList(params) {
             ...st.dashPhase !== void 0 ? { dashPhase: st.dashPhase } : {},
             ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
           } });
+          applyClip();
           break;
         }
         case "xobject": {
@@ -41242,8 +41264,8 @@ function segmentsToScreenEdges(segments, pageHeight, scale, closeSubpaths = fals
       if (closeSubpaths && hasOpenSubpath && (curX !== startX || curY !== startY)) {
         edges.push({ x0: curX, y0: curY, x1: startX, y1: startY });
       }
-      const [rx0, ry0] = toScreen(seg.x, seg.y + seg.height);
-      const [rx1, ry1] = toScreen(seg.x + seg.width, seg.y);
+      const [rx0, ry0] = toScreen(seg.x, seg.y);
+      const [rx1, ry1] = toScreen(seg.x + seg.width, seg.y + seg.height);
       edges.push(
         { x0: rx0, y0: ry0, x1: rx1, y1: ry0 },
         { x0: rx1, y0: ry0, x1: rx1, y1: ry1 },
@@ -41386,21 +41408,24 @@ function renderDisplayListToBitmap(displayList, options = {}) {
   }
   const aaVec = options.antialiasVector !== false;
   const aaTxt = options.antialiasText !== false;
-  const clipMasks = /* @__PURE__ */ new Map();
+  let cachedClips;
+  let cachedClipMask;
   const imageClipMasks = /* @__PURE__ */ new Map();
   for (const original of paintOperations(displayList)) {
     if (original.kind === "glyph" && (original.value.renderMode === 3 || !original.value.outline && !original.value.unicode.trim())) continue;
     const operation = original.kind === "glyph" ? { kind: "path", value: glyphPaint(original.value) } : original;
     const clips = original.value.clipPaths;
-    let clipMask = clips ? clipMasks.get(clips) : void 0;
+    let clipMask = clips && clips === cachedClips ? cachedClipMask : void 0;
     if (clips && !clipMask) {
       clipMask = new Uint8Array(width * height * 4).fill(255);
-      for (const segments of clips) {
+      for (const clip of clips) {
+        const { segments, fillRule } = "segments" in clip ? clip : { segments: clip, fillRule: "nonzero" };
         const layer = new Uint8Array(width * height * 4);
-        fillEdgesScanline4x4(layer, width, height, segmentsToScreenEdges(segments, displayList.height, scale, true), { r: 1, g: 1, b: 1 });
+        fillEdgesScanline4x4(layer, width, height, segmentsToScreenEdges(segments, displayList.height, scale, true), { r: 1, g: 1, b: 1 }, 1, fillRule);
         for (let i = 3; i < layer.length; i += 4) clipMask[i] = Math.round(clipMask[i] * layer[i] / 255);
       }
-      clipMasks.set(clips, clipMask);
+      cachedClips = clips;
+      cachedClipMask = clipMask;
     }
     const imageClips = original.value.clipImages;
     if (imageClips) {
@@ -41594,7 +41619,7 @@ function svgPathData(segments, height) {
     } else if (seg.kind === "cubic") {
       dParts.push(`C ${seg.x1} ${height - seg.y1} ${seg.x2} ${height - seg.y2} ${seg.x} ${height - seg.y}`);
     } else if (seg.kind === "rect") {
-      dParts.push(`M ${seg.x} ${height - seg.y - seg.height} h ${seg.width} v ${seg.height} h ${-seg.width} Z`);
+      dParts.push(`M ${seg.x} ${height - seg.y} h ${seg.width} v ${-seg.height} h ${-seg.width} Z`);
     } else if (seg.kind === "close") {
       dParts.push("Z");
     }
@@ -41633,9 +41658,10 @@ function renderDisplayListToSvg(displayList, options = {}) {
     const operation = original.kind === "glyph" ? { kind: "path", value: glyphPaint(original.value) } : original;
     const clips = original.value.clipPaths ?? [];
     const imageClips = original.value.clipImages ?? [];
-    for (const segments of clips) {
+    for (const clip of clips) {
+      const { segments, fillRule } = "segments" in clip ? clip : { segments: clip, fillRule: "nonzero" };
       const id = `text-clip-${clipId++}`;
-      const path = `<path d="${svgPathData(segments, displayList.height)}"/>`;
+      const path = `<path d="${svgPathData(segments, displayList.height)}" clip-rule="${fillRule}"/>`;
       parts.push(`<defs><clipPath id="${id}" clipPathUnits="userSpaceOnUse">${path}</clipPath></defs><g clip-path="url(#${id})">`);
     }
     for (const image of imageClips) {