@poe-platform/safe-bash 0.1.765 → 0.1.767

package/dist/safe-bash-command-pdftoppm/index.js

@@ -36033,10 +36033,11 @@ function evaluateContentStreamToDisplayList(params) {
           const patArr = params.cosDoc.resolveArray(dArr.items[0]);
           const phaseNode = params.cosDoc.resolve(dArr.items[1]);
           if (patArr) {
-            st.dashArray = patArr.items.map((it) => {
+            const dashArray = patArr.items.map((it) => {
               const r = params.cosDoc.resolve(it);
               return r?.kind === "number" ? r.value : 0;
-            }).filter((n) => n > 0);
+            }).filter((n) => n >= 0);
+            st.dashArray = dashArray.some((value) => value > 0) ? dashArray : void 0;
             st.dashPhase = phaseNode?.kind === "number" ? phaseNode.value : 0;
           }
         }
@@ -36091,8 +36092,9 @@ function evaluateContentStreamToDisplayList(params) {
     const st = curState();
     const group = params.cosDoc.resolveDict(dictGet(form.dict, "Group"));
     const groupType = group ? params.cosDoc.resolve(dictGet(group, "S")) : void 0;
-    const isolated = group ? params.cosDoc.resolve(dictGet(group, "I")) : void 0;
-    const isolate = !maskGroup && groupType?.kind === "name" && groupType.decoded === "Transparency" && isolated?.kind === "boolean" && isolated.value;
+    const isolation = group ? params.cosDoc.resolve(dictGet(group, "I")) : void 0;
+    const isolated = isolation?.kind === "boolean" && isolation.value;
+    const compositeGroup = !maskGroup && groupType?.kind === "name" && groupType.decoded === "Transparency" && (isolated || st.fillAlpha !== 1 || !!st.softMask || st.blendMode !== "Normal" && st.blendMode !== "Compatible");
     const formStreamBytes = params.cosDoc.decodeStream(form);
     const formNodes = parseContentStream(formStreamBytes);
     const formResDict = params.cosDoc.resolveDict(dictGet(form.dict, "Resources")) ?? activeResources;
@@ -36110,8 +36112,8 @@ function evaluateContentStreamToDisplayList(params) {
       const formMat = [mn(0, 1), mn(1, 0), mn(2, 0), mn(3, 1), mn(4, 0), mn(5, 0)];
       nextCtm = multiplyMatrices(formMat, nextCtm);
     }
-    let nextClip = !isolate && st.clipRect ? [...st.clipRect] : void 0;
-    let nextClipPaths = isolate ? void 0 : st.clipPaths;
+    let nextClip = !compositeGroup && st.clipRect ? [...st.clipRect] : void 0;
+    let nextClipPaths = compositeGroup ? void 0 : st.clipPaths;
     const bboxArr = params.cosDoc.resolveArray(dictGet(form.dict, "BBox"));
     if (bboxArr && bboxArr.items.length >= 4) {
       const bn = (idx, fb = 0) => {
@@ -36145,7 +36147,7 @@ function evaluateContentStreamToDisplayList(params) {
     const parentOperations = capturedOperations;
     const children = [];
     const nextState = { ...st, ctm: nextCtm };
-    if (isolate) {
+    if (compositeGroup) {
       capturedOperations = children;
       nextState.fillAlpha = nextState.strokeAlpha = 1;
       nextState.blendMode = "Normal";
@@ -36163,7 +36165,7 @@ function evaluateContentStreamToDisplayList(params) {
       stateStack.pop();
       capturedOperations = parentOperations;
     }
-    if (isolate) emit({ kind: "group", value: { operations: children, alpha: st.fillAlpha, blendMode: st.blendMode, clipRect: st.clipRect } });
+    if (compositeGroup) emit({ kind: "group", value: { operations: children, alpha: st.fillAlpha, blendMode: st.blendMode, clipRect: st.clipRect } });
   };
   const walkNodes = (nodes, mcid, actualText, activeResources = params.resourcesDict, activeFonts = fonts, depth = 0) => {
     for (const node of nodes) {
@@ -39040,7 +39042,7 @@ function dashSubpath(path, pattern, phase) {
     while (remaining <= 0) {
       if (++steps > MAX_STROKE_VERTICES) throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
       if (index % 2 === 0) {
-        if (pattern[index] === 0) result.push({ points: [point, point], closed: false });
+        if (pattern[index] === 0) result.push({ points: [point, point], closed: false, zeroLengthDash: true });
         flush();
       }
       index = (index + 1) % pattern.length;
@@ -39055,7 +39057,7 @@ function dashSubpath(path, pattern, phase) {
       throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
     }
     let distance = 0;
-    while (distance < length) {
+    while (length - distance > 8 * Number.EPSILON * Math.max(1, length)) {
       const point = [start[0] + dx * distance / length, start[1] + dy * distance / length];
       advance(point);
       const step = Math.min(remaining, length - distance);
@@ -39170,7 +39172,15 @@ function strokeOutlines(paths, width, cap, join, miterLimit, dashArray = [], das
       let closed = subpath.closed;
       if (closed && points.length > 1 && Math.hypot(points[0][0] - points[points.length - 1][0], points[0][1] - points[points.length - 1][1]) <= 1e-14) points.pop();
       if (points.length < 3) closed = false;
-      if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
+      if (points.length === 1 && cap === 2 && subpath.zeroLengthDash) {
+        contour = [];
+        const [x, y] = points[0];
+        add(x - half, y - half);
+        add(x + half, y - half);
+        add(x + half, y + half);
+        add(x - half, y + half);
+        contours.push(contour);
+      } else if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
         contour = [];
         const [x, y] = points[0];
         addCap([x, y], [x + 1, y]);
@@ -40358,7 +40368,7 @@ function prepareStroke(path, scale) {
   }
   return { matrix, width, dashArray, dashPhase };
 }
-function strokeEdges(path, pageHeight, scale) {
+function strokeContours(path, pageHeight, scale) {
   const stroke = prepareStroke(path, scale);
   if (!stroke) return [];
   const inverse = inverseStrokeMatrix(stroke.matrix);
@@ -40382,7 +40392,7 @@ function strokeEdges(path, pageHeight, scale) {
     stroke.dashArray?.map((value) => Math.max(0, value * strokeScale)),
     stroke.dashPhase * strokeScale
   );
-  return pathsToEdges(contours.map((points) => ({ points: points.map(toScreen), closed: true })));
+  return contours.map((points) => points.map(toScreen));
 }
 function pathsToEdges(paths, closeSubpaths = false) {
   const edges = [];
@@ -40529,6 +40539,9 @@ function renderSoftMask(mask, displayList, scale) {
   }
   return bitmap;
 }
+function hasBlendModes(operations) {
+  return operations.some((operation) => !!operation.value.blendMode && operation.value.blendMode !== "Normal" && operation.value.blendMode !== "Compatible" || operation.kind === "group" && hasBlendModes(operation.value.operations));
+}
 function renderDisplayListToBitmap(displayList, options = {}) {
   const baseScale = options.scale ?? (options.dpi ? options.dpi / 72 : 1.5);
   const scaleX = options.dpiX !== void 0 ? options.dpiX / 72 : baseScale;
@@ -40537,11 +40550,13 @@ function renderDisplayListToBitmap(displayList, options = {}) {
   const width = Math.max(1, Math.round(displayList.width * scale));
   const height = Math.max(1, Math.round(displayList.height * scale));
   const rgba = new Uint8Array(width * height * 4);
+  const deferBackground = !options.transparent && hasBlendModes(paintOperations(displayList));
+  const transparent = options.transparent || deferBackground;
   const bg = options.background ?? { r: 1, g: 1, b: 1 };
-  const bgR = options.transparent ? 0 : Math.round(bg.r * 255);
-  const bgG = options.transparent ? 0 : Math.round(bg.g * 255);
-  const bgB = options.transparent ? 0 : Math.round(bg.b * 255);
-  const bgA = options.transparent ? 0 : 255;
+  const bgR = transparent ? 0 : Math.round(bg.r * 255);
+  const bgG = transparent ? 0 : Math.round(bg.g * 255);
+  const bgB = transparent ? 0 : Math.round(bg.b * 255);
+  const bgA = transparent ? 0 : 255;
   for (let i = 0; i < width * height; i++) {
     rgba[i * 4] = bgR;
     rgba[i * 4 + 1] = bgG;
@@ -40635,7 +40650,7 @@ function renderDisplayListToBitmap(displayList, options = {}) {
       if (path.strokeColor) {
         const rawSw = path.strokeWidth * scale * (path.strokeMatrix ? Math.hypot(path.strokeMatrix[0], path.strokeMatrix[1]) : 1);
         const strokeAlpha = options.thinLineMode === "shape" && rawSw < 1 ? (path.strokeAlpha ?? 1) * Math.max(0.25, rawSw) : path.strokeAlpha ?? 1;
-        const edges = strokeEdges(path, displayList.height, scale);
+        const edges = pathsToEdges(strokeContours(path, displayList.height, scale).map((points) => ({ points, closed: true })));
         const clipScreen = path.clipRect ? [path.clipRect[0] * scale, (displayList.height - path.clipRect[3]) * scale, path.clipRect[2] * scale, (displayList.height - path.clipRect[1]) * scale] : void 0;
         fillEdgesScanline4x4(
           rgba,
@@ -40718,6 +40733,15 @@ function renderDisplayListToBitmap(displayList, options = {}) {
       }
     }
   }
+  if (deferBackground) {
+    for (let i = 0; i < rgba.length; i += 4) {
+      const alpha = rgba[i + 3] / 255;
+      rgba[i] = Math.round(rgba[i] * alpha + bg.r * 255 * (1 - alpha));
+      rgba[i + 1] = Math.round(rgba[i + 1] * alpha + bg.g * 255 * (1 - alpha));
+      rgba[i + 2] = Math.round(rgba[i + 2] * alpha + bg.b * 255 * (1 - alpha));
+      rgba[i + 3] = 255;
+    }
+  }
   let result = { width, height, data: rgba };
   if (Math.abs(scaleX - scaleY) > 1e-6) {
     const targetW = Math.max(1, Math.round(displayList.width * scaleX));
@@ -40826,6 +40850,7 @@ function renderDisplayListToSvg(displayList, options = {}) {
   if (!options.transparent) {
     parts.push(`  <rect x="${vbX}" y="${vbY}" width="${vbW}" height="${vbH}" fill="#ffffff"/>`);
   }
+  parts.push('<g style="isolation:isolate">');
   if (displayList.rotation) {
     const [a, b, c, d, e, f] = viewport.transform;
     parts.push(`<g transform="matrix(${a} ${b} ${-c} ${-d} ${e + c * displayList.height} ${f + d * displayList.height})">`);
@@ -40877,6 +40902,7 @@ function renderDisplayListToSvg(displayList, options = {}) {
       } else if (operation.kind === "path") {
         const p = operation.value;
         const prepared = p.strokeColor ? prepareStroke(p, Math.max(scaleX, scaleY)) : void 0;
+        const outlineStroke = prepared && p.dashArray?.includes(0);
         const matrix = prepared && (prepared.matrix[0] !== 1 || prepared.matrix[1] !== 0 || prepared.matrix[2] !== 0 || prepared.matrix[3] !== 1) ? prepared.matrix : void 0;
         const inverse = matrix ? inverseStrokeMatrix(matrix) : void 0;
         const pathData = svgPathData(p.segments, inverse ? 0 : displayList.height, inverse);
@@ -40891,10 +40917,18 @@ function renderDisplayListToSvg(displayList, options = {}) {
           const lineCapAttr = p.lineCap === 1 ? ` stroke-linecap="round"` : p.lineCap === 2 ? ` stroke-linecap="square"` : "";
           const lineJoinAttr = p.lineJoin === 1 ? ` stroke-linejoin="round"` : p.lineJoin === 2 ? ` stroke-linejoin="bevel"` : "";
           const miterLimitAttr = p.miterLimit !== void 0 && p.miterLimit !== 10 ? ` stroke-miterlimit="${p.miterLimit}"` : "";
-          const dashArrayAttr = prepared?.dashArray?.length ? ` stroke-dasharray="${prepared.dashArray.join(" ")}"` : "";
-          const dashOffsetAttr = prepared?.dashPhase ? ` stroke-dashoffset="${prepared.dashPhase}"` : "";
+          const dashArrayAttr = !outlineStroke && prepared?.dashArray?.length ? ` stroke-dasharray="${prepared.dashArray.join(" ")}"` : "";
+          const dashOffsetAttr = !outlineStroke && prepared?.dashPhase ? ` stroke-dashoffset="${prepared.dashPhase}"` : "";
           const labelAttr = original.kind === "glyph" ? ` aria-label="${escapeXmlText(original.value.unicode)}"` : "";
-          parts.push(`  <path${labelAttr}${transformAttr} d="${pathData}" fill="${fill}"${fillRuleAttr}${fillOpacityAttr} stroke="${stroke}"${strokeOpacityAttr}${strokeWidthAttr}${lineCapAttr}${lineJoinAttr}${miterLimitAttr}${dashArrayAttr}${dashOffsetAttr}/>`);
+          if (!outlineStroke || p.fillColor) {
+            parts.push(`  <path${labelAttr}${transformAttr} d="${pathData}" fill="${fill}"${fillRuleAttr}${fillOpacityAttr} stroke="${outlineStroke ? "none" : stroke}"${strokeOpacityAttr}${strokeWidthAttr}${lineCapAttr}${lineJoinAttr}${miterLimitAttr}${dashArrayAttr}${dashOffsetAttr}/>`);
+          }
+          if (outlineStroke) {
+            const outlineScale = Math.max(scaleX, scaleY);
+            const contours = strokeContours(p, displayList.height, outlineScale);
+            const outlineData = contours.map((points) => points.map(([x, y], i) => `${i === 0 ? "M" : "L"} ${x / outlineScale} ${y / outlineScale}`).join(" ") + " Z").join(" ");
+            if (outlineData) parts.push(`  <path${labelAttr} d="${outlineData}" fill="${stroke}" fill-opacity="${p.strokeAlpha ?? 1}"/>`);
+          }
         }
       } else if (operation.kind === "image") {
         parts.push(`  ${svgImage(operation.value, displayList.height)}`);
@@ -40904,6 +40938,7 @@ function renderDisplayListToSvg(displayList, options = {}) {
   };
   appendOperations(paintOperations(displayList));
   if (displayList.rotation) parts.push("</g>");
+  parts.push("</g>");
   parts.push("</svg>\n");
   return parts.join("\n");
 }

package/dist/safe-bash-command-pdftotext/index.js

@@ -36184,10 +36184,11 @@ function evaluateContentStreamToDisplayList(params) {
           const patArr = params.cosDoc.resolveArray(dArr.items[0]);
           const phaseNode = params.cosDoc.resolve(dArr.items[1]);
           if (patArr) {
-            st.dashArray = patArr.items.map((it) => {
+            const dashArray = patArr.items.map((it) => {
               const r = params.cosDoc.resolve(it);
               return r?.kind === "number" ? r.value : 0;
-            }).filter((n) => n > 0);
+            }).filter((n) => n >= 0);
+            st.dashArray = dashArray.some((value) => value > 0) ? dashArray : void 0;
             st.dashPhase = phaseNode?.kind === "number" ? phaseNode.value : 0;
           }
         }
@@ -36242,8 +36243,9 @@ function evaluateContentStreamToDisplayList(params) {
     const st = curState();
     const group = params.cosDoc.resolveDict(dictGet(form.dict, "Group"));
     const groupType = group ? params.cosDoc.resolve(dictGet(group, "S")) : void 0;
-    const isolated = group ? params.cosDoc.resolve(dictGet(group, "I")) : void 0;
-    const isolate = !maskGroup && groupType?.kind === "name" && groupType.decoded === "Transparency" && isolated?.kind === "boolean" && isolated.value;
+    const isolation = group ? params.cosDoc.resolve(dictGet(group, "I")) : void 0;
+    const isolated = isolation?.kind === "boolean" && isolation.value;
+    const compositeGroup = !maskGroup && groupType?.kind === "name" && groupType.decoded === "Transparency" && (isolated || st.fillAlpha !== 1 || !!st.softMask || st.blendMode !== "Normal" && st.blendMode !== "Compatible");
     const formStreamBytes = params.cosDoc.decodeStream(form);
     const formNodes = parseContentStream(formStreamBytes);
     const formResDict = params.cosDoc.resolveDict(dictGet(form.dict, "Resources")) ?? activeResources;
@@ -36261,8 +36263,8 @@ function evaluateContentStreamToDisplayList(params) {
       const formMat = [mn(0, 1), mn(1, 0), mn(2, 0), mn(3, 1), mn(4, 0), mn(5, 0)];
       nextCtm = multiplyMatrices(formMat, nextCtm);
     }
-    let nextClip = !isolate && st.clipRect ? [...st.clipRect] : void 0;
-    let nextClipPaths = isolate ? void 0 : st.clipPaths;
+    let nextClip = !compositeGroup && st.clipRect ? [...st.clipRect] : void 0;
+    let nextClipPaths = compositeGroup ? void 0 : st.clipPaths;
     const bboxArr = params.cosDoc.resolveArray(dictGet(form.dict, "BBox"));
     if (bboxArr && bboxArr.items.length >= 4) {
       const bn = (idx, fb = 0) => {
@@ -36296,7 +36298,7 @@ function evaluateContentStreamToDisplayList(params) {
     const parentOperations = capturedOperations;
     const children = [];
     const nextState = { ...st, ctm: nextCtm };
-    if (isolate) {
+    if (compositeGroup) {
       capturedOperations = children;
       nextState.fillAlpha = nextState.strokeAlpha = 1;
       nextState.blendMode = "Normal";
@@ -36314,7 +36316,7 @@ function evaluateContentStreamToDisplayList(params) {
       stateStack.pop();
       capturedOperations = parentOperations;
     }
-    if (isolate) emit({ kind: "group", value: { operations: children, alpha: st.fillAlpha, blendMode: st.blendMode, clipRect: st.clipRect } });
+    if (compositeGroup) emit({ kind: "group", value: { operations: children, alpha: st.fillAlpha, blendMode: st.blendMode, clipRect: st.clipRect } });
   };
   const walkNodes = (nodes, mcid, actualText, activeResources = params.resourcesDict, activeFonts = fonts, depth = 0) => {
     for (const node of nodes) {
@@ -39191,7 +39193,7 @@ function dashSubpath(path, pattern, phase) {
     while (remaining <= 0) {
       if (++steps > MAX_STROKE_VERTICES) throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
       if (index % 2 === 0) {
-        if (pattern[index] === 0) result.push({ points: [point, point], closed: false });
+        if (pattern[index] === 0) result.push({ points: [point, point], closed: false, zeroLengthDash: true });
         flush();
       }
       index = (index + 1) % pattern.length;
@@ -39206,7 +39208,7 @@ function dashSubpath(path, pattern, phase) {
       throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
     }
     let distance = 0;
-    while (distance < length) {
+    while (length - distance > 8 * Number.EPSILON * Math.max(1, length)) {
       const point = [start[0] + dx * distance / length, start[1] + dy * distance / length];
       advance(point);
       const step = Math.min(remaining, length - distance);
@@ -39321,7 +39323,15 @@ function strokeOutlines(paths, width, cap, join, miterLimit, dashArray = [], das
       let closed = subpath.closed;
       if (closed && points.length > 1 && Math.hypot(points[0][0] - points[points.length - 1][0], points[0][1] - points[points.length - 1][1]) <= 1e-14) points.pop();
       if (points.length < 3) closed = false;
-      if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
+      if (points.length === 1 && cap === 2 && subpath.zeroLengthDash) {
+        contour = [];
+        const [x, y] = points[0];
+        add(x - half, y - half);
+        add(x + half, y - half);
+        add(x + half, y + half);
+        add(x - half, y + half);
+        contours.push(contour);
+      } else if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
         contour = [];
         const [x, y] = points[0];
         addCap([x, y], [x + 1, y]);
@@ -40340,7 +40350,7 @@ function prepareStroke(path, scale) {
   }
   return { matrix, width, dashArray, dashPhase };
 }
-function strokeEdges(path, pageHeight, scale) {
+function strokeContours(path, pageHeight, scale) {
   const stroke = prepareStroke(path, scale);
   if (!stroke) return [];
   const inverse = inverseStrokeMatrix(stroke.matrix);
@@ -40364,7 +40374,7 @@ function strokeEdges(path, pageHeight, scale) {
     stroke.dashArray?.map((value) => Math.max(0, value * strokeScale)),
     stroke.dashPhase * strokeScale
   );
-  return pathsToEdges(contours.map((points) => ({ points: points.map(toScreen), closed: true })));
+  return contours.map((points) => points.map(toScreen));
 }
 function pathsToEdges(paths, closeSubpaths = false) {
   const edges = [];
@@ -40511,6 +40521,9 @@ function renderSoftMask(mask, displayList, scale) {
   }
   return bitmap;
 }
+function hasBlendModes(operations) {
+  return operations.some((operation) => !!operation.value.blendMode && operation.value.blendMode !== "Normal" && operation.value.blendMode !== "Compatible" || operation.kind === "group" && hasBlendModes(operation.value.operations));
+}
 function renderDisplayListToBitmap(displayList, options = {}) {
   const baseScale = options.scale ?? (options.dpi ? options.dpi / 72 : 1.5);
   const scaleX = options.dpiX !== void 0 ? options.dpiX / 72 : baseScale;
@@ -40519,11 +40532,13 @@ function renderDisplayListToBitmap(displayList, options = {}) {
   const width = Math.max(1, Math.round(displayList.width * scale));
   const height = Math.max(1, Math.round(displayList.height * scale));
   const rgba = new Uint8Array(width * height * 4);
+  const deferBackground = !options.transparent && hasBlendModes(paintOperations(displayList));
+  const transparent = options.transparent || deferBackground;
   const bg = options.background ?? { r: 1, g: 1, b: 1 };
-  const bgR = options.transparent ? 0 : Math.round(bg.r * 255);
-  const bgG = options.transparent ? 0 : Math.round(bg.g * 255);
-  const bgB = options.transparent ? 0 : Math.round(bg.b * 255);
-  const bgA = options.transparent ? 0 : 255;
+  const bgR = transparent ? 0 : Math.round(bg.r * 255);
+  const bgG = transparent ? 0 : Math.round(bg.g * 255);
+  const bgB = transparent ? 0 : Math.round(bg.b * 255);
+  const bgA = transparent ? 0 : 255;
   for (let i = 0; i < width * height; i++) {
     rgba[i * 4] = bgR;
     rgba[i * 4 + 1] = bgG;
@@ -40617,7 +40632,7 @@ function renderDisplayListToBitmap(displayList, options = {}) {
       if (path.strokeColor) {
         const rawSw = path.strokeWidth * scale * (path.strokeMatrix ? Math.hypot(path.strokeMatrix[0], path.strokeMatrix[1]) : 1);
         const strokeAlpha = options.thinLineMode === "shape" && rawSw < 1 ? (path.strokeAlpha ?? 1) * Math.max(0.25, rawSw) : path.strokeAlpha ?? 1;
-        const edges = strokeEdges(path, displayList.height, scale);
+        const edges = pathsToEdges(strokeContours(path, displayList.height, scale).map((points) => ({ points, closed: true })));
         const clipScreen = path.clipRect ? [path.clipRect[0] * scale, (displayList.height - path.clipRect[3]) * scale, path.clipRect[2] * scale, (displayList.height - path.clipRect[1]) * scale] : void 0;
         fillEdgesScanline4x4(
           rgba,
@@ -40700,6 +40715,15 @@ function renderDisplayListToBitmap(displayList, options = {}) {
       }
     }
   }
+  if (deferBackground) {
+    for (let i = 0; i < rgba.length; i += 4) {
+      const alpha = rgba[i + 3] / 255;
+      rgba[i] = Math.round(rgba[i] * alpha + bg.r * 255 * (1 - alpha));
+      rgba[i + 1] = Math.round(rgba[i + 1] * alpha + bg.g * 255 * (1 - alpha));
+      rgba[i + 2] = Math.round(rgba[i + 2] * alpha + bg.b * 255 * (1 - alpha));
+      rgba[i + 3] = 255;
+    }
+  }
   let result = { width, height, data: rgba };
   if (Math.abs(scaleX - scaleY) > 1e-6) {
     const targetW = Math.max(1, Math.round(displayList.width * scaleX));

package/dist/safe-bash-command-qpdf/index.js

@@ -35839,10 +35839,11 @@ function evaluateContentStreamToDisplayList(params) {
           const patArr = params.cosDoc.resolveArray(dArr.items[0]);
           const phaseNode = params.cosDoc.resolve(dArr.items[1]);
           if (patArr) {
-            st.dashArray = patArr.items.map((it) => {
+            const dashArray = patArr.items.map((it) => {
               const r = params.cosDoc.resolve(it);
               return r?.kind === "number" ? r.value : 0;
-            }).filter((n) => n > 0);
+            }).filter((n) => n >= 0);
+            st.dashArray = dashArray.some((value) => value > 0) ? dashArray : void 0;
             st.dashPhase = phaseNode?.kind === "number" ? phaseNode.value : 0;
           }
         }
@@ -35897,8 +35898,9 @@ function evaluateContentStreamToDisplayList(params) {
     const st = curState();
     const group = params.cosDoc.resolveDict(dictGet(form.dict, "Group"));
     const groupType = group ? params.cosDoc.resolve(dictGet(group, "S")) : void 0;
-    const isolated = group ? params.cosDoc.resolve(dictGet(group, "I")) : void 0;
-    const isolate = !maskGroup && groupType?.kind === "name" && groupType.decoded === "Transparency" && isolated?.kind === "boolean" && isolated.value;
+    const isolation = group ? params.cosDoc.resolve(dictGet(group, "I")) : void 0;
+    const isolated = isolation?.kind === "boolean" && isolation.value;
+    const compositeGroup = !maskGroup && groupType?.kind === "name" && groupType.decoded === "Transparency" && (isolated || st.fillAlpha !== 1 || !!st.softMask || st.blendMode !== "Normal" && st.blendMode !== "Compatible");
     const formStreamBytes = params.cosDoc.decodeStream(form);
     const formNodes = parseContentStream(formStreamBytes);
     const formResDict = params.cosDoc.resolveDict(dictGet(form.dict, "Resources")) ?? activeResources;
@@ -35916,8 +35918,8 @@ function evaluateContentStreamToDisplayList(params) {
       const formMat = [mn(0, 1), mn(1, 0), mn(2, 0), mn(3, 1), mn(4, 0), mn(5, 0)];
       nextCtm = multiplyMatrices(formMat, nextCtm);
     }
-    let nextClip = !isolate && st.clipRect ? [...st.clipRect] : void 0;
-    let nextClipPaths = isolate ? void 0 : st.clipPaths;
+    let nextClip = !compositeGroup && st.clipRect ? [...st.clipRect] : void 0;
+    let nextClipPaths = compositeGroup ? void 0 : st.clipPaths;
     const bboxArr = params.cosDoc.resolveArray(dictGet(form.dict, "BBox"));
     if (bboxArr && bboxArr.items.length >= 4) {
       const bn = (idx, fb = 0) => {
@@ -35951,7 +35953,7 @@ function evaluateContentStreamToDisplayList(params) {
     const parentOperations = capturedOperations;
     const children = [];
     const nextState = { ...st, ctm: nextCtm };
-    if (isolate) {
+    if (compositeGroup) {
       capturedOperations = children;
       nextState.fillAlpha = nextState.strokeAlpha = 1;
       nextState.blendMode = "Normal";
@@ -35969,7 +35971,7 @@ function evaluateContentStreamToDisplayList(params) {
       stateStack.pop();
       capturedOperations = parentOperations;
     }
-    if (isolate) emit({ kind: "group", value: { operations: children, alpha: st.fillAlpha, blendMode: st.blendMode, clipRect: st.clipRect } });
+    if (compositeGroup) emit({ kind: "group", value: { operations: children, alpha: st.fillAlpha, blendMode: st.blendMode, clipRect: st.clipRect } });
   };
   const walkNodes = (nodes, mcid, actualText, activeResources = params.resourcesDict, activeFonts = fonts, depth = 0) => {
     for (const node of nodes) {
@@ -38956,7 +38958,7 @@ function dashSubpath(path, pattern, phase) {
     while (remaining <= 0) {
       if (++steps > MAX_STROKE_VERTICES) throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
       if (index % 2 === 0) {
-        if (pattern[index] === 0) result.push({ points: [point, point], closed: false });
+        if (pattern[index] === 0) result.push({ points: [point, point], closed: false, zeroLengthDash: true });
         flush();
       }
       index = (index + 1) % pattern.length;
@@ -38971,7 +38973,7 @@ function dashSubpath(path, pattern, phase) {
       throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
     }
     let distance = 0;
-    while (distance < length) {
+    while (length - distance > 8 * Number.EPSILON * Math.max(1, length)) {
       const point = [start[0] + dx * distance / length, start[1] + dy * distance / length];
       advance(point);
       const step = Math.min(remaining, length - distance);
@@ -39086,7 +39088,15 @@ function strokeOutlines(paths, width, cap, join, miterLimit, dashArray = [], das
       let closed = subpath.closed;
       if (closed && points.length > 1 && Math.hypot(points[0][0] - points[points.length - 1][0], points[0][1] - points[points.length - 1][1]) <= 1e-14) points.pop();
       if (points.length < 3) closed = false;
-      if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
+      if (points.length === 1 && cap === 2 && subpath.zeroLengthDash) {
+        contour = [];
+        const [x, y] = points[0];
+        add(x - half, y - half);
+        add(x + half, y - half);
+        add(x + half, y + half);
+        add(x - half, y + half);
+        contours.push(contour);
+      } else if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
         contour = [];
         const [x, y] = points[0];
         addCap([x, y], [x + 1, y]);
@@ -39878,7 +39888,7 @@ function prepareStroke(path, scale) {
   }
   return { matrix, width, dashArray, dashPhase };
 }
-function strokeEdges(path, pageHeight, scale) {
+function strokeContours(path, pageHeight, scale) {
   const stroke = prepareStroke(path, scale);
   if (!stroke) return [];
   const inverse = inverseStrokeMatrix(stroke.matrix);
@@ -39902,7 +39912,7 @@ function strokeEdges(path, pageHeight, scale) {
     stroke.dashArray?.map((value) => Math.max(0, value * strokeScale)),
     stroke.dashPhase * strokeScale
   );
-  return pathsToEdges(contours.map((points) => ({ points: points.map(toScreen), closed: true })));
+  return contours.map((points) => points.map(toScreen));
 }
 function pathsToEdges(paths, closeSubpaths = false) {
   const edges = [];
@@ -40049,6 +40059,9 @@ function renderSoftMask(mask, displayList, scale) {
   }
   return bitmap;
 }
+function hasBlendModes(operations) {
+  return operations.some((operation) => !!operation.value.blendMode && operation.value.blendMode !== "Normal" && operation.value.blendMode !== "Compatible" || operation.kind === "group" && hasBlendModes(operation.value.operations));
+}
 function renderDisplayListToBitmap(displayList, options = {}) {
   const baseScale = options.scale ?? (options.dpi ? options.dpi / 72 : 1.5);
   const scaleX = options.dpiX !== void 0 ? options.dpiX / 72 : baseScale;
@@ -40057,11 +40070,13 @@ function renderDisplayListToBitmap(displayList, options = {}) {
   const width = Math.max(1, Math.round(displayList.width * scale));
   const height = Math.max(1, Math.round(displayList.height * scale));
   const rgba = new Uint8Array(width * height * 4);
+  const deferBackground = !options.transparent && hasBlendModes(paintOperations(displayList));
+  const transparent = options.transparent || deferBackground;
   const bg = options.background ?? { r: 1, g: 1, b: 1 };
-  const bgR = options.transparent ? 0 : Math.round(bg.r * 255);
-  const bgG = options.transparent ? 0 : Math.round(bg.g * 255);
-  const bgB = options.transparent ? 0 : Math.round(bg.b * 255);
-  const bgA = options.transparent ? 0 : 255;
+  const bgR = transparent ? 0 : Math.round(bg.r * 255);
+  const bgG = transparent ? 0 : Math.round(bg.g * 255);
+  const bgB = transparent ? 0 : Math.round(bg.b * 255);
+  const bgA = transparent ? 0 : 255;
   for (let i = 0; i < width * height; i++) {
     rgba[i * 4] = bgR;
     rgba[i * 4 + 1] = bgG;
@@ -40155,7 +40170,7 @@ function renderDisplayListToBitmap(displayList, options = {}) {
       if (path.strokeColor) {
         const rawSw = path.strokeWidth * scale * (path.strokeMatrix ? Math.hypot(path.strokeMatrix[0], path.strokeMatrix[1]) : 1);
         const strokeAlpha = options.thinLineMode === "shape" && rawSw < 1 ? (path.strokeAlpha ?? 1) * Math.max(0.25, rawSw) : path.strokeAlpha ?? 1;
-        const edges = strokeEdges(path, displayList.height, scale);
+        const edges = pathsToEdges(strokeContours(path, displayList.height, scale).map((points) => ({ points, closed: true })));
         const clipScreen = path.clipRect ? [path.clipRect[0] * scale, (displayList.height - path.clipRect[3]) * scale, path.clipRect[2] * scale, (displayList.height - path.clipRect[1]) * scale] : void 0;
         fillEdgesScanline4x4(
           rgba,
@@ -40238,6 +40253,15 @@ function renderDisplayListToBitmap(displayList, options = {}) {
       }
     }
   }
+  if (deferBackground) {
+    for (let i = 0; i < rgba.length; i += 4) {
+      const alpha = rgba[i + 3] / 255;
+      rgba[i] = Math.round(rgba[i] * alpha + bg.r * 255 * (1 - alpha));
+      rgba[i + 1] = Math.round(rgba[i + 1] * alpha + bg.g * 255 * (1 - alpha));
+      rgba[i + 2] = Math.round(rgba[i + 2] * alpha + bg.b * 255 * (1 - alpha));
+      rgba[i + 3] = 255;
+    }
+  }
   let result = { width, height, data: rgba };
   if (Math.abs(scaleX - scaleY) > 1e-6) {
     const targetW = Math.max(1, Math.round(displayList.width * scaleX));

package/dist/safe-bash-command-sips/index.js

@@ -11,8 +11,8 @@ import {
   readImageMetadata,
   resizeImage,
   rotateImage
-} from "../safe-bash/command-chunks/chunk-SVL6HYQL.js";
-import "../safe-bash/command-chunks/chunk-KO4PXCNL.js";
+} from "../safe-bash/command-chunks/chunk-A5S6M37L.js";
+import "../safe-bash/command-chunks/chunk-2JQONXIY.js";
 import {
   init_buffer
 } from "../safe-bash/command-chunks/chunk-HX3SHTCE.js";

package/dist/safe-bash-command-soffice/index.js

@@ -31,7 +31,7 @@ import {
   PdfDocument,
   decodeFlate,
   rgb
-} from "../safe-bash/command-chunks/chunk-KO4PXCNL.js";
+} from "../safe-bash/command-chunks/chunk-2JQONXIY.js";
 import {
   init_buffer
 } from "../safe-bash/command-chunks/chunk-HX3SHTCE.js";