emf-converter 4.8.12 → 4.8.14

package/dist/browser.js

@@ -11732,10 +11732,10 @@ function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = fa
     ew = 0;
     eh = 0;
   }
-  const hy = compatible ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
+  const hy = compatible || clockwise ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = compatible ? Math.round(r - ew / 2) : Math.floor(r - ew / 2);
   const hx = r - topX;
-  const verticalControl = compatible && clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const verticalControl = clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
   const horizontalControl = Math.ceil(KAPPA * hx);
   const q = [r, t + hy, r, t + hy - verticalControl, r - hx + horizontalControl, t, topX, t];
   const mx = (x) => l + r - x;
@@ -15906,7 +15906,7 @@ function stopColorAt(stops, t) {
   }
   return stops[stops.length - 1].argb;
 }
-function pathGradientColorAt(shape, x, y) {
+function pathGradientColorAt(shape, x, y, focusPoint) {
   const { center, boundary, boundaryArgb } = shape;
   const n = boundary.length;
   const px = x - center.x;
@@ -15955,6 +15955,10 @@ function pathGradientColorAt(shape, x, y) {
         const ey = b.y - a.y;
         const cross = ax * ey - ay * ex;
         if (Math.abs(cross) < 1e-12) continue;
+        if (fx === 0 && fy > 0 && Math.abs((focusPoint?.x ?? x) - center.x) < eps && ex > 0 && Math.max(ax, ax + ex) > 0 && Math.abs(ey) > eps) {
+          const u = (((focusPoint?.y ?? y) - center.y) / fy - ay) / ey;
+          if (u >= -eps && u <= 1 + eps) inFocus = true;
+        }
         if ((fx > 0 || Math.abs(px) < eps) && (fy > 0 || Math.abs(py) < eps)) {
           const x2 = fx > 0 ? px / fx : 0;
           const y2 = fy > 0 ? py / fy : 0;
@@ -16703,7 +16707,8 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1, carry) {
       const meanDark = sectorDark[s] / sectorCount[s];
       const ratio = meanDark > 0 ? dark[k] / meanDark : 1;
       const u = distance[k] / radius;
-      const falloff = Math.max(strength * (1 - u) * (1 - u), 0.5 * Math.max(0, 1 - ratio) ** 2);
+      const darknessFalloff = ratio < 2 ? 0.5 * (1 - ratio) ** 2 : 0;
+      const falloff = Math.max(strength * (1 - u) * (1 - u), darknessFalloff);
       const rest = (1 - falloff) * mean;
       if (rest >= v) {
         continue;
@@ -29785,7 +29790,7 @@ function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = fal
   for (let i = 0; i < q.length; i += 2) {
     pts.push(...map(q[i], clockwise ? f.t + f.b - q[i + 1] : q[i + 1]));
   }
-  if (box.halfX && !clockwise) {
+  if (box.halfX) {
     for (const k of [1, 2, 3, 4, 5, 6, 8, 15]) {
       pts[2 * k]++;
     }
@@ -30409,7 +30414,8 @@ function pathGradientSampler(shape, wrap, device) {
           by = foldIntoTile(by, box.y, box.h, mirrorY, lagY);
         }
         if (wrap === "clamp" && by >= box.y + box.h) continue;
-        const c = pathGradientColorAt(shape, bx, by);
+        const focusPoint = bias && shape.focus?.x === 0 ? { x: bx - inv2[0] * bias, y: by - inv2[1] * bias } : void 0;
+        const c = pathGradientColorAt(shape, bx, by, focusPoint);
         if (c === null) {
           continue;
         }
@@ -30875,7 +30881,7 @@ function fixExtent(rCtx, v, axis) {
   return Math.round(Math.abs(v) * k * 16);
 }
 var PS_INSIDEFRAME = 6;
-function insideFrameInset(rCtx, box, rectangle = false) {
+function insideFrameInset(rCtx, box, rectangle = false, clockwiseRoundRect = false) {
   if ((rCtx.state.penStyle & 15) !== PS_INSIDEFRAME || !isAxisBox(box) || hasWorldRotation(rCtx)) {
     return null;
   }
@@ -30894,7 +30900,7 @@ function insideFrameInset(rCtx, box, rectangle = false) {
   }
   const lo = Math.floor(wx / 2);
   const hi = Math.ceil(wx / 2);
-  const y = Math.round(Math.ceil(wy / 2) * py);
+  const y = Math.round((clockwiseRoundRect ? Math.floor(wy / 2) : Math.ceil(wy / 2)) * py);
   return {
     left: Math.round((rectangle ? hi : lo) * px),
     right: Math.round((rectangle ? lo : hi) * px),
@@ -31158,7 +31164,7 @@ function handleRoundRect(rCtx, dataOff, recSize) {
     const cornerH = view.getInt32(dataOff + 20, true);
     const clockwise = rCtx.state.arcDirection === 2;
     const unframed = uprightFixBox(rCtx, l, t, r, b);
-    const inset = insideFrameInset(rCtx, unframed);
+    const inset = insideFrameInset(rCtx, unframed, false, clockwise);
     const framed = inset ? insetFixBox(unframed, inset) : unframed;
     const devM = gdiDeviceMatrix(rCtx);
     const cornerFixW = inset ? Math.abs(cornerW * devM[0]) * 16 : fixExtent(rCtx, cornerW, 0);

package/dist/browser.mjs

@@ -11730,10 +11730,10 @@ function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = fa
     ew = 0;
     eh = 0;
   }
-  const hy = compatible ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
+  const hy = compatible || clockwise ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = compatible ? Math.round(r - ew / 2) : Math.floor(r - ew / 2);
   const hx = r - topX;
-  const verticalControl = compatible && clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const verticalControl = clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
   const horizontalControl = Math.ceil(KAPPA * hx);
   const q = [r, t + hy, r, t + hy - verticalControl, r - hx + horizontalControl, t, topX, t];
   const mx = (x) => l + r - x;
@@ -15904,7 +15904,7 @@ function stopColorAt(stops, t) {
   }
   return stops[stops.length - 1].argb;
 }
-function pathGradientColorAt(shape, x, y) {
+function pathGradientColorAt(shape, x, y, focusPoint) {
   const { center, boundary, boundaryArgb } = shape;
   const n = boundary.length;
   const px = x - center.x;
@@ -15953,6 +15953,10 @@ function pathGradientColorAt(shape, x, y) {
         const ey = b.y - a.y;
         const cross = ax * ey - ay * ex;
         if (Math.abs(cross) < 1e-12) continue;
+        if (fx === 0 && fy > 0 && Math.abs((focusPoint?.x ?? x) - center.x) < eps && ex > 0 && Math.max(ax, ax + ex) > 0 && Math.abs(ey) > eps) {
+          const u = (((focusPoint?.y ?? y) - center.y) / fy - ay) / ey;
+          if (u >= -eps && u <= 1 + eps) inFocus = true;
+        }
         if ((fx > 0 || Math.abs(px) < eps) && (fy > 0 || Math.abs(py) < eps)) {
           const x2 = fx > 0 ? px / fx : 0;
           const y2 = fy > 0 ? py / fy : 0;
@@ -16701,7 +16705,8 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1, carry) {
       const meanDark = sectorDark[s] / sectorCount[s];
       const ratio = meanDark > 0 ? dark[k] / meanDark : 1;
       const u = distance[k] / radius;
-      const falloff = Math.max(strength * (1 - u) * (1 - u), 0.5 * Math.max(0, 1 - ratio) ** 2);
+      const darknessFalloff = ratio < 2 ? 0.5 * (1 - ratio) ** 2 : 0;
+      const falloff = Math.max(strength * (1 - u) * (1 - u), darknessFalloff);
       const rest = (1 - falloff) * mean;
       if (rest >= v) {
         continue;
@@ -29783,7 +29788,7 @@ function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = fal
   for (let i = 0; i < q.length; i += 2) {
     pts.push(...map(q[i], clockwise ? f.t + f.b - q[i + 1] : q[i + 1]));
   }
-  if (box.halfX && !clockwise) {
+  if (box.halfX) {
     for (const k of [1, 2, 3, 4, 5, 6, 8, 15]) {
       pts[2 * k]++;
     }
@@ -30407,7 +30412,8 @@ function pathGradientSampler(shape, wrap, device) {
           by = foldIntoTile(by, box.y, box.h, mirrorY, lagY);
         }
         if (wrap === "clamp" && by >= box.y + box.h) continue;
-        const c = pathGradientColorAt(shape, bx, by);
+        const focusPoint = bias && shape.focus?.x === 0 ? { x: bx - inv2[0] * bias, y: by - inv2[1] * bias } : void 0;
+        const c = pathGradientColorAt(shape, bx, by, focusPoint);
         if (c === null) {
           continue;
         }
@@ -30873,7 +30879,7 @@ function fixExtent(rCtx, v, axis) {
   return Math.round(Math.abs(v) * k * 16);
 }
 var PS_INSIDEFRAME = 6;
-function insideFrameInset(rCtx, box, rectangle = false) {
+function insideFrameInset(rCtx, box, rectangle = false, clockwiseRoundRect = false) {
   if ((rCtx.state.penStyle & 15) !== PS_INSIDEFRAME || !isAxisBox(box) || hasWorldRotation(rCtx)) {
     return null;
   }
@@ -30892,7 +30898,7 @@ function insideFrameInset(rCtx, box, rectangle = false) {
   }
   const lo = Math.floor(wx / 2);
   const hi = Math.ceil(wx / 2);
-  const y = Math.round(Math.ceil(wy / 2) * py);
+  const y = Math.round((clockwiseRoundRect ? Math.floor(wy / 2) : Math.ceil(wy / 2)) * py);
   return {
     left: Math.round((rectangle ? hi : lo) * px),
     right: Math.round((rectangle ? lo : hi) * px),
@@ -31156,7 +31162,7 @@ function handleRoundRect(rCtx, dataOff, recSize) {
     const cornerH = view.getInt32(dataOff + 20, true);
     const clockwise = rCtx.state.arcDirection === 2;
     const unframed = uprightFixBox(rCtx, l, t, r, b);
-    const inset = insideFrameInset(rCtx, unframed);
+    const inset = insideFrameInset(rCtx, unframed, false, clockwise);
     const framed = inset ? insetFixBox(unframed, inset) : unframed;
     const devM = gdiDeviceMatrix(rCtx);
     const cornerFixW = inset ? Math.abs(cornerW * devM[0]) * 16 : fixExtent(rCtx, cornerW, 0);

package/dist/index.js

@@ -11733,10 +11733,10 @@ function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = fa
     ew = 0;
     eh = 0;
   }
-  const hy = compatible ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
+  const hy = compatible || clockwise ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = compatible ? Math.round(r - ew / 2) : Math.floor(r - ew / 2);
   const hx = r - topX;
-  const verticalControl = compatible && clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const verticalControl = clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
   const horizontalControl = Math.ceil(KAPPA * hx);
   const q = [r, t + hy, r, t + hy - verticalControl, r - hx + horizontalControl, t, topX, t];
   const mx = (x) => l + r - x;
@@ -15907,7 +15907,7 @@ function stopColorAt(stops, t) {
   }
   return stops[stops.length - 1].argb;
 }
-function pathGradientColorAt(shape, x, y) {
+function pathGradientColorAt(shape, x, y, focusPoint) {
   const { center, boundary, boundaryArgb } = shape;
   const n = boundary.length;
   const px = x - center.x;
@@ -15956,6 +15956,10 @@ function pathGradientColorAt(shape, x, y) {
         const ey = b.y - a.y;
         const cross = ax * ey - ay * ex;
         if (Math.abs(cross) < 1e-12) continue;
+        if (fx === 0 && fy > 0 && Math.abs((focusPoint?.x ?? x) - center.x) < eps && ex > 0 && Math.max(ax, ax + ex) > 0 && Math.abs(ey) > eps) {
+          const u = (((focusPoint?.y ?? y) - center.y) / fy - ay) / ey;
+          if (u >= -eps && u <= 1 + eps) inFocus = true;
+        }
         if ((fx > 0 || Math.abs(px) < eps) && (fy > 0 || Math.abs(py) < eps)) {
           const x2 = fx > 0 ? px / fx : 0;
           const y2 = fy > 0 ? py / fy : 0;
@@ -16704,7 +16708,8 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1, carry) {
       const meanDark = sectorDark[s] / sectorCount[s];
       const ratio = meanDark > 0 ? dark[k] / meanDark : 1;
       const u = distance[k] / radius;
-      const falloff = Math.max(strength * (1 - u) * (1 - u), 0.5 * Math.max(0, 1 - ratio) ** 2);
+      const darknessFalloff = ratio < 2 ? 0.5 * (1 - ratio) ** 2 : 0;
+      const falloff = Math.max(strength * (1 - u) * (1 - u), darknessFalloff);
       const rest = (1 - falloff) * mean;
       if (rest >= v) {
         continue;
@@ -29786,7 +29791,7 @@ function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = fal
   for (let i = 0; i < q.length; i += 2) {
     pts.push(...map(q[i], clockwise ? f.t + f.b - q[i + 1] : q[i + 1]));
   }
-  if (box.halfX && !clockwise) {
+  if (box.halfX) {
     for (const k of [1, 2, 3, 4, 5, 6, 8, 15]) {
       pts[2 * k]++;
     }
@@ -30410,7 +30415,8 @@ function pathGradientSampler(shape, wrap, device) {
           by = foldIntoTile(by, box.y, box.h, mirrorY, lagY);
         }
         if (wrap === "clamp" && by >= box.y + box.h) continue;
-        const c = pathGradientColorAt(shape, bx, by);
+        const focusPoint = bias && shape.focus?.x === 0 ? { x: bx - inv2[0] * bias, y: by - inv2[1] * bias } : void 0;
+        const c = pathGradientColorAt(shape, bx, by, focusPoint);
         if (c === null) {
           continue;
         }
@@ -30876,7 +30882,7 @@ function fixExtent(rCtx, v, axis) {
   return Math.round(Math.abs(v) * k * 16);
 }
 var PS_INSIDEFRAME = 6;
-function insideFrameInset(rCtx, box, rectangle = false) {
+function insideFrameInset(rCtx, box, rectangle = false, clockwiseRoundRect = false) {
   if ((rCtx.state.penStyle & 15) !== PS_INSIDEFRAME || !isAxisBox(box) || hasWorldRotation(rCtx)) {
     return null;
   }
@@ -30895,7 +30901,7 @@ function insideFrameInset(rCtx, box, rectangle = false) {
   }
   const lo = Math.floor(wx / 2);
   const hi = Math.ceil(wx / 2);
-  const y = Math.round(Math.ceil(wy / 2) * py);
+  const y = Math.round((clockwiseRoundRect ? Math.floor(wy / 2) : Math.ceil(wy / 2)) * py);
   return {
     left: Math.round((rectangle ? hi : lo) * px),
     right: Math.round((rectangle ? lo : hi) * px),
@@ -31159,7 +31165,7 @@ function handleRoundRect(rCtx, dataOff, recSize) {
     const cornerH = view.getInt32(dataOff + 20, true);
     const clockwise = rCtx.state.arcDirection === 2;
     const unframed = uprightFixBox(rCtx, l, t, r, b);
-    const inset = insideFrameInset(rCtx, unframed);
+    const inset = insideFrameInset(rCtx, unframed, false, clockwise);
     const framed = inset ? insetFixBox(unframed, inset) : unframed;
     const devM = gdiDeviceMatrix(rCtx);
     const cornerFixW = inset ? Math.abs(cornerW * devM[0]) * 16 : fixExtent(rCtx, cornerW, 0);

package/dist/index.mjs

@@ -11731,10 +11731,10 @@ function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = fa
     ew = 0;
     eh = 0;
   }
-  const hy = compatible ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
+  const hy = compatible || clockwise ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = compatible ? Math.round(r - ew / 2) : Math.floor(r - ew / 2);
   const hx = r - topX;
-  const verticalControl = compatible && clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const verticalControl = clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
   const horizontalControl = Math.ceil(KAPPA * hx);
   const q = [r, t + hy, r, t + hy - verticalControl, r - hx + horizontalControl, t, topX, t];
   const mx = (x) => l + r - x;
@@ -15905,7 +15905,7 @@ function stopColorAt(stops, t) {
   }
   return stops[stops.length - 1].argb;
 }
-function pathGradientColorAt(shape, x, y) {
+function pathGradientColorAt(shape, x, y, focusPoint) {
   const { center, boundary, boundaryArgb } = shape;
   const n = boundary.length;
   const px = x - center.x;
@@ -15954,6 +15954,10 @@ function pathGradientColorAt(shape, x, y) {
         const ey = b.y - a.y;
         const cross = ax * ey - ay * ex;
         if (Math.abs(cross) < 1e-12) continue;
+        if (fx === 0 && fy > 0 && Math.abs((focusPoint?.x ?? x) - center.x) < eps && ex > 0 && Math.max(ax, ax + ex) > 0 && Math.abs(ey) > eps) {
+          const u = (((focusPoint?.y ?? y) - center.y) / fy - ay) / ey;
+          if (u >= -eps && u <= 1 + eps) inFocus = true;
+        }
         if ((fx > 0 || Math.abs(px) < eps) && (fy > 0 || Math.abs(py) < eps)) {
           const x2 = fx > 0 ? px / fx : 0;
           const y2 = fy > 0 ? py / fy : 0;
@@ -16702,7 +16706,8 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1, carry) {
       const meanDark = sectorDark[s] / sectorCount[s];
       const ratio = meanDark > 0 ? dark[k] / meanDark : 1;
       const u = distance[k] / radius;
-      const falloff = Math.max(strength * (1 - u) * (1 - u), 0.5 * Math.max(0, 1 - ratio) ** 2);
+      const darknessFalloff = ratio < 2 ? 0.5 * (1 - ratio) ** 2 : 0;
+      const falloff = Math.max(strength * (1 - u) * (1 - u), darknessFalloff);
       const rest = (1 - falloff) * mean;
       if (rest >= v) {
         continue;
@@ -29784,7 +29789,7 @@ function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = fal
   for (let i = 0; i < q.length; i += 2) {
     pts.push(...map(q[i], clockwise ? f.t + f.b - q[i + 1] : q[i + 1]));
   }
-  if (box.halfX && !clockwise) {
+  if (box.halfX) {
     for (const k of [1, 2, 3, 4, 5, 6, 8, 15]) {
       pts[2 * k]++;
     }
@@ -30408,7 +30413,8 @@ function pathGradientSampler(shape, wrap, device) {
           by = foldIntoTile(by, box.y, box.h, mirrorY, lagY);
         }
         if (wrap === "clamp" && by >= box.y + box.h) continue;
-        const c = pathGradientColorAt(shape, bx, by);
+        const focusPoint = bias && shape.focus?.x === 0 ? { x: bx - inv2[0] * bias, y: by - inv2[1] * bias } : void 0;
+        const c = pathGradientColorAt(shape, bx, by, focusPoint);
         if (c === null) {
           continue;
         }
@@ -30874,7 +30880,7 @@ function fixExtent(rCtx, v, axis) {
   return Math.round(Math.abs(v) * k * 16);
 }
 var PS_INSIDEFRAME = 6;
-function insideFrameInset(rCtx, box, rectangle = false) {
+function insideFrameInset(rCtx, box, rectangle = false, clockwiseRoundRect = false) {
   if ((rCtx.state.penStyle & 15) !== PS_INSIDEFRAME || !isAxisBox(box) || hasWorldRotation(rCtx)) {
     return null;
   }
@@ -30893,7 +30899,7 @@ function insideFrameInset(rCtx, box, rectangle = false) {
   }
   const lo = Math.floor(wx / 2);
   const hi = Math.ceil(wx / 2);
-  const y = Math.round(Math.ceil(wy / 2) * py);
+  const y = Math.round((clockwiseRoundRect ? Math.floor(wy / 2) : Math.ceil(wy / 2)) * py);
   return {
     left: Math.round((rectangle ? hi : lo) * px),
     right: Math.round((rectangle ? lo : hi) * px),
@@ -31157,7 +31163,7 @@ function handleRoundRect(rCtx, dataOff, recSize) {
     const cornerH = view.getInt32(dataOff + 20, true);
     const clockwise = rCtx.state.arcDirection === 2;
     const unframed = uprightFixBox(rCtx, l, t, r, b);
-    const inset = insideFrameInset(rCtx, unframed);
+    const inset = insideFrameInset(rCtx, unframed, false, clockwise);
     const framed = inset ? insetFixBox(unframed, inset) : unframed;
     const devM = gdiDeviceMatrix(rCtx);
     const cornerFixW = inset ? Math.abs(cornerW * devM[0]) * 16 : fixExtent(rCtx, cornerW, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "emf-converter",
-	"version": "4.8.12",
+	"version": "4.8.14",
 	"description": "Convert EMF/WMF metafile binaries to PNG data URLs or SVG (markup, data URL, React/JSX)",
 	"keywords": [
 		"canvas",