emf-converter 4.5.0 → 4.5.2

package/dist/browser.js

@@ -31152,6 +31152,29 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
+var SOFT_TENT_SIGMA = 0.25;
+var SOFT_TENT_STEPS = 31;
+var SOFT_TENT_SPAN = 3;
+var softTentCache = /* @__PURE__ */ new Map();
+function softTent(d) {
+  const key = Math.round(d * 1024);
+  const cached = softTentCache.get(key);
+  if (cached !== void 0) {
+    return cached;
+  }
+  let sum = 0;
+  let total = 0;
+  const half = (SOFT_TENT_STEPS - 1) / 2;
+  for (let i = -half; i <= half; i++) {
+    const x = i / half * SOFT_TENT_SPAN * SOFT_TENT_SIGMA;
+    const g = Math.exp(-(x * x) / (2 * SOFT_TENT_SIGMA * SOFT_TENT_SIGMA));
+    total += g;
+    sum += g * Math.max(0, 1 - Math.abs(key / 1024 + x));
+  }
+  const value = sum / total;
+  softTentCache.set(key, value);
+  return value;
+}
 var SPECKLE_OVERSHOOT = 4;
 function halftoneDespeckle(px, w, h) {
   const src = px.slice();
@@ -31324,18 +31347,38 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     }
     const source = out;
     out = new Int32Array(W * H * 3);
+    const axisTaps = (src2, dst) => {
+      const r = [];
+      for (let i = 0; i < dst; i++) {
+        if (src2 === dst) {
+          r.push([[i, 1]]);
+          continue;
+        }
+        const raw = (i + 0.5) * src2 / dst - 0.5;
+        const pos = Math.max(0, Math.min(src2 - 1, raw));
+        const i0 = Math.floor(pos);
+        if (dst === 2 * src2) {
+          r.push([[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]]);
+          continue;
+        }
+        const taps = [];
+        let total = 0;
+        for (let k = i0 - 2; k <= i0 + 3; k++) {
+          const w = softTent(raw - k);
+          taps.push([Math.max(0, Math.min(src2 - 1, k)), w]);
+          total += w;
+        }
+        r.push(taps.map(([k, w]) => [k, w / total]));
+      }
+      return r;
+    };
+    const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
     for (let y = 0; y < H; y++) {
-      const py = Math.max(0, Math.min(sampleH - 1, (y + 0.5) * sampleH / H - 0.5));
-      const y02 = Math.floor(py), fy = py - y02;
       for (let x = 0; x < W; x++) {
-        const px = Math.max(0, Math.min(sampleW - 1, (x + 0.5) * sampleW / W - 0.5));
-        const x02 = Math.floor(px), fx = px - x02;
         for (let c = 0; c < 3; c++) {
-          const at = (xx, yy) => source[(yy * sampleW + xx) * 3 + c];
-          const x1 = Math.min(sampleW - 1, x02 + 1), y1 = Math.min(sampleH - 1, y02 + 1);
-          const top = at(x02, y02) * (1 - fx) + at(x1, y02) * fx;
-          const bottom = at(x02, y1) * (1 - fx) + at(x1, y1) * fx;
-          out[(y * W + x) * 3 + c] = Math.floor(top * (1 - fy) + bottom * fy + 0.5);
+          let v = 0;
+          for (const [yy, wy] of yt[y]) for (const [xx, wx] of xt[x]) v += source[(yy * sampleW + xx) * 3 + c] * wy * wx;
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5)));
         }
       }
     }

package/dist/browser.mjs

@@ -31150,6 +31150,29 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
+var SOFT_TENT_SIGMA = 0.25;
+var SOFT_TENT_STEPS = 31;
+var SOFT_TENT_SPAN = 3;
+var softTentCache = /* @__PURE__ */ new Map();
+function softTent(d) {
+  const key = Math.round(d * 1024);
+  const cached = softTentCache.get(key);
+  if (cached !== void 0) {
+    return cached;
+  }
+  let sum = 0;
+  let total = 0;
+  const half = (SOFT_TENT_STEPS - 1) / 2;
+  for (let i = -half; i <= half; i++) {
+    const x = i / half * SOFT_TENT_SPAN * SOFT_TENT_SIGMA;
+    const g = Math.exp(-(x * x) / (2 * SOFT_TENT_SIGMA * SOFT_TENT_SIGMA));
+    total += g;
+    sum += g * Math.max(0, 1 - Math.abs(key / 1024 + x));
+  }
+  const value = sum / total;
+  softTentCache.set(key, value);
+  return value;
+}
 var SPECKLE_OVERSHOOT = 4;
 function halftoneDespeckle(px, w, h) {
   const src = px.slice();
@@ -31322,18 +31345,38 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     }
     const source = out;
     out = new Int32Array(W * H * 3);
+    const axisTaps = (src2, dst) => {
+      const r = [];
+      for (let i = 0; i < dst; i++) {
+        if (src2 === dst) {
+          r.push([[i, 1]]);
+          continue;
+        }
+        const raw = (i + 0.5) * src2 / dst - 0.5;
+        const pos = Math.max(0, Math.min(src2 - 1, raw));
+        const i0 = Math.floor(pos);
+        if (dst === 2 * src2) {
+          r.push([[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]]);
+          continue;
+        }
+        const taps = [];
+        let total = 0;
+        for (let k = i0 - 2; k <= i0 + 3; k++) {
+          const w = softTent(raw - k);
+          taps.push([Math.max(0, Math.min(src2 - 1, k)), w]);
+          total += w;
+        }
+        r.push(taps.map(([k, w]) => [k, w / total]));
+      }
+      return r;
+    };
+    const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
     for (let y = 0; y < H; y++) {
-      const py = Math.max(0, Math.min(sampleH - 1, (y + 0.5) * sampleH / H - 0.5));
-      const y02 = Math.floor(py), fy = py - y02;
       for (let x = 0; x < W; x++) {
-        const px = Math.max(0, Math.min(sampleW - 1, (x + 0.5) * sampleW / W - 0.5));
-        const x02 = Math.floor(px), fx = px - x02;
         for (let c = 0; c < 3; c++) {
-          const at = (xx, yy) => source[(yy * sampleW + xx) * 3 + c];
-          const x1 = Math.min(sampleW - 1, x02 + 1), y1 = Math.min(sampleH - 1, y02 + 1);
-          const top = at(x02, y02) * (1 - fx) + at(x1, y02) * fx;
-          const bottom = at(x02, y1) * (1 - fx) + at(x1, y1) * fx;
-          out[(y * W + x) * 3 + c] = Math.floor(top * (1 - fy) + bottom * fy + 0.5);
+          let v = 0;
+          for (const [yy, wy] of yt[y]) for (const [xx, wx] of xt[x]) v += source[(yy * sampleW + xx) * 3 + c] * wy * wx;
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5)));
         }
       }
     }

package/dist/index.js

@@ -31153,6 +31153,29 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
+var SOFT_TENT_SIGMA = 0.25;
+var SOFT_TENT_STEPS = 31;
+var SOFT_TENT_SPAN = 3;
+var softTentCache = /* @__PURE__ */ new Map();
+function softTent(d) {
+  const key = Math.round(d * 1024);
+  const cached = softTentCache.get(key);
+  if (cached !== void 0) {
+    return cached;
+  }
+  let sum = 0;
+  let total = 0;
+  const half = (SOFT_TENT_STEPS - 1) / 2;
+  for (let i = -half; i <= half; i++) {
+    const x = i / half * SOFT_TENT_SPAN * SOFT_TENT_SIGMA;
+    const g = Math.exp(-(x * x) / (2 * SOFT_TENT_SIGMA * SOFT_TENT_SIGMA));
+    total += g;
+    sum += g * Math.max(0, 1 - Math.abs(key / 1024 + x));
+  }
+  const value = sum / total;
+  softTentCache.set(key, value);
+  return value;
+}
 var SPECKLE_OVERSHOOT = 4;
 function halftoneDespeckle(px, w, h) {
   const src = px.slice();
@@ -31325,18 +31348,38 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     }
     const source = out;
     out = new Int32Array(W * H * 3);
+    const axisTaps = (src2, dst) => {
+      const r = [];
+      for (let i = 0; i < dst; i++) {
+        if (src2 === dst) {
+          r.push([[i, 1]]);
+          continue;
+        }
+        const raw = (i + 0.5) * src2 / dst - 0.5;
+        const pos = Math.max(0, Math.min(src2 - 1, raw));
+        const i0 = Math.floor(pos);
+        if (dst === 2 * src2) {
+          r.push([[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]]);
+          continue;
+        }
+        const taps = [];
+        let total = 0;
+        for (let k = i0 - 2; k <= i0 + 3; k++) {
+          const w = softTent(raw - k);
+          taps.push([Math.max(0, Math.min(src2 - 1, k)), w]);
+          total += w;
+        }
+        r.push(taps.map(([k, w]) => [k, w / total]));
+      }
+      return r;
+    };
+    const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
     for (let y = 0; y < H; y++) {
-      const py = Math.max(0, Math.min(sampleH - 1, (y + 0.5) * sampleH / H - 0.5));
-      const y02 = Math.floor(py), fy = py - y02;
       for (let x = 0; x < W; x++) {
-        const px = Math.max(0, Math.min(sampleW - 1, (x + 0.5) * sampleW / W - 0.5));
-        const x02 = Math.floor(px), fx = px - x02;
         for (let c = 0; c < 3; c++) {
-          const at = (xx, yy) => source[(yy * sampleW + xx) * 3 + c];
-          const x1 = Math.min(sampleW - 1, x02 + 1), y1 = Math.min(sampleH - 1, y02 + 1);
-          const top = at(x02, y02) * (1 - fx) + at(x1, y02) * fx;
-          const bottom = at(x02, y1) * (1 - fx) + at(x1, y1) * fx;
-          out[(y * W + x) * 3 + c] = Math.floor(top * (1 - fy) + bottom * fy + 0.5);
+          let v = 0;
+          for (const [yy, wy] of yt[y]) for (const [xx, wx] of xt[x]) v += source[(yy * sampleW + xx) * 3 + c] * wy * wx;
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5)));
         }
       }
     }

package/dist/index.mjs

@@ -31151,6 +31151,29 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
+var SOFT_TENT_SIGMA = 0.25;
+var SOFT_TENT_STEPS = 31;
+var SOFT_TENT_SPAN = 3;
+var softTentCache = /* @__PURE__ */ new Map();
+function softTent(d) {
+  const key = Math.round(d * 1024);
+  const cached = softTentCache.get(key);
+  if (cached !== void 0) {
+    return cached;
+  }
+  let sum = 0;
+  let total = 0;
+  const half = (SOFT_TENT_STEPS - 1) / 2;
+  for (let i = -half; i <= half; i++) {
+    const x = i / half * SOFT_TENT_SPAN * SOFT_TENT_SIGMA;
+    const g = Math.exp(-(x * x) / (2 * SOFT_TENT_SIGMA * SOFT_TENT_SIGMA));
+    total += g;
+    sum += g * Math.max(0, 1 - Math.abs(key / 1024 + x));
+  }
+  const value = sum / total;
+  softTentCache.set(key, value);
+  return value;
+}
 var SPECKLE_OVERSHOOT = 4;
 function halftoneDespeckle(px, w, h) {
   const src = px.slice();
@@ -31323,18 +31346,38 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     }
     const source = out;
     out = new Int32Array(W * H * 3);
+    const axisTaps = (src2, dst) => {
+      const r = [];
+      for (let i = 0; i < dst; i++) {
+        if (src2 === dst) {
+          r.push([[i, 1]]);
+          continue;
+        }
+        const raw = (i + 0.5) * src2 / dst - 0.5;
+        const pos = Math.max(0, Math.min(src2 - 1, raw));
+        const i0 = Math.floor(pos);
+        if (dst === 2 * src2) {
+          r.push([[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]]);
+          continue;
+        }
+        const taps = [];
+        let total = 0;
+        for (let k = i0 - 2; k <= i0 + 3; k++) {
+          const w = softTent(raw - k);
+          taps.push([Math.max(0, Math.min(src2 - 1, k)), w]);
+          total += w;
+        }
+        r.push(taps.map(([k, w]) => [k, w / total]));
+      }
+      return r;
+    };
+    const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
     for (let y = 0; y < H; y++) {
-      const py = Math.max(0, Math.min(sampleH - 1, (y + 0.5) * sampleH / H - 0.5));
-      const y02 = Math.floor(py), fy = py - y02;
       for (let x = 0; x < W; x++) {
-        const px = Math.max(0, Math.min(sampleW - 1, (x + 0.5) * sampleW / W - 0.5));
-        const x02 = Math.floor(px), fx = px - x02;
         for (let c = 0; c < 3; c++) {
-          const at = (xx, yy) => source[(yy * sampleW + xx) * 3 + c];
-          const x1 = Math.min(sampleW - 1, x02 + 1), y1 = Math.min(sampleH - 1, y02 + 1);
-          const top = at(x02, y02) * (1 - fx) + at(x1, y02) * fx;
-          const bottom = at(x02, y1) * (1 - fx) + at(x1, y1) * fx;
-          out[(y * W + x) * 3 + c] = Math.floor(top * (1 - fy) + bottom * fy + 0.5);
+          let v = 0;
+          for (const [yy, wy] of yt[y]) for (const [xx, wx] of xt[x]) v += source[(yy * sampleW + xx) * 3 + c] * wy * wx;
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5)));
         }
       }
     }

package/package.json

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