emf-converter 4.4.12 → 4.4.13

package/dist/browser.js

@@ -15863,7 +15863,7 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h, verticalRows = Math.ceil(h / w)) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
   const horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
@@ -15893,7 +15893,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
+    const endRow = fullVertical ? h : Math.min(h, vRow + verticalRows);
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -16012,13 +16012,12 @@ function copyBlock(src, width, sx, sy, w, h, dst, bw, dx, dy) {
     dst.set(src.subarray(from, from + w * 4), ((dy + y) * bw + dx) * 4);
   }
 }
-function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1) {
+function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1, cropped) {
   const r = Math.ceil(radius);
   const bw = x1 - x0 + 2 * r;
   const bh = y1 - y0 + 2 * r;
   const buf = new Uint8ClampedArray(bw * bh * 4);
-  const inside = x0 - r >= 0 && y0 - r >= 0 && x1 + r <= width && y1 + r <= height;
-  if (inside) {
+  if (cropped) {
     copyBlock(rgba, width, x0, y0, x1 - x0, y1 - y0, buf, bw, r, r);
   } else {
     const gx0 = Math.max(0, x0 - r);
@@ -16027,7 +16026,7 @@ function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1) {
     const gy1 = Math.min(height, y1 + r);
     copyBlock(rgba, width, gx0, gy0, gx1 - gx0, gy1 - gy0, buf, bw, gx0 - (x0 - r), gy0 - (y0 - r));
   }
-  const blurred = gdipBlur(buf, bw, bh, radius, inside ? r : 0, inside);
+  const blurred = blurReduction(radius) > 1 ? effectBlur(buf, bw, bh, radius) : gdipBlur(buf, bw, bh, radius, cropped ? r : 0, cropped, false, bw, bh, Math.ceil((y1 - y0) / (x1 - x0)));
   const w = x1 - x0;
   const out = new Uint8ClampedArray(w * (y1 - y0) * 4);
   for (let y = 0; y < y1 - y0; y++) {
@@ -16068,7 +16067,8 @@ function applyImageEffectToRect(rgba, width, height, effect, src) {
     return { rgba: shown, x: x0, y: y0, width: shownWidth, height: shownHeight };
   };
   if (src && effect.kind === "blur" && effect.expandEdge) {
-    return result(expandedBlur(rgba, width, height, effect.radius, x0, y0, x1, y1));
+    const cropped = Math.ceil(src.x + src.w) < width && Math.ceil(src.y + src.h) < height;
+    return result(expandedBlur(rgba, width, height, effect.radius, x0, y0, x1, y1, cropped));
   }
   let region = rgba;
   if (w !== width || h !== height) {

package/dist/browser.mjs

@@ -15861,7 +15861,7 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h, verticalRows = Math.ceil(h / w)) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
   const horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
@@ -15891,7 +15891,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
+    const endRow = fullVertical ? h : Math.min(h, vRow + verticalRows);
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -16010,13 +16010,12 @@ function copyBlock(src, width, sx, sy, w, h, dst, bw, dx, dy) {
     dst.set(src.subarray(from, from + w * 4), ((dy + y) * bw + dx) * 4);
   }
 }
-function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1) {
+function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1, cropped) {
   const r = Math.ceil(radius);
   const bw = x1 - x0 + 2 * r;
   const bh = y1 - y0 + 2 * r;
   const buf = new Uint8ClampedArray(bw * bh * 4);
-  const inside = x0 - r >= 0 && y0 - r >= 0 && x1 + r <= width && y1 + r <= height;
-  if (inside) {
+  if (cropped) {
     copyBlock(rgba, width, x0, y0, x1 - x0, y1 - y0, buf, bw, r, r);
   } else {
     const gx0 = Math.max(0, x0 - r);
@@ -16025,7 +16024,7 @@ function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1) {
     const gy1 = Math.min(height, y1 + r);
     copyBlock(rgba, width, gx0, gy0, gx1 - gx0, gy1 - gy0, buf, bw, gx0 - (x0 - r), gy0 - (y0 - r));
   }
-  const blurred = gdipBlur(buf, bw, bh, radius, inside ? r : 0, inside);
+  const blurred = blurReduction(radius) > 1 ? effectBlur(buf, bw, bh, radius) : gdipBlur(buf, bw, bh, radius, cropped ? r : 0, cropped, false, bw, bh, Math.ceil((y1 - y0) / (x1 - x0)));
   const w = x1 - x0;
   const out = new Uint8ClampedArray(w * (y1 - y0) * 4);
   for (let y = 0; y < y1 - y0; y++) {
@@ -16066,7 +16065,8 @@ function applyImageEffectToRect(rgba, width, height, effect, src) {
     return { rgba: shown, x: x0, y: y0, width: shownWidth, height: shownHeight };
   };
   if (src && effect.kind === "blur" && effect.expandEdge) {
-    return result(expandedBlur(rgba, width, height, effect.radius, x0, y0, x1, y1));
+    const cropped = Math.ceil(src.x + src.w) < width && Math.ceil(src.y + src.h) < height;
+    return result(expandedBlur(rgba, width, height, effect.radius, x0, y0, x1, y1, cropped));
   }
   let region = rgba;
   if (w !== width || h !== height) {

package/dist/index.js

@@ -15864,7 +15864,7 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h, verticalRows = Math.ceil(h / w)) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
   const horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
@@ -15894,7 +15894,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
+    const endRow = fullVertical ? h : Math.min(h, vRow + verticalRows);
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -16013,13 +16013,12 @@ function copyBlock(src, width, sx, sy, w, h, dst, bw, dx, dy) {
     dst.set(src.subarray(from, from + w * 4), ((dy + y) * bw + dx) * 4);
   }
 }
-function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1) {
+function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1, cropped) {
   const r = Math.ceil(radius);
   const bw = x1 - x0 + 2 * r;
   const bh = y1 - y0 + 2 * r;
   const buf = new Uint8ClampedArray(bw * bh * 4);
-  const inside = x0 - r >= 0 && y0 - r >= 0 && x1 + r <= width && y1 + r <= height;
-  if (inside) {
+  if (cropped) {
     copyBlock(rgba, width, x0, y0, x1 - x0, y1 - y0, buf, bw, r, r);
   } else {
     const gx0 = Math.max(0, x0 - r);
@@ -16028,7 +16027,7 @@ function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1) {
     const gy1 = Math.min(height, y1 + r);
     copyBlock(rgba, width, gx0, gy0, gx1 - gx0, gy1 - gy0, buf, bw, gx0 - (x0 - r), gy0 - (y0 - r));
   }
-  const blurred = gdipBlur(buf, bw, bh, radius, inside ? r : 0, inside);
+  const blurred = blurReduction(radius) > 1 ? effectBlur(buf, bw, bh, radius) : gdipBlur(buf, bw, bh, radius, cropped ? r : 0, cropped, false, bw, bh, Math.ceil((y1 - y0) / (x1 - x0)));
   const w = x1 - x0;
   const out = new Uint8ClampedArray(w * (y1 - y0) * 4);
   for (let y = 0; y < y1 - y0; y++) {
@@ -16069,7 +16068,8 @@ function applyImageEffectToRect(rgba, width, height, effect, src) {
     return { rgba: shown, x: x0, y: y0, width: shownWidth, height: shownHeight };
   };
   if (src && effect.kind === "blur" && effect.expandEdge) {
-    return result(expandedBlur(rgba, width, height, effect.radius, x0, y0, x1, y1));
+    const cropped = Math.ceil(src.x + src.w) < width && Math.ceil(src.y + src.h) < height;
+    return result(expandedBlur(rgba, width, height, effect.radius, x0, y0, x1, y1, cropped));
   }
   let region = rgba;
   if (w !== width || h !== height) {

package/dist/index.mjs

@@ -15862,7 +15862,7 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h, verticalRows = Math.ceil(h / w)) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
   const horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
@@ -15892,7 +15892,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
+    const endRow = fullVertical ? h : Math.min(h, vRow + verticalRows);
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -16011,13 +16011,12 @@ function copyBlock(src, width, sx, sy, w, h, dst, bw, dx, dy) {
     dst.set(src.subarray(from, from + w * 4), ((dy + y) * bw + dx) * 4);
   }
 }
-function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1) {
+function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1, cropped) {
   const r = Math.ceil(radius);
   const bw = x1 - x0 + 2 * r;
   const bh = y1 - y0 + 2 * r;
   const buf = new Uint8ClampedArray(bw * bh * 4);
-  const inside = x0 - r >= 0 && y0 - r >= 0 && x1 + r <= width && y1 + r <= height;
-  if (inside) {
+  if (cropped) {
     copyBlock(rgba, width, x0, y0, x1 - x0, y1 - y0, buf, bw, r, r);
   } else {
     const gx0 = Math.max(0, x0 - r);
@@ -16026,7 +16025,7 @@ function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1) {
     const gy1 = Math.min(height, y1 + r);
     copyBlock(rgba, width, gx0, gy0, gx1 - gx0, gy1 - gy0, buf, bw, gx0 - (x0 - r), gy0 - (y0 - r));
   }
-  const blurred = gdipBlur(buf, bw, bh, radius, inside ? r : 0, inside);
+  const blurred = blurReduction(radius) > 1 ? effectBlur(buf, bw, bh, radius) : gdipBlur(buf, bw, bh, radius, cropped ? r : 0, cropped, false, bw, bh, Math.ceil((y1 - y0) / (x1 - x0)));
   const w = x1 - x0;
   const out = new Uint8ClampedArray(w * (y1 - y0) * 4);
   for (let y = 0; y < y1 - y0; y++) {
@@ -16067,7 +16066,8 @@ function applyImageEffectToRect(rgba, width, height, effect, src) {
     return { rgba: shown, x: x0, y: y0, width: shownWidth, height: shownHeight };
   };
   if (src && effect.kind === "blur" && effect.expandEdge) {
-    return result(expandedBlur(rgba, width, height, effect.radius, x0, y0, x1, y1));
+    const cropped = Math.ceil(src.x + src.w) < width && Math.ceil(src.y + src.h) < height;
+    return result(expandedBlur(rgba, width, height, effect.radius, x0, y0, x1, y1, cropped));
   }
   let region = rgba;
   if (w !== width || h !== height) {

package/package.json

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