emf-converter 4.4.7 → 4.4.8

package/dist/browser.js

@@ -15763,11 +15763,11 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
   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 horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = taps >= edgeHeight ? (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;
@@ -15793,7 +15793,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -15811,14 +15811,46 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   return out;
 }
+function blurReduction(radius) {
+  return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
+}
+function effectBlur(src, width, height, radius) {
+  const factor = blurReduction(radius);
+  if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
+    return gdipBlur(src, width, height, radius);
+  }
+  const w = Math.ceil(width / factor);
+  const h = Math.ceil(height / factor);
+  const reduced = new Uint8ClampedArray(w * h * 4);
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) {
+    const x1 = Math.min(width, (x + 1) * factor), y1 = Math.min(height, (y + 1) * factor);
+    const count = (x1 - x * factor) * (y1 - y * factor);
+    for (let c = 0; c < 4; c++) {
+      let sum = 0;
+      for (let yy = y * factor; yy < y1; yy++) for (let xx = x * factor; xx < x1; xx++) sum += src[(yy * width + xx) * 4 + c];
+      reduced[(y * w + x) * 4 + c] = Math.floor(sum / count);
+    }
+  }
+  const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  for (let i = 0; i < filtered.length; i++) filtered[i] = Math.round(filtered[i]);
+  const out = new Float64Array(src.length);
+  for (let y = 0; y < height; y++) for (let x = 0; x < width; x++) {
+    const px = clamp((x + 0.5) / factor - 0.5, 0, w - 1), py = clamp((y + 0.5) / factor - 0.5, 0, h - 1);
+    const ix = Math.floor(px), iy = Math.floor(py), fx = px - ix, fy = py - iy;
+    const a = (iy * w + ix) * 4, b = (iy * w + Math.min(w - 1, ix + 1)) * 4;
+    const d = (Math.min(h - 1, iy + 1) * w + ix) * 4, e = (Math.min(h - 1, iy + 1) * w + Math.min(w - 1, ix + 1)) * 4;
+    for (let c = 0; c < 4; c++) out[(y * width + x) * 4 + c] = Math.round((1 - fy) * ((1 - fx) * filtered[a + c] + fx * filtered[b + c]) + fy * ((1 - fx) * filtered[d + c] + fx * filtered[e + c]));
+  }
+  return out;
+}
 function applyBlur(src, w, h, radius) {
-  return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
+  return Uint8ClampedArray.from(effectBlur(src, w, h, radius), Math.round);
 }
 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);
+  const blurred = effectBlur(src, w, h, radius);
   const gain = sharpenGain(radius, amount);
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {

package/dist/browser.mjs

@@ -15761,11 +15761,11 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
   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 horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = taps >= edgeHeight ? (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;
@@ -15791,7 +15791,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -15809,14 +15809,46 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   return out;
 }
+function blurReduction(radius) {
+  return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
+}
+function effectBlur(src, width, height, radius) {
+  const factor = blurReduction(radius);
+  if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
+    return gdipBlur(src, width, height, radius);
+  }
+  const w = Math.ceil(width / factor);
+  const h = Math.ceil(height / factor);
+  const reduced = new Uint8ClampedArray(w * h * 4);
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) {
+    const x1 = Math.min(width, (x + 1) * factor), y1 = Math.min(height, (y + 1) * factor);
+    const count = (x1 - x * factor) * (y1 - y * factor);
+    for (let c = 0; c < 4; c++) {
+      let sum = 0;
+      for (let yy = y * factor; yy < y1; yy++) for (let xx = x * factor; xx < x1; xx++) sum += src[(yy * width + xx) * 4 + c];
+      reduced[(y * w + x) * 4 + c] = Math.floor(sum / count);
+    }
+  }
+  const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  for (let i = 0; i < filtered.length; i++) filtered[i] = Math.round(filtered[i]);
+  const out = new Float64Array(src.length);
+  for (let y = 0; y < height; y++) for (let x = 0; x < width; x++) {
+    const px = clamp((x + 0.5) / factor - 0.5, 0, w - 1), py = clamp((y + 0.5) / factor - 0.5, 0, h - 1);
+    const ix = Math.floor(px), iy = Math.floor(py), fx = px - ix, fy = py - iy;
+    const a = (iy * w + ix) * 4, b = (iy * w + Math.min(w - 1, ix + 1)) * 4;
+    const d = (Math.min(h - 1, iy + 1) * w + ix) * 4, e = (Math.min(h - 1, iy + 1) * w + Math.min(w - 1, ix + 1)) * 4;
+    for (let c = 0; c < 4; c++) out[(y * width + x) * 4 + c] = Math.round((1 - fy) * ((1 - fx) * filtered[a + c] + fx * filtered[b + c]) + fy * ((1 - fx) * filtered[d + c] + fx * filtered[e + c]));
+  }
+  return out;
+}
 function applyBlur(src, w, h, radius) {
-  return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
+  return Uint8ClampedArray.from(effectBlur(src, w, h, radius), Math.round);
 }
 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);
+  const blurred = effectBlur(src, w, h, radius);
   const gain = sharpenGain(radius, amount);
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {

package/dist/index.js

@@ -15764,11 +15764,11 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
   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 horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = taps >= edgeHeight ? (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;
@@ -15794,7 +15794,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -15812,14 +15812,46 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   return out;
 }
+function blurReduction(radius) {
+  return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
+}
+function effectBlur(src, width, height, radius) {
+  const factor = blurReduction(radius);
+  if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
+    return gdipBlur(src, width, height, radius);
+  }
+  const w = Math.ceil(width / factor);
+  const h = Math.ceil(height / factor);
+  const reduced = new Uint8ClampedArray(w * h * 4);
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) {
+    const x1 = Math.min(width, (x + 1) * factor), y1 = Math.min(height, (y + 1) * factor);
+    const count = (x1 - x * factor) * (y1 - y * factor);
+    for (let c = 0; c < 4; c++) {
+      let sum = 0;
+      for (let yy = y * factor; yy < y1; yy++) for (let xx = x * factor; xx < x1; xx++) sum += src[(yy * width + xx) * 4 + c];
+      reduced[(y * w + x) * 4 + c] = Math.floor(sum / count);
+    }
+  }
+  const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  for (let i = 0; i < filtered.length; i++) filtered[i] = Math.round(filtered[i]);
+  const out = new Float64Array(src.length);
+  for (let y = 0; y < height; y++) for (let x = 0; x < width; x++) {
+    const px = clamp((x + 0.5) / factor - 0.5, 0, w - 1), py = clamp((y + 0.5) / factor - 0.5, 0, h - 1);
+    const ix = Math.floor(px), iy = Math.floor(py), fx = px - ix, fy = py - iy;
+    const a = (iy * w + ix) * 4, b = (iy * w + Math.min(w - 1, ix + 1)) * 4;
+    const d = (Math.min(h - 1, iy + 1) * w + ix) * 4, e = (Math.min(h - 1, iy + 1) * w + Math.min(w - 1, ix + 1)) * 4;
+    for (let c = 0; c < 4; c++) out[(y * width + x) * 4 + c] = Math.round((1 - fy) * ((1 - fx) * filtered[a + c] + fx * filtered[b + c]) + fy * ((1 - fx) * filtered[d + c] + fx * filtered[e + c]));
+  }
+  return out;
+}
 function applyBlur(src, w, h, radius) {
-  return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
+  return Uint8ClampedArray.from(effectBlur(src, w, h, radius), Math.round);
 }
 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);
+  const blurred = effectBlur(src, w, h, radius);
   const gain = sharpenGain(radius, amount);
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {

package/dist/index.mjs

@@ -15762,11 +15762,11 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
   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 horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = taps >= edgeHeight ? (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;
@@ -15792,7 +15792,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -15810,14 +15810,46 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   return out;
 }
+function blurReduction(radius) {
+  return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
+}
+function effectBlur(src, width, height, radius) {
+  const factor = blurReduction(radius);
+  if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
+    return gdipBlur(src, width, height, radius);
+  }
+  const w = Math.ceil(width / factor);
+  const h = Math.ceil(height / factor);
+  const reduced = new Uint8ClampedArray(w * h * 4);
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) {
+    const x1 = Math.min(width, (x + 1) * factor), y1 = Math.min(height, (y + 1) * factor);
+    const count = (x1 - x * factor) * (y1 - y * factor);
+    for (let c = 0; c < 4; c++) {
+      let sum = 0;
+      for (let yy = y * factor; yy < y1; yy++) for (let xx = x * factor; xx < x1; xx++) sum += src[(yy * width + xx) * 4 + c];
+      reduced[(y * w + x) * 4 + c] = Math.floor(sum / count);
+    }
+  }
+  const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  for (let i = 0; i < filtered.length; i++) filtered[i] = Math.round(filtered[i]);
+  const out = new Float64Array(src.length);
+  for (let y = 0; y < height; y++) for (let x = 0; x < width; x++) {
+    const px = clamp((x + 0.5) / factor - 0.5, 0, w - 1), py = clamp((y + 0.5) / factor - 0.5, 0, h - 1);
+    const ix = Math.floor(px), iy = Math.floor(py), fx = px - ix, fy = py - iy;
+    const a = (iy * w + ix) * 4, b = (iy * w + Math.min(w - 1, ix + 1)) * 4;
+    const d = (Math.min(h - 1, iy + 1) * w + ix) * 4, e = (Math.min(h - 1, iy + 1) * w + Math.min(w - 1, ix + 1)) * 4;
+    for (let c = 0; c < 4; c++) out[(y * width + x) * 4 + c] = Math.round((1 - fy) * ((1 - fx) * filtered[a + c] + fx * filtered[b + c]) + fy * ((1 - fx) * filtered[d + c] + fx * filtered[e + c]));
+  }
+  return out;
+}
 function applyBlur(src, w, h, radius) {
-  return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
+  return Uint8ClampedArray.from(effectBlur(src, w, h, radius), Math.round);
 }
 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);
+  const blurred = effectBlur(src, w, h, radius);
   const gain = sharpenGain(radius, amount);
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {

package/package.json

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