@poe-platform/safe-bash 0.1.759 → 0.1.761

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

@@ -43913,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);
@@ -43946,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") {
@@ -43974,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;
@@ -44108,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;
@@ -44128,6 +44139,7 @@ function evaluateContentStreamToDisplayList(params) {
             ...st.dashPhase !== void 0 ? { dashPhase: st.dashPhase } : {},
             ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
           } });
+          applyClip();
           break;
         }
         case "xobject": {
@@ -46662,6 +46674,39 @@ function createTrueTypeFontHandle(truetype) {
     }
   };
 }
+function flattenCubic(x1, y1, x2, y2, x3, y3, x4, y4) {
+  const points = [[x1, y1]];
+  const subdivide = (ax, ay, bx, by, cx, cy, dx, dy, level) => {
+    if (level > 16) return;
+    const abx = (ax + bx) / 2, aby = (ay + by) / 2;
+    const bcx = (bx + cx) / 2, bcy = (by + cy) / 2;
+    const cdx = (cx + dx) / 2, cdy = (cy + dy) / 2;
+    const abcx = (abx + bcx) / 2, abcy = (aby + bcy) / 2;
+    const bcdx = (bcx + cdx) / 2, bcdy = (bcy + cdy) / 2;
+    const midx = (abcx + bcdx) / 2, midy = (abcy + bcdy) / 2;
+    const chordX = dx - ax, chordY = dy - ay;
+    const d2 = Math.abs((bx - dx) * chordY - (by - dy) * chordX);
+    const d3 = Math.abs((cx - dx) * chordY - (cy - dy) * chordX);
+    const significant2 = d2 > 1e-30, significant3 = d3 > 1e-30;
+    if (!significant2 && !significant3) {
+      if (Math.abs(ax + cx - 2 * bx) + Math.abs(ay + cy - 2 * by) + Math.abs(bx + dx - 2 * cx) + Math.abs(by + dy - 2 * cy) <= 4) {
+        points.push([midx, midy]);
+        return;
+      }
+    } else {
+      const distance = (significant2 ? d2 : 0) + (significant3 ? d3 : 0);
+      if (distance * distance <= 0.25 * (chordX * chordX + chordY * chordY)) {
+        points.push([bcx, bcy]);
+        return;
+      }
+    }
+    subdivide(ax, ay, abx, aby, abcx, abcy, midx, midy, level + 1);
+    subdivide(midx, midy, bcdx, bcdy, cdx, cdy, dx, dy, level + 1);
+  };
+  subdivide(x1, y1, x2, y2, x3, y3, x4, y4, 0);
+  points.push([x4, y4]);
+  return points;
+}
 function decodePng(pngBytes) {
   if (pngBytes.length < 24 || pngBytes[0] !== 137 || pngBytes[1] !== 80 || pngBytes[2] !== 78 || pngBytes[3] !== 71) {
     throw new Error("Invalid PNG signature");
@@ -47425,14 +47470,11 @@ function segmentsToScreenEdges(segments, pageHeight, scale, closeSubpaths = fals
       const [p1x, p1y] = toScreen(seg.x1, seg.y1);
       const [p2x, p2y] = toScreen(seg.x2, seg.y2);
       const [p3x, p3y] = toScreen(seg.x, seg.y);
-      const steps = 12;
+      const points = flattenCubic(curX, curY, p1x, p1y, p2x, p2y, p3x, p3y);
       let px = curX;
       let py = curY;
-      for (let s = 1; s <= steps; s++) {
-        const t = s / steps;
-        const mt = 1 - t;
-        const qx = mt * mt * mt * curX + 3 * mt * mt * t * p1x + 3 * mt * t * t * p2x + t * t * t * p3x;
-        const qy = mt * mt * mt * curY + 3 * mt * mt * t * p1y + 3 * mt * t * t * p2y + t * t * t * p3y;
+      for (let i = 1; i < points.length; i++) {
+        const [qx, qy] = points[i];
         edges.push({ x0: px, y0: py, x1: qx, y1: qy });
         px = qx;
         py = qy;
@@ -47451,8 +47493,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 },
@@ -47595,21 +47637,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) {
@@ -62451,3 +62496,15 @@ export {
  * Copyright 2017 Mozilla Foundation. Licensed under Apache-2.0.
  * See licenses/PDFJS-APACHE-2.0.txt and THIRD_PARTY_NOTICES.md.
  */
+/*!
+ * Anti-Grain Geometry - Version 2.3
+ * Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+ *
+ * Permission to copy, use, modify, sell and distribute this software
+ * is granted provided this copyright notice appears in all copies.
+ * This software is provided "as is" without express or implied
+ * warranty, and with no claim as to its suitability for any purpose.
+ *
+ * Adapted from PDFium third_party/agg23/agg_curves.cpp, curve4_div.
+ * See THIRD_PARTY_NOTICES.md for the pinned revision and adaptations.
+ */

package/dist/image-ast/index.js

@@ -43913,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);
@@ -43946,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") {
@@ -43974,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;
@@ -44108,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;
@@ -44128,6 +44139,7 @@ function evaluateContentStreamToDisplayList(params) {
             ...st.dashPhase !== void 0 ? { dashPhase: st.dashPhase } : {},
             ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
           } });
+          applyClip();
           break;
         }
         case "xobject": {
@@ -46662,6 +46674,39 @@ function createTrueTypeFontHandle(truetype) {
     }
   };
 }
+function flattenCubic(x1, y1, x2, y2, x3, y3, x4, y4) {
+  const points = [[x1, y1]];
+  const subdivide = (ax, ay, bx, by, cx, cy, dx, dy, level) => {
+    if (level > 16) return;
+    const abx = (ax + bx) / 2, aby = (ay + by) / 2;
+    const bcx = (bx + cx) / 2, bcy = (by + cy) / 2;
+    const cdx = (cx + dx) / 2, cdy = (cy + dy) / 2;
+    const abcx = (abx + bcx) / 2, abcy = (aby + bcy) / 2;
+    const bcdx = (bcx + cdx) / 2, bcdy = (bcy + cdy) / 2;
+    const midx = (abcx + bcdx) / 2, midy = (abcy + bcdy) / 2;
+    const chordX = dx - ax, chordY = dy - ay;
+    const d2 = Math.abs((bx - dx) * chordY - (by - dy) * chordX);
+    const d3 = Math.abs((cx - dx) * chordY - (cy - dy) * chordX);
+    const significant2 = d2 > 1e-30, significant3 = d3 > 1e-30;
+    if (!significant2 && !significant3) {
+      if (Math.abs(ax + cx - 2 * bx) + Math.abs(ay + cy - 2 * by) + Math.abs(bx + dx - 2 * cx) + Math.abs(by + dy - 2 * cy) <= 4) {
+        points.push([midx, midy]);
+        return;
+      }
+    } else {
+      const distance = (significant2 ? d2 : 0) + (significant3 ? d3 : 0);
+      if (distance * distance <= 0.25 * (chordX * chordX + chordY * chordY)) {
+        points.push([bcx, bcy]);
+        return;
+      }
+    }
+    subdivide(ax, ay, abx, aby, abcx, abcy, midx, midy, level + 1);
+    subdivide(midx, midy, bcdx, bcdy, cdx, cdy, dx, dy, level + 1);
+  };
+  subdivide(x1, y1, x2, y2, x3, y3, x4, y4, 0);
+  points.push([x4, y4]);
+  return points;
+}
 function decodePng(pngBytes) {
   if (pngBytes.length < 24 || pngBytes[0] !== 137 || pngBytes[1] !== 80 || pngBytes[2] !== 78 || pngBytes[3] !== 71) {
     throw new Error("Invalid PNG signature");
@@ -47425,14 +47470,11 @@ function segmentsToScreenEdges(segments, pageHeight, scale, closeSubpaths = fals
       const [p1x, p1y] = toScreen(seg.x1, seg.y1);
       const [p2x, p2y] = toScreen(seg.x2, seg.y2);
       const [p3x, p3y] = toScreen(seg.x, seg.y);
-      const steps = 12;
+      const points = flattenCubic(curX, curY, p1x, p1y, p2x, p2y, p3x, p3y);
       let px = curX;
       let py = curY;
-      for (let s = 1; s <= steps; s++) {
-        const t = s / steps;
-        const mt = 1 - t;
-        const qx = mt * mt * mt * curX + 3 * mt * mt * t * p1x + 3 * mt * t * t * p2x + t * t * t * p3x;
-        const qy = mt * mt * mt * curY + 3 * mt * mt * t * p1y + 3 * mt * t * t * p2y + t * t * t * p3y;
+      for (let i = 1; i < points.length; i++) {
+        const [qx, qy] = points[i];
         edges.push({ x0: px, y0: py, x1: qx, y1: qy });
         px = qx;
         py = qy;
@@ -47451,8 +47493,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 },
@@ -47595,21 +47637,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) {
@@ -62451,3 +62496,15 @@ export {
  * Copyright 2017 Mozilla Foundation. Licensed under Apache-2.0.
  * See licenses/PDFJS-APACHE-2.0.txt and THIRD_PARTY_NOTICES.md.
  */
+/*!
+ * Anti-Grain Geometry - Version 2.3
+ * Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+ *
+ * Permission to copy, use, modify, sell and distribute this software
+ * is granted provided this copyright notice appears in all copies.
+ * This software is provided "as is" without express or implied
+ * warranty, and with no claim as to its suitability for any purpose.
+ *
+ * Adapted from PDFium third_party/agg23/agg_curves.cpp, curve4_div.
+ * See THIRD_PARTY_NOTICES.md for the pinned revision and adaptations.
+ */

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

@@ -36627,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);
@@ -36660,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") {
@@ -36688,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;
@@ -36822,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;
@@ -36842,6 +36853,7 @@ function evaluateContentStreamToDisplayList(params) {
             ...st.dashPhase !== void 0 ? { dashPhase: st.dashPhase } : {},
             ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
           } });
+          applyClip();
           break;
         }
         case "xobject": {
@@ -40066,6 +40078,41 @@ function createTrueTypeFontHandle(truetype) {
   };
 }
 
+// src/render/cubic.ts
+function flattenCubic(x1, y1, x2, y2, x3, y3, x4, y4) {
+  const points = [[x1, y1]];
+  const subdivide = (ax, ay, bx, by, cx, cy, dx, dy, level) => {
+    if (level > 16) return;
+    const abx = (ax + bx) / 2, aby = (ay + by) / 2;
+    const bcx = (bx + cx) / 2, bcy = (by + cy) / 2;
+    const cdx = (cx + dx) / 2, cdy = (cy + dy) / 2;
+    const abcx = (abx + bcx) / 2, abcy = (aby + bcy) / 2;
+    const bcdx = (bcx + cdx) / 2, bcdy = (bcy + cdy) / 2;
+    const midx = (abcx + bcdx) / 2, midy = (abcy + bcdy) / 2;
+    const chordX = dx - ax, chordY = dy - ay;
+    const d2 = Math.abs((bx - dx) * chordY - (by - dy) * chordX);
+    const d3 = Math.abs((cx - dx) * chordY - (cy - dy) * chordX);
+    const significant2 = d2 > 1e-30, significant3 = d3 > 1e-30;
+    if (!significant2 && !significant3) {
+      if (Math.abs(ax + cx - 2 * bx) + Math.abs(ay + cy - 2 * by) + Math.abs(bx + dx - 2 * cx) + Math.abs(by + dy - 2 * cy) <= 4) {
+        points.push([midx, midy]);
+        return;
+      }
+    } else {
+      const distance = (significant2 ? d2 : 0) + (significant3 ? d3 : 0);
+      if (distance * distance <= 0.25 * (chordX * chordX + chordY * chordY)) {
+        points.push([bcx, bcy]);
+        return;
+      }
+    }
+    subdivide(ax, ay, abx, aby, abcx, abcy, midx, midy, level + 1);
+    subdivide(midx, midy, bcdx, bcdy, cdx, cdy, dx, dy, level + 1);
+  };
+  subdivide(x1, y1, x2, y2, x3, y3, x4, y4, 0);
+  points.push([x4, y4]);
+  return points;
+}
+
 // src/render/raster.ts
 function encodePng(bitmap) {
   return encodeRgbaToPng(bitmap.width, bitmap.height, bitmap.data);
@@ -41226,14 +41273,11 @@ function segmentsToScreenEdges(segments, pageHeight, scale, closeSubpaths = fals
       const [p1x, p1y] = toScreen(seg.x1, seg.y1);
       const [p2x, p2y] = toScreen(seg.x2, seg.y2);
       const [p3x, p3y] = toScreen(seg.x, seg.y);
-      const steps = 12;
+      const points = flattenCubic(curX, curY, p1x, p1y, p2x, p2y, p3x, p3y);
       let px = curX;
       let py = curY;
-      for (let s = 1; s <= steps; s++) {
-        const t = s / steps;
-        const mt = 1 - t;
-        const qx = mt * mt * mt * curX + 3 * mt * mt * t * p1x + 3 * mt * t * t * p2x + t * t * t * p3x;
-        const qy = mt * mt * mt * curY + 3 * mt * mt * t * p1y + 3 * mt * t * t * p2y + t * t * t * p3y;
+      for (let i = 1; i < points.length; i++) {
+        const [qx, qy] = points[i];
         edges.push({ x0: px, y0: py, x1: qx, y1: qy });
         px = qx;
         py = qy;
@@ -41252,8 +41296,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 },
@@ -41396,21 +41440,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) {
@@ -41604,7 +41651,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");
     }
@@ -41643,9 +41690,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) {
@@ -42622,3 +42670,15 @@ export {
  * Copyright 2017 Mozilla Foundation. Licensed under Apache-2.0.
  * See licenses/PDFJS-APACHE-2.0.txt and THIRD_PARTY_NOTICES.md.
  */
+/*!
+ * Anti-Grain Geometry - Version 2.3
+ * Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+ *
+ * Permission to copy, use, modify, sell and distribute this software
+ * is granted provided this copyright notice appears in all copies.
+ * This software is provided "as is" without express or implied
+ * warranty, and with no claim as to its suitability for any purpose.
+ *
+ * Adapted from PDFium third_party/agg23/agg_curves.cpp, curve4_div.
+ * See THIRD_PARTY_NOTICES.md for the pinned revision and adaptations.
+ */