emf-converter 4.6.2 → 4.6.4

package/dist/browser.js

@@ -15598,9 +15598,37 @@ function mix(c0, c1, f) {
     c0[3] + (c1[3] - c0[3]) * f
   ];
 }
+var f32Buffer = new Float32Array(1);
+var f32Bits = new Int32Array(f32Buffer.buffer);
+function truncF32(x) {
+  const r = Math.fround(x);
+  if (Math.abs(r) > Math.abs(x)) {
+    f32Buffer[0] = r;
+    f32Bits[0] -= 1;
+    return f32Buffer[0];
+  }
+  return r;
+}
+function blendFactor(positions, factors, t) {
+  const n = Math.min(positions.length, factors.length);
+  if (n === 0) {
+    return t;
+  }
+  if (t <= positions[0]) {
+    return factors[0];
+  }
+  for (let i = 1; i < n; i++) {
+    if (t <= positions[i]) {
+      const span = truncF32(positions[i] - positions[i - 1]);
+      const s = span > 0 ? truncF32(truncF32(t - positions[i - 1]) / span) : 1;
+      return truncF32(factors[i - 1] + truncF32(truncF32(factors[i] - factors[i - 1]) * s));
+    }
+  }
+  return factors[n - 1];
+}
 function mixBlend(c0, c1, f) {
-  const g = Math.fround(1 - f);
-  const ch = (a, b) => (Math.trunc(a * 256 * g) + Math.trunc(b * 256 * f)) / 256;
+  const g = truncF32(1 - f);
+  const ch = (a, b) => truncF32(truncF32(a * g) + truncF32(b * f));
   return [ch(c0[0], c1[0]), ch(c0[1], c1[1]), ch(c0[2], c1[2]), ch(c0[3], c1[3])];
 }
 function rampColorAt(ramp, t) {
@@ -15623,7 +15651,7 @@ function rampColorAt(ramp, t) {
   const start = premultiplied(ramp.startArgb, gamma);
   const end = premultiplied(ramp.endArgb, gamma);
   if (ramp.blend && !gamma) {
-    return mixBlend(start, end, piecewise(ramp.blend.positions, ramp.blend.factors, t));
+    return mixBlend(start, end, blendFactor(ramp.blend.positions, ramp.blend.factors, t));
   }
   return mix(start, end, ramp.blend ? piecewise(ramp.blend.positions, ramp.blend.factors, t) : t);
 }
@@ -16508,7 +16536,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 +16554,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 +16663,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

@@ -15596,9 +15596,37 @@ function mix(c0, c1, f) {
     c0[3] + (c1[3] - c0[3]) * f
   ];
 }
+var f32Buffer = new Float32Array(1);
+var f32Bits = new Int32Array(f32Buffer.buffer);
+function truncF32(x) {
+  const r = Math.fround(x);
+  if (Math.abs(r) > Math.abs(x)) {
+    f32Buffer[0] = r;
+    f32Bits[0] -= 1;
+    return f32Buffer[0];
+  }
+  return r;
+}
+function blendFactor(positions, factors, t) {
+  const n = Math.min(positions.length, factors.length);
+  if (n === 0) {
+    return t;
+  }
+  if (t <= positions[0]) {
+    return factors[0];
+  }
+  for (let i = 1; i < n; i++) {
+    if (t <= positions[i]) {
+      const span = truncF32(positions[i] - positions[i - 1]);
+      const s = span > 0 ? truncF32(truncF32(t - positions[i - 1]) / span) : 1;
+      return truncF32(factors[i - 1] + truncF32(truncF32(factors[i] - factors[i - 1]) * s));
+    }
+  }
+  return factors[n - 1];
+}
 function mixBlend(c0, c1, f) {
-  const g = Math.fround(1 - f);
-  const ch = (a, b) => (Math.trunc(a * 256 * g) + Math.trunc(b * 256 * f)) / 256;
+  const g = truncF32(1 - f);
+  const ch = (a, b) => truncF32(truncF32(a * g) + truncF32(b * f));
   return [ch(c0[0], c1[0]), ch(c0[1], c1[1]), ch(c0[2], c1[2]), ch(c0[3], c1[3])];
 }
 function rampColorAt(ramp, t) {
@@ -15621,7 +15649,7 @@ function rampColorAt(ramp, t) {
   const start = premultiplied(ramp.startArgb, gamma);
   const end = premultiplied(ramp.endArgb, gamma);
   if (ramp.blend && !gamma) {
-    return mixBlend(start, end, piecewise(ramp.blend.positions, ramp.blend.factors, t));
+    return mixBlend(start, end, blendFactor(ramp.blend.positions, ramp.blend.factors, t));
   }
   return mix(start, end, ramp.blend ? piecewise(ramp.blend.positions, ramp.blend.factors, t) : t);
 }
@@ -16506,7 +16534,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 +16552,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 +16661,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

@@ -15599,9 +15599,37 @@ function mix(c0, c1, f) {
     c0[3] + (c1[3] - c0[3]) * f
   ];
 }
+var f32Buffer = new Float32Array(1);
+var f32Bits = new Int32Array(f32Buffer.buffer);
+function truncF32(x) {
+  const r = Math.fround(x);
+  if (Math.abs(r) > Math.abs(x)) {
+    f32Buffer[0] = r;
+    f32Bits[0] -= 1;
+    return f32Buffer[0];
+  }
+  return r;
+}
+function blendFactor(positions, factors, t) {
+  const n = Math.min(positions.length, factors.length);
+  if (n === 0) {
+    return t;
+  }
+  if (t <= positions[0]) {
+    return factors[0];
+  }
+  for (let i = 1; i < n; i++) {
+    if (t <= positions[i]) {
+      const span = truncF32(positions[i] - positions[i - 1]);
+      const s = span > 0 ? truncF32(truncF32(t - positions[i - 1]) / span) : 1;
+      return truncF32(factors[i - 1] + truncF32(truncF32(factors[i] - factors[i - 1]) * s));
+    }
+  }
+  return factors[n - 1];
+}
 function mixBlend(c0, c1, f) {
-  const g = Math.fround(1 - f);
-  const ch = (a, b) => (Math.trunc(a * 256 * g) + Math.trunc(b * 256 * f)) / 256;
+  const g = truncF32(1 - f);
+  const ch = (a, b) => truncF32(truncF32(a * g) + truncF32(b * f));
   return [ch(c0[0], c1[0]), ch(c0[1], c1[1]), ch(c0[2], c1[2]), ch(c0[3], c1[3])];
 }
 function rampColorAt(ramp, t) {
@@ -15624,7 +15652,7 @@ function rampColorAt(ramp, t) {
   const start = premultiplied(ramp.startArgb, gamma);
   const end = premultiplied(ramp.endArgb, gamma);
   if (ramp.blend && !gamma) {
-    return mixBlend(start, end, piecewise(ramp.blend.positions, ramp.blend.factors, t));
+    return mixBlend(start, end, blendFactor(ramp.blend.positions, ramp.blend.factors, t));
   }
   return mix(start, end, ramp.blend ? piecewise(ramp.blend.positions, ramp.blend.factors, t) : t);
 }
@@ -16509,7 +16537,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 +16555,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 +16664,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

@@ -15597,9 +15597,37 @@ function mix(c0, c1, f) {
     c0[3] + (c1[3] - c0[3]) * f
   ];
 }
+var f32Buffer = new Float32Array(1);
+var f32Bits = new Int32Array(f32Buffer.buffer);
+function truncF32(x) {
+  const r = Math.fround(x);
+  if (Math.abs(r) > Math.abs(x)) {
+    f32Buffer[0] = r;
+    f32Bits[0] -= 1;
+    return f32Buffer[0];
+  }
+  return r;
+}
+function blendFactor(positions, factors, t) {
+  const n = Math.min(positions.length, factors.length);
+  if (n === 0) {
+    return t;
+  }
+  if (t <= positions[0]) {
+    return factors[0];
+  }
+  for (let i = 1; i < n; i++) {
+    if (t <= positions[i]) {
+      const span = truncF32(positions[i] - positions[i - 1]);
+      const s = span > 0 ? truncF32(truncF32(t - positions[i - 1]) / span) : 1;
+      return truncF32(factors[i - 1] + truncF32(truncF32(factors[i] - factors[i - 1]) * s));
+    }
+  }
+  return factors[n - 1];
+}
 function mixBlend(c0, c1, f) {
-  const g = Math.fround(1 - f);
-  const ch = (a, b) => (Math.trunc(a * 256 * g) + Math.trunc(b * 256 * f)) / 256;
+  const g = truncF32(1 - f);
+  const ch = (a, b) => truncF32(truncF32(a * g) + truncF32(b * f));
   return [ch(c0[0], c1[0]), ch(c0[1], c1[1]), ch(c0[2], c1[2]), ch(c0[3], c1[3])];
 }
 function rampColorAt(ramp, t) {
@@ -15622,7 +15650,7 @@ function rampColorAt(ramp, t) {
   const start = premultiplied(ramp.startArgb, gamma);
   const end = premultiplied(ramp.endArgb, gamma);
   if (ramp.blend && !gamma) {
-    return mixBlend(start, end, piecewise(ramp.blend.positions, ramp.blend.factors, t));
+    return mixBlend(start, end, blendFactor(ramp.blend.positions, ramp.blend.factors, t));
   }
   return mix(start, end, ramp.blend ? piecewise(ramp.blend.positions, ramp.blend.factors, t) : t);
 }
@@ -16507,7 +16535,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 +16553,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 +16662,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

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