emf-converter 4.4.3 → 4.4.5

package/dist/browser.js

@@ -10985,7 +10985,7 @@ function flattenBezierPath(pts) {
   }
   return out;
 }
-function roundRectCorners(l, t, r, b, cw, ch, compatible = false) {
+function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = false) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10994,10 +10994,10 @@ function roundRectCorners(l, t, r, b, cw, ch, compatible = false) {
     ew = 0;
     eh = 0;
   }
-  const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
-  const topX = Math.floor(r - ew / 2);
+  const hy = compatible ? 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 ? Math.round(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const verticalControl = compatible && 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;
@@ -15700,10 +15700,9 @@ function blurKernel(radius) {
     k[0] = 1;
     return k;
   }
-  const sigma = radius / 1.98;
   let sum = 0;
   for (let i = -taps; i <= taps; i++) {
-    const w = Math.exp(-(i * i) / (2 * sigma * sigma));
+    const w = Math.exp(-1.96 * i * i / (radius * radius));
     k[i + taps] = w;
     sum += w;
   }
@@ -15724,6 +15723,8 @@ function mirror(p, n) {
 function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
+  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15733,7 +15734,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
       let s2 = 0;
       let s3 = 0;
       for (let j = -taps; j <= taps; j++) {
-        const p = row + mirror(x + j, w) * 4;
+        const p = row + horizontalIndex(x + j) * 4;
         const kw = k[j + taps];
         s0 += kw * src[p];
         s1 += kw * src[p + 1];
@@ -15741,38 +15742,37 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
         s3 += kw * src[p + 3];
       }
       const o = row + x * 4;
-      out[o] = s0;
-      out[o + 1] = s1;
-      out[o + 2] = s2;
-      out[o + 3] = s3;
+      out[o] = Math.round(s0);
+      out[o + 1] = Math.round(s1);
+      out[o + 2] = Math.round(s2);
+      out[o + 3] = Math.round(s3);
     }
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
-    const col = new Float64Array(w * 4);
-    for (let j = -taps; j <= taps; j++) {
-      const yy = vRow + j;
-      if (vZeroAbove && yy < vRow) {
-        continue;
-      }
-      const base = mirror(yy, h) * w * 4;
-      for (let i = 0; i < w * 4; i++) {
-        col[i] += k[j + taps] * out[base + i];
+    const horizontal = out.slice();
+    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    for (let row = vRow; row < endRow; row++) {
+      const col = new Float64Array(w * 4);
+      for (let j = -taps; j <= taps; j++) {
+        const yy = row + j;
+        if (vZeroAbove && yy < vRow) {
+          continue;
+        }
+        const base = verticalIndex(yy) * w * 4;
+        for (let i = 0; i < w * 4; i++) {
+          col[i] += k[j + taps] * horizontal[base + i];
+        }
       }
+      out.set(col, row * w * 4);
     }
-    out.set(col, vRow * w * 4);
   }
   return out;
 }
 function applyBlur(src, w, h, radius) {
   return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
 }
-var SHARPEN_FALLOFF = Math.log2(96 / 25);
-function sharpenGain(radius, amount) {
-  const x = amount / 100;
-  if (radius <= 3) {
-    return x * 2 * radius / 3;
-  }
-  return x * 2 * (3 / radius) ** SHARPEN_FALLOFF;
+function sharpenGain(_radius, amount) {
+  return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
   const blurred = gdipBlur(src, w, h, radius);
@@ -28501,7 +28501,7 @@ function boxFrame(box) {
 }
 function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = false) {
   const f = boxFrame(box);
-  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible);
+  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible, clockwise);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
@@ -37561,12 +37561,16 @@ function wmfRectangle(p, l, t, r, b) {
     axisRect: { interior: rectInterior(p, box) }
   });
 }
-function compatCorner(p, w, h) {
+function compatCorner(p, w, h, box) {
   const m = gdiDeviceMatrix(p.rCtx);
   const cw = Math.round(Math.abs(w * m[0]) * 16);
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];
+  }
   if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
     return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
   }
@@ -37577,7 +37581,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const [cw, ch] = compatCorner(p, w, h);
+  const [cw, ch] = compatCorner(p, w, h, box);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -37602,7 +37606,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, true),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, !penIsNull(p) && penIsCosmetic(p.rCtx)),
     roundPen: true,
     fill: true,
     stroke: true

package/dist/browser.mjs

@@ -10983,7 +10983,7 @@ function flattenBezierPath(pts) {
   }
   return out;
 }
-function roundRectCorners(l, t, r, b, cw, ch, compatible = false) {
+function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = false) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10992,10 +10992,10 @@ function roundRectCorners(l, t, r, b, cw, ch, compatible = false) {
     ew = 0;
     eh = 0;
   }
-  const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
-  const topX = Math.floor(r - ew / 2);
+  const hy = compatible ? 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 ? Math.round(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const verticalControl = compatible && 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;
@@ -15698,10 +15698,9 @@ function blurKernel(radius) {
     k[0] = 1;
     return k;
   }
-  const sigma = radius / 1.98;
   let sum = 0;
   for (let i = -taps; i <= taps; i++) {
-    const w = Math.exp(-(i * i) / (2 * sigma * sigma));
+    const w = Math.exp(-1.96 * i * i / (radius * radius));
     k[i + taps] = w;
     sum += w;
   }
@@ -15722,6 +15721,8 @@ function mirror(p, n) {
 function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
+  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15731,7 +15732,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
       let s2 = 0;
       let s3 = 0;
       for (let j = -taps; j <= taps; j++) {
-        const p = row + mirror(x + j, w) * 4;
+        const p = row + horizontalIndex(x + j) * 4;
         const kw = k[j + taps];
         s0 += kw * src[p];
         s1 += kw * src[p + 1];
@@ -15739,38 +15740,37 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
         s3 += kw * src[p + 3];
       }
       const o = row + x * 4;
-      out[o] = s0;
-      out[o + 1] = s1;
-      out[o + 2] = s2;
-      out[o + 3] = s3;
+      out[o] = Math.round(s0);
+      out[o + 1] = Math.round(s1);
+      out[o + 2] = Math.round(s2);
+      out[o + 3] = Math.round(s3);
     }
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
-    const col = new Float64Array(w * 4);
-    for (let j = -taps; j <= taps; j++) {
-      const yy = vRow + j;
-      if (vZeroAbove && yy < vRow) {
-        continue;
-      }
-      const base = mirror(yy, h) * w * 4;
-      for (let i = 0; i < w * 4; i++) {
-        col[i] += k[j + taps] * out[base + i];
+    const horizontal = out.slice();
+    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    for (let row = vRow; row < endRow; row++) {
+      const col = new Float64Array(w * 4);
+      for (let j = -taps; j <= taps; j++) {
+        const yy = row + j;
+        if (vZeroAbove && yy < vRow) {
+          continue;
+        }
+        const base = verticalIndex(yy) * w * 4;
+        for (let i = 0; i < w * 4; i++) {
+          col[i] += k[j + taps] * horizontal[base + i];
+        }
       }
+      out.set(col, row * w * 4);
     }
-    out.set(col, vRow * w * 4);
   }
   return out;
 }
 function applyBlur(src, w, h, radius) {
   return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
 }
-var SHARPEN_FALLOFF = Math.log2(96 / 25);
-function sharpenGain(radius, amount) {
-  const x = amount / 100;
-  if (radius <= 3) {
-    return x * 2 * radius / 3;
-  }
-  return x * 2 * (3 / radius) ** SHARPEN_FALLOFF;
+function sharpenGain(_radius, amount) {
+  return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
   const blurred = gdipBlur(src, w, h, radius);
@@ -28499,7 +28499,7 @@ function boxFrame(box) {
 }
 function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = false) {
   const f = boxFrame(box);
-  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible);
+  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible, clockwise);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
@@ -37559,12 +37559,16 @@ function wmfRectangle(p, l, t, r, b) {
     axisRect: { interior: rectInterior(p, box) }
   });
 }
-function compatCorner(p, w, h) {
+function compatCorner(p, w, h, box) {
   const m = gdiDeviceMatrix(p.rCtx);
   const cw = Math.round(Math.abs(w * m[0]) * 16);
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];
+  }
   if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
     return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
   }
@@ -37575,7 +37579,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const [cw, ch] = compatCorner(p, w, h);
+  const [cw, ch] = compatCorner(p, w, h, box);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -37600,7 +37604,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, true),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, !penIsNull(p) && penIsCosmetic(p.rCtx)),
     roundPen: true,
     fill: true,
     stroke: true

package/dist/index.js

@@ -10986,7 +10986,7 @@ function flattenBezierPath(pts) {
   }
   return out;
 }
-function roundRectCorners(l, t, r, b, cw, ch, compatible = false) {
+function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = false) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10995,10 +10995,10 @@ function roundRectCorners(l, t, r, b, cw, ch, compatible = false) {
     ew = 0;
     eh = 0;
   }
-  const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
-  const topX = Math.floor(r - ew / 2);
+  const hy = compatible ? 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 ? Math.round(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const verticalControl = compatible && 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;
@@ -15701,10 +15701,9 @@ function blurKernel(radius) {
     k[0] = 1;
     return k;
   }
-  const sigma = radius / 1.98;
   let sum = 0;
   for (let i = -taps; i <= taps; i++) {
-    const w = Math.exp(-(i * i) / (2 * sigma * sigma));
+    const w = Math.exp(-1.96 * i * i / (radius * radius));
     k[i + taps] = w;
     sum += w;
   }
@@ -15725,6 +15724,8 @@ function mirror(p, n) {
 function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
+  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15734,7 +15735,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
       let s2 = 0;
       let s3 = 0;
       for (let j = -taps; j <= taps; j++) {
-        const p = row + mirror(x + j, w) * 4;
+        const p = row + horizontalIndex(x + j) * 4;
         const kw = k[j + taps];
         s0 += kw * src[p];
         s1 += kw * src[p + 1];
@@ -15742,38 +15743,37 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
         s3 += kw * src[p + 3];
       }
       const o = row + x * 4;
-      out[o] = s0;
-      out[o + 1] = s1;
-      out[o + 2] = s2;
-      out[o + 3] = s3;
+      out[o] = Math.round(s0);
+      out[o + 1] = Math.round(s1);
+      out[o + 2] = Math.round(s2);
+      out[o + 3] = Math.round(s3);
     }
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
-    const col = new Float64Array(w * 4);
-    for (let j = -taps; j <= taps; j++) {
-      const yy = vRow + j;
-      if (vZeroAbove && yy < vRow) {
-        continue;
-      }
-      const base = mirror(yy, h) * w * 4;
-      for (let i = 0; i < w * 4; i++) {
-        col[i] += k[j + taps] * out[base + i];
+    const horizontal = out.slice();
+    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    for (let row = vRow; row < endRow; row++) {
+      const col = new Float64Array(w * 4);
+      for (let j = -taps; j <= taps; j++) {
+        const yy = row + j;
+        if (vZeroAbove && yy < vRow) {
+          continue;
+        }
+        const base = verticalIndex(yy) * w * 4;
+        for (let i = 0; i < w * 4; i++) {
+          col[i] += k[j + taps] * horizontal[base + i];
+        }
       }
+      out.set(col, row * w * 4);
     }
-    out.set(col, vRow * w * 4);
   }
   return out;
 }
 function applyBlur(src, w, h, radius) {
   return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
 }
-var SHARPEN_FALLOFF = Math.log2(96 / 25);
-function sharpenGain(radius, amount) {
-  const x = amount / 100;
-  if (radius <= 3) {
-    return x * 2 * radius / 3;
-  }
-  return x * 2 * (3 / radius) ** SHARPEN_FALLOFF;
+function sharpenGain(_radius, amount) {
+  return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
   const blurred = gdipBlur(src, w, h, radius);
@@ -28502,7 +28502,7 @@ function boxFrame(box) {
 }
 function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = false) {
   const f = boxFrame(box);
-  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible);
+  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible, clockwise);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
@@ -37562,12 +37562,16 @@ function wmfRectangle(p, l, t, r, b) {
     axisRect: { interior: rectInterior(p, box) }
   });
 }
-function compatCorner(p, w, h) {
+function compatCorner(p, w, h, box) {
   const m = gdiDeviceMatrix(p.rCtx);
   const cw = Math.round(Math.abs(w * m[0]) * 16);
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];
+  }
   if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
     return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
   }
@@ -37578,7 +37582,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const [cw, ch] = compatCorner(p, w, h);
+  const [cw, ch] = compatCorner(p, w, h, box);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -37603,7 +37607,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, true),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, !penIsNull(p) && penIsCosmetic(p.rCtx)),
     roundPen: true,
     fill: true,
     stroke: true

package/dist/index.mjs

@@ -10984,7 +10984,7 @@ function flattenBezierPath(pts) {
   }
   return out;
 }
-function roundRectCorners(l, t, r, b, cw, ch, compatible = false) {
+function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = false) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10993,10 +10993,10 @@ function roundRectCorners(l, t, r, b, cw, ch, compatible = false) {
     ew = 0;
     eh = 0;
   }
-  const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
-  const topX = Math.floor(r - ew / 2);
+  const hy = compatible ? 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 ? Math.round(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const verticalControl = compatible && 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;
@@ -15699,10 +15699,9 @@ function blurKernel(radius) {
     k[0] = 1;
     return k;
   }
-  const sigma = radius / 1.98;
   let sum = 0;
   for (let i = -taps; i <= taps; i++) {
-    const w = Math.exp(-(i * i) / (2 * sigma * sigma));
+    const w = Math.exp(-1.96 * i * i / (radius * radius));
     k[i + taps] = w;
     sum += w;
   }
@@ -15723,6 +15722,8 @@ function mirror(p, n) {
 function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
+  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15732,7 +15733,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
       let s2 = 0;
       let s3 = 0;
       for (let j = -taps; j <= taps; j++) {
-        const p = row + mirror(x + j, w) * 4;
+        const p = row + horizontalIndex(x + j) * 4;
         const kw = k[j + taps];
         s0 += kw * src[p];
         s1 += kw * src[p + 1];
@@ -15740,38 +15741,37 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
         s3 += kw * src[p + 3];
       }
       const o = row + x * 4;
-      out[o] = s0;
-      out[o + 1] = s1;
-      out[o + 2] = s2;
-      out[o + 3] = s3;
+      out[o] = Math.round(s0);
+      out[o + 1] = Math.round(s1);
+      out[o + 2] = Math.round(s2);
+      out[o + 3] = Math.round(s3);
     }
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
-    const col = new Float64Array(w * 4);
-    for (let j = -taps; j <= taps; j++) {
-      const yy = vRow + j;
-      if (vZeroAbove && yy < vRow) {
-        continue;
-      }
-      const base = mirror(yy, h) * w * 4;
-      for (let i = 0; i < w * 4; i++) {
-        col[i] += k[j + taps] * out[base + i];
+    const horizontal = out.slice();
+    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    for (let row = vRow; row < endRow; row++) {
+      const col = new Float64Array(w * 4);
+      for (let j = -taps; j <= taps; j++) {
+        const yy = row + j;
+        if (vZeroAbove && yy < vRow) {
+          continue;
+        }
+        const base = verticalIndex(yy) * w * 4;
+        for (let i = 0; i < w * 4; i++) {
+          col[i] += k[j + taps] * horizontal[base + i];
+        }
       }
+      out.set(col, row * w * 4);
     }
-    out.set(col, vRow * w * 4);
   }
   return out;
 }
 function applyBlur(src, w, h, radius) {
   return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
 }
-var SHARPEN_FALLOFF = Math.log2(96 / 25);
-function sharpenGain(radius, amount) {
-  const x = amount / 100;
-  if (radius <= 3) {
-    return x * 2 * radius / 3;
-  }
-  return x * 2 * (3 / radius) ** SHARPEN_FALLOFF;
+function sharpenGain(_radius, amount) {
+  return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
   const blurred = gdipBlur(src, w, h, radius);
@@ -28500,7 +28500,7 @@ function boxFrame(box) {
 }
 function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = false) {
   const f = boxFrame(box);
-  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible);
+  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible, clockwise);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
@@ -37560,12 +37560,16 @@ function wmfRectangle(p, l, t, r, b) {
     axisRect: { interior: rectInterior(p, box) }
   });
 }
-function compatCorner(p, w, h) {
+function compatCorner(p, w, h, box) {
   const m = gdiDeviceMatrix(p.rCtx);
   const cw = Math.round(Math.abs(w * m[0]) * 16);
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];
+  }
   if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
     return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
   }
@@ -37576,7 +37580,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const [cw, ch] = compatCorner(p, w, h);
+  const [cw, ch] = compatCorner(p, w, h, box);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -37601,7 +37605,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, true),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, !penIsNull(p) && penIsCosmetic(p.rCtx)),
     roundPen: true,
     fill: true,
     stroke: true

package/package.json

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