npm - emf-converter - Versions diffs - 4.6.1 → 4.6.3 - Mend

emf-converter 4.6.1 → 4.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/browser.js CHANGED Viewed

@@ -16508,7 +16508,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical
 function blurReduction(radius) {
   return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
 }
-function effectBlur(src, width, height, radius) {
+function effectBlur(src, width, height, radius, expanded = false) {
   const factor = blurReduction(radius);
   if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
     return gdipBlur(src, width, height, radius);
@@ -16526,6 +16526,21 @@ function effectBlur(src, width, height, radius) {
     }
   }
   const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  if (!expanded) {
+    const out2 = 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 x1 = Math.min(w - 1, ix + 1), y1 = Math.min(h - 1, iy + 1);
+      for (let c = 0; c < 4; c++) {
+        const at = (xx, yy) => filtered[(yy * w + xx) * 4 + c];
+        const top = Math.floor((1 - fx) * at(ix, iy) + fx * at(x1, iy));
+        const bottom = Math.floor((1 - fx) * at(ix, y1) + fx * at(x1, y1));
+        out2[(y * width + x) * 4 + c] = Math.floor((1 - fy) * top + fy * bottom);
+      }
+    }
+    return out2;
+  }
   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++) {
@@ -16620,7 +16635,7 @@ function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1, cropped) {
     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 = 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 blurred = blurReduction(radius) > 1 ? effectBlur(buf, bw, bh, radius, true) : 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++) {

package/dist/browser.mjs CHANGED Viewed

@@ -16506,7 +16506,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical
 function blurReduction(radius) {
   return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
 }
-function effectBlur(src, width, height, radius) {
+function effectBlur(src, width, height, radius, expanded = false) {
   const factor = blurReduction(radius);
   if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
     return gdipBlur(src, width, height, radius);
@@ -16524,6 +16524,21 @@ function effectBlur(src, width, height, radius) {
     }
   }
   const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  if (!expanded) {
+    const out2 = 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 x1 = Math.min(w - 1, ix + 1), y1 = Math.min(h - 1, iy + 1);
+      for (let c = 0; c < 4; c++) {
+        const at = (xx, yy) => filtered[(yy * w + xx) * 4 + c];
+        const top = Math.floor((1 - fx) * at(ix, iy) + fx * at(x1, iy));
+        const bottom = Math.floor((1 - fx) * at(ix, y1) + fx * at(x1, y1));
+        out2[(y * width + x) * 4 + c] = Math.floor((1 - fy) * top + fy * bottom);
+      }
+    }
+    return out2;
+  }
   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++) {
@@ -16618,7 +16633,7 @@ function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1, cropped) {
     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 = 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 blurred = blurReduction(radius) > 1 ? effectBlur(buf, bw, bh, radius, true) : 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++) {

package/dist/index.js CHANGED Viewed

@@ -16509,7 +16509,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical
 function blurReduction(radius) {
   return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
 }
-function effectBlur(src, width, height, radius) {
+function effectBlur(src, width, height, radius, expanded = false) {
   const factor = blurReduction(radius);
   if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
     return gdipBlur(src, width, height, radius);
@@ -16527,6 +16527,21 @@ function effectBlur(src, width, height, radius) {
     }
   }
   const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  if (!expanded) {
+    const out2 = 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 x1 = Math.min(w - 1, ix + 1), y1 = Math.min(h - 1, iy + 1);
+      for (let c = 0; c < 4; c++) {
+        const at = (xx, yy) => filtered[(yy * w + xx) * 4 + c];
+        const top = Math.floor((1 - fx) * at(ix, iy) + fx * at(x1, iy));
+        const bottom = Math.floor((1 - fx) * at(ix, y1) + fx * at(x1, y1));
+        out2[(y * width + x) * 4 + c] = Math.floor((1 - fy) * top + fy * bottom);
+      }
+    }
+    return out2;
+  }
   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++) {
@@ -16621,7 +16636,7 @@ function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1, cropped) {
     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 = 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 blurred = blurReduction(radius) > 1 ? effectBlur(buf, bw, bh, radius, true) : 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++) {

package/dist/index.mjs CHANGED Viewed

@@ -16507,7 +16507,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical
 function blurReduction(radius) {
   return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
 }
-function effectBlur(src, width, height, radius) {
+function effectBlur(src, width, height, radius, expanded = false) {
   const factor = blurReduction(radius);
   if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
     return gdipBlur(src, width, height, radius);
@@ -16525,6 +16525,21 @@ function effectBlur(src, width, height, radius) {
     }
   }
   const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  if (!expanded) {
+    const out2 = 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 x1 = Math.min(w - 1, ix + 1), y1 = Math.min(h - 1, iy + 1);
+      for (let c = 0; c < 4; c++) {
+        const at = (xx, yy) => filtered[(yy * w + xx) * 4 + c];
+        const top = Math.floor((1 - fx) * at(ix, iy) + fx * at(x1, iy));
+        const bottom = Math.floor((1 - fx) * at(ix, y1) + fx * at(x1, y1));
+        out2[(y * width + x) * 4 + c] = Math.floor((1 - fy) * top + fy * bottom);
+      }
+    }
+    return out2;
+  }
   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++) {
@@ -16619,7 +16634,7 @@ function expandedBlur(rgba, width, height, radius, x0, y0, x1, y1, cropped) {
     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 = 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 blurred = blurReduction(radius) > 1 ? effectBlur(buf, bw, bh, radius, true) : 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++) {

package/package.json CHANGED Viewed

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