emf-converter 4.4.14 → 4.4.16

package/dist/browser.js

@@ -30534,11 +30534,12 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (dstLen <= 0 || srcLen <= 0) {
     return taps;
   }
-  const at = (k) => reverse ? start + srcLen - 1 - k : start + k;
+  const at = (k) => start + k;
   if (dstLen >= srcLen) {
     for (let i = 0; i < dstLen; i++) {
       taps.push([[at(halftoneNearest(i, srcLen, dstLen)), 1]]);
     }
+    if (reverse) taps.reverse();
     return taps;
   }
   const step = Math.ceil(srcLen * FIX / dstLen);
@@ -30554,6 +30555,7 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
     }
     taps.push(run);
   }
+  if (reverse) taps.reverse();
   return taps;
 }
 var SPECKLE_OVERSHOOT = 4;
@@ -30569,8 +30571,22 @@ function halftoneDespeckle(px, w, h) {
       const right = x < w - 1 ? x + 1 : Math.max(0, x - 1);
       let hClip = 0;
       let vClip = 0;
+      let alternating = 0;
       for (let c = 0; c < 3; c++) {
         const v = at(x, y, c);
+        const axial = Math.max(
+          Math.abs(v - at(left, y, c)),
+          Math.abs(v - at(right, y, c)),
+          Math.abs(v - at(x, up, c)),
+          Math.abs(v - at(x, down, c))
+        );
+        const diagonal = Math.min(
+          Math.abs(v - at(left, up, c)),
+          Math.abs(v - at(right, up, c)),
+          Math.abs(v - at(left, down, c)),
+          Math.abs(v - at(right, down, c))
+        );
+        if (diagonal < axial) alternating++;
         if (over(6 * v - at(left, y, c) - at(right, y, c))) {
           hClip++;
         }
@@ -30578,7 +30594,7 @@ function halftoneDespeckle(px, w, h) {
           vClip++;
         }
       }
-      if (hClip < 2 || vClip < 2) {
+      if (hClip < 2 || vClip < 2 || alternating < 2) {
         continue;
       }
       for (let c = 0; c < 3; c++) {
@@ -30632,15 +30648,29 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const enlarging = W >= SW && H >= SH && (W > SW || H > SH);
   const reducing = W < SW && H < SH;
   const mixed = W > SW && H < SH || W < SW && H > SH;
-  if (enlarging && !directDib) {
+  const nearestMixed = mixed && (!adjust || adjustAfterSampling) && (W < SW && W * 2 > SW || H < SH && H * 2 > SH);
+  const nativeMixed = mixed && (!adjust || adjustAfterSampling) && Math.min(SW, W) >= 2 && Math.min(SH, H) >= 2 && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
+  if ((enlarging || nearestMixed) && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
   if (adjust && !adjustAfterSampling) {
     adjust(rect);
   }
-  const cols = halftoneAxis(0, SW, W, flipX);
-  const rows = halftoneAxis(0, SH, H, flipY);
-  if (mixed) {
+  const sampleW = nativeMixed ? Math.min(SW, W) : W;
+  const sampleH = nativeMixed ? Math.min(SH, H) : H;
+  const cols = halftoneAxis(0, SW, sampleW, flipX);
+  const rows = halftoneAxis(0, SH, sampleH, flipY);
+  if (nearestMixed) {
+    const nearest = (taps, src2, dst, reverse) => {
+      for (let i = 0; i < dst; i++) {
+        const index = reverse ? dst - 1 - i : i;
+        const k = dst < src2 ? Math.floor(((index + 1) * 2 * src2 - dst) / (2 * dst)) : halftoneNearest(index, src2, dst);
+        taps[i] = [[Math.max(0, Math.min(src2 - 1, k)), 1]];
+      }
+    };
+    nearest(cols, SW, W, flipX);
+    nearest(rows, SH, H, flipY);
+  } else if (mixed && !nativeMixed) {
     const linear = (taps, src2, dst, reverse) => {
       if (dst <= src2) return;
       for (let i = 0; i < dst; i++) {
@@ -30653,10 +30683,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     linear(cols, SW, W, flipX);
     linear(rows, SH, H, flipY);
   }
-  const out = new Int32Array(W * H * 3);
-  for (let y = 0; y < H; y++) {
+  let out = nativeMixed ? new Float64Array(sampleW * sampleH * 3) : new Int32Array(W * H * 3);
+  for (let y = 0; y < sampleH; y++) {
     const ys = rows[y];
-    for (let x = 0; x < W; x++) {
+    for (let x = 0; x < sampleW; x++) {
       const xs = cols[x];
       let r = 0;
       let g = 0;
@@ -30672,16 +30702,51 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
           b += rect[i + 2] * w;
         }
       }
-      const o = (y * W + x) * 3;
-      out[o] = mixed ? Math.ceil(r / total - 0.5) : Math.floor((2 * r + total) / (2 * total));
-      out[o + 1] = mixed ? Math.ceil(g / total - 0.5) : Math.floor((2 * g + total) / (2 * total));
-      out[o + 2] = mixed ? Math.ceil(b / total - 0.5) : Math.floor((2 * b + total) / (2 * total));
+      const o = (y * sampleW + x) * 3;
+      const round = (value) => nativeMixed ? value / total : mixed ? Math.ceil(value / total - 0.5) : Math.floor((2 * value + total) / (2 * total));
+      out[o] = round(r);
+      out[o + 1] = round(g);
+      out[o + 2] = round(b);
     }
   }
   if (reducing) {
     halftoneSharpen(out, W, H);
   }
-  if (mixed) {
+  if (nativeMixed) {
+    const reduceHorizontal = W < SW;
+    for (const horizontal of [reduceHorizontal, !reduceHorizontal]) {
+      const source2 = out;
+      out = new Int32Array(source2.length);
+      const at = (x, y, c) => source2[(Math.max(0, Math.min(sampleH - 1, y)) * sampleW + Math.max(0, Math.min(sampleW - 1, x))) * 3 + c];
+      for (let y = 0; y < sampleH; y++) {
+        for (let x = 0; x < sampleW; x++) {
+          for (let c = 0; c < 3; c++) {
+            const v = at(x, y, c);
+            const sum = horizontal ? at(x - 1, y, c) + at(x + 1, y, c) : at(x, y - 1, c) + at(x, y + 1, c);
+            out[(y * sampleW + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + (2 * v - sum) / 4)));
+          }
+        }
+      }
+    }
+    const source = out;
+    out = new Int32Array(W * H * 3);
+    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);
+        }
+      }
+    }
+  }
+  if (mixed && !nativeMixed && !nearestMixed) {
     const source = out.slice();
     const at = (x, y, c) => source[(Math.max(0, Math.min(H - 1, y)) * W + Math.max(0, Math.min(W - 1, x))) * 3 + c];
     for (let y = 0; y < H; y++) {

package/dist/browser.mjs

@@ -30532,11 +30532,12 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (dstLen <= 0 || srcLen <= 0) {
     return taps;
   }
-  const at = (k) => reverse ? start + srcLen - 1 - k : start + k;
+  const at = (k) => start + k;
   if (dstLen >= srcLen) {
     for (let i = 0; i < dstLen; i++) {
       taps.push([[at(halftoneNearest(i, srcLen, dstLen)), 1]]);
     }
+    if (reverse) taps.reverse();
     return taps;
   }
   const step = Math.ceil(srcLen * FIX / dstLen);
@@ -30552,6 +30553,7 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
     }
     taps.push(run);
   }
+  if (reverse) taps.reverse();
   return taps;
 }
 var SPECKLE_OVERSHOOT = 4;
@@ -30567,8 +30569,22 @@ function halftoneDespeckle(px, w, h) {
       const right = x < w - 1 ? x + 1 : Math.max(0, x - 1);
       let hClip = 0;
       let vClip = 0;
+      let alternating = 0;
       for (let c = 0; c < 3; c++) {
         const v = at(x, y, c);
+        const axial = Math.max(
+          Math.abs(v - at(left, y, c)),
+          Math.abs(v - at(right, y, c)),
+          Math.abs(v - at(x, up, c)),
+          Math.abs(v - at(x, down, c))
+        );
+        const diagonal = Math.min(
+          Math.abs(v - at(left, up, c)),
+          Math.abs(v - at(right, up, c)),
+          Math.abs(v - at(left, down, c)),
+          Math.abs(v - at(right, down, c))
+        );
+        if (diagonal < axial) alternating++;
         if (over(6 * v - at(left, y, c) - at(right, y, c))) {
           hClip++;
         }
@@ -30576,7 +30592,7 @@ function halftoneDespeckle(px, w, h) {
           vClip++;
         }
       }
-      if (hClip < 2 || vClip < 2) {
+      if (hClip < 2 || vClip < 2 || alternating < 2) {
         continue;
       }
       for (let c = 0; c < 3; c++) {
@@ -30630,15 +30646,29 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const enlarging = W >= SW && H >= SH && (W > SW || H > SH);
   const reducing = W < SW && H < SH;
   const mixed = W > SW && H < SH || W < SW && H > SH;
-  if (enlarging && !directDib) {
+  const nearestMixed = mixed && (!adjust || adjustAfterSampling) && (W < SW && W * 2 > SW || H < SH && H * 2 > SH);
+  const nativeMixed = mixed && (!adjust || adjustAfterSampling) && Math.min(SW, W) >= 2 && Math.min(SH, H) >= 2 && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
+  if ((enlarging || nearestMixed) && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
   if (adjust && !adjustAfterSampling) {
     adjust(rect);
   }
-  const cols = halftoneAxis(0, SW, W, flipX);
-  const rows = halftoneAxis(0, SH, H, flipY);
-  if (mixed) {
+  const sampleW = nativeMixed ? Math.min(SW, W) : W;
+  const sampleH = nativeMixed ? Math.min(SH, H) : H;
+  const cols = halftoneAxis(0, SW, sampleW, flipX);
+  const rows = halftoneAxis(0, SH, sampleH, flipY);
+  if (nearestMixed) {
+    const nearest = (taps, src2, dst, reverse) => {
+      for (let i = 0; i < dst; i++) {
+        const index = reverse ? dst - 1 - i : i;
+        const k = dst < src2 ? Math.floor(((index + 1) * 2 * src2 - dst) / (2 * dst)) : halftoneNearest(index, src2, dst);
+        taps[i] = [[Math.max(0, Math.min(src2 - 1, k)), 1]];
+      }
+    };
+    nearest(cols, SW, W, flipX);
+    nearest(rows, SH, H, flipY);
+  } else if (mixed && !nativeMixed) {
     const linear = (taps, src2, dst, reverse) => {
       if (dst <= src2) return;
       for (let i = 0; i < dst; i++) {
@@ -30651,10 +30681,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     linear(cols, SW, W, flipX);
     linear(rows, SH, H, flipY);
   }
-  const out = new Int32Array(W * H * 3);
-  for (let y = 0; y < H; y++) {
+  let out = nativeMixed ? new Float64Array(sampleW * sampleH * 3) : new Int32Array(W * H * 3);
+  for (let y = 0; y < sampleH; y++) {
     const ys = rows[y];
-    for (let x = 0; x < W; x++) {
+    for (let x = 0; x < sampleW; x++) {
       const xs = cols[x];
       let r = 0;
       let g = 0;
@@ -30670,16 +30700,51 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
           b += rect[i + 2] * w;
         }
       }
-      const o = (y * W + x) * 3;
-      out[o] = mixed ? Math.ceil(r / total - 0.5) : Math.floor((2 * r + total) / (2 * total));
-      out[o + 1] = mixed ? Math.ceil(g / total - 0.5) : Math.floor((2 * g + total) / (2 * total));
-      out[o + 2] = mixed ? Math.ceil(b / total - 0.5) : Math.floor((2 * b + total) / (2 * total));
+      const o = (y * sampleW + x) * 3;
+      const round = (value) => nativeMixed ? value / total : mixed ? Math.ceil(value / total - 0.5) : Math.floor((2 * value + total) / (2 * total));
+      out[o] = round(r);
+      out[o + 1] = round(g);
+      out[o + 2] = round(b);
     }
   }
   if (reducing) {
     halftoneSharpen(out, W, H);
   }
-  if (mixed) {
+  if (nativeMixed) {
+    const reduceHorizontal = W < SW;
+    for (const horizontal of [reduceHorizontal, !reduceHorizontal]) {
+      const source2 = out;
+      out = new Int32Array(source2.length);
+      const at = (x, y, c) => source2[(Math.max(0, Math.min(sampleH - 1, y)) * sampleW + Math.max(0, Math.min(sampleW - 1, x))) * 3 + c];
+      for (let y = 0; y < sampleH; y++) {
+        for (let x = 0; x < sampleW; x++) {
+          for (let c = 0; c < 3; c++) {
+            const v = at(x, y, c);
+            const sum = horizontal ? at(x - 1, y, c) + at(x + 1, y, c) : at(x, y - 1, c) + at(x, y + 1, c);
+            out[(y * sampleW + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + (2 * v - sum) / 4)));
+          }
+        }
+      }
+    }
+    const source = out;
+    out = new Int32Array(W * H * 3);
+    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);
+        }
+      }
+    }
+  }
+  if (mixed && !nativeMixed && !nearestMixed) {
     const source = out.slice();
     const at = (x, y, c) => source[(Math.max(0, Math.min(H - 1, y)) * W + Math.max(0, Math.min(W - 1, x))) * 3 + c];
     for (let y = 0; y < H; y++) {

package/dist/index.js

@@ -30535,11 +30535,12 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (dstLen <= 0 || srcLen <= 0) {
     return taps;
   }
-  const at = (k) => reverse ? start + srcLen - 1 - k : start + k;
+  const at = (k) => start + k;
   if (dstLen >= srcLen) {
     for (let i = 0; i < dstLen; i++) {
       taps.push([[at(halftoneNearest(i, srcLen, dstLen)), 1]]);
     }
+    if (reverse) taps.reverse();
     return taps;
   }
   const step = Math.ceil(srcLen * FIX / dstLen);
@@ -30555,6 +30556,7 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
     }
     taps.push(run);
   }
+  if (reverse) taps.reverse();
   return taps;
 }
 var SPECKLE_OVERSHOOT = 4;
@@ -30570,8 +30572,22 @@ function halftoneDespeckle(px, w, h) {
       const right = x < w - 1 ? x + 1 : Math.max(0, x - 1);
       let hClip = 0;
       let vClip = 0;
+      let alternating = 0;
       for (let c = 0; c < 3; c++) {
         const v = at(x, y, c);
+        const axial = Math.max(
+          Math.abs(v - at(left, y, c)),
+          Math.abs(v - at(right, y, c)),
+          Math.abs(v - at(x, up, c)),
+          Math.abs(v - at(x, down, c))
+        );
+        const diagonal = Math.min(
+          Math.abs(v - at(left, up, c)),
+          Math.abs(v - at(right, up, c)),
+          Math.abs(v - at(left, down, c)),
+          Math.abs(v - at(right, down, c))
+        );
+        if (diagonal < axial) alternating++;
         if (over(6 * v - at(left, y, c) - at(right, y, c))) {
           hClip++;
         }
@@ -30579,7 +30595,7 @@ function halftoneDespeckle(px, w, h) {
           vClip++;
         }
       }
-      if (hClip < 2 || vClip < 2) {
+      if (hClip < 2 || vClip < 2 || alternating < 2) {
         continue;
       }
       for (let c = 0; c < 3; c++) {
@@ -30633,15 +30649,29 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const enlarging = W >= SW && H >= SH && (W > SW || H > SH);
   const reducing = W < SW && H < SH;
   const mixed = W > SW && H < SH || W < SW && H > SH;
-  if (enlarging && !directDib) {
+  const nearestMixed = mixed && (!adjust || adjustAfterSampling) && (W < SW && W * 2 > SW || H < SH && H * 2 > SH);
+  const nativeMixed = mixed && (!adjust || adjustAfterSampling) && Math.min(SW, W) >= 2 && Math.min(SH, H) >= 2 && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
+  if ((enlarging || nearestMixed) && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
   if (adjust && !adjustAfterSampling) {
     adjust(rect);
   }
-  const cols = halftoneAxis(0, SW, W, flipX);
-  const rows = halftoneAxis(0, SH, H, flipY);
-  if (mixed) {
+  const sampleW = nativeMixed ? Math.min(SW, W) : W;
+  const sampleH = nativeMixed ? Math.min(SH, H) : H;
+  const cols = halftoneAxis(0, SW, sampleW, flipX);
+  const rows = halftoneAxis(0, SH, sampleH, flipY);
+  if (nearestMixed) {
+    const nearest = (taps, src2, dst, reverse) => {
+      for (let i = 0; i < dst; i++) {
+        const index = reverse ? dst - 1 - i : i;
+        const k = dst < src2 ? Math.floor(((index + 1) * 2 * src2 - dst) / (2 * dst)) : halftoneNearest(index, src2, dst);
+        taps[i] = [[Math.max(0, Math.min(src2 - 1, k)), 1]];
+      }
+    };
+    nearest(cols, SW, W, flipX);
+    nearest(rows, SH, H, flipY);
+  } else if (mixed && !nativeMixed) {
     const linear = (taps, src2, dst, reverse) => {
       if (dst <= src2) return;
       for (let i = 0; i < dst; i++) {
@@ -30654,10 +30684,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     linear(cols, SW, W, flipX);
     linear(rows, SH, H, flipY);
   }
-  const out = new Int32Array(W * H * 3);
-  for (let y = 0; y < H; y++) {
+  let out = nativeMixed ? new Float64Array(sampleW * sampleH * 3) : new Int32Array(W * H * 3);
+  for (let y = 0; y < sampleH; y++) {
     const ys = rows[y];
-    for (let x = 0; x < W; x++) {
+    for (let x = 0; x < sampleW; x++) {
       const xs = cols[x];
       let r = 0;
       let g = 0;
@@ -30673,16 +30703,51 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
           b += rect[i + 2] * w;
         }
       }
-      const o = (y * W + x) * 3;
-      out[o] = mixed ? Math.ceil(r / total - 0.5) : Math.floor((2 * r + total) / (2 * total));
-      out[o + 1] = mixed ? Math.ceil(g / total - 0.5) : Math.floor((2 * g + total) / (2 * total));
-      out[o + 2] = mixed ? Math.ceil(b / total - 0.5) : Math.floor((2 * b + total) / (2 * total));
+      const o = (y * sampleW + x) * 3;
+      const round = (value) => nativeMixed ? value / total : mixed ? Math.ceil(value / total - 0.5) : Math.floor((2 * value + total) / (2 * total));
+      out[o] = round(r);
+      out[o + 1] = round(g);
+      out[o + 2] = round(b);
     }
   }
   if (reducing) {
     halftoneSharpen(out, W, H);
   }
-  if (mixed) {
+  if (nativeMixed) {
+    const reduceHorizontal = W < SW;
+    for (const horizontal of [reduceHorizontal, !reduceHorizontal]) {
+      const source2 = out;
+      out = new Int32Array(source2.length);
+      const at = (x, y, c) => source2[(Math.max(0, Math.min(sampleH - 1, y)) * sampleW + Math.max(0, Math.min(sampleW - 1, x))) * 3 + c];
+      for (let y = 0; y < sampleH; y++) {
+        for (let x = 0; x < sampleW; x++) {
+          for (let c = 0; c < 3; c++) {
+            const v = at(x, y, c);
+            const sum = horizontal ? at(x - 1, y, c) + at(x + 1, y, c) : at(x, y - 1, c) + at(x, y + 1, c);
+            out[(y * sampleW + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + (2 * v - sum) / 4)));
+          }
+        }
+      }
+    }
+    const source = out;
+    out = new Int32Array(W * H * 3);
+    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);
+        }
+      }
+    }
+  }
+  if (mixed && !nativeMixed && !nearestMixed) {
     const source = out.slice();
     const at = (x, y, c) => source[(Math.max(0, Math.min(H - 1, y)) * W + Math.max(0, Math.min(W - 1, x))) * 3 + c];
     for (let y = 0; y < H; y++) {

package/dist/index.mjs

@@ -30533,11 +30533,12 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (dstLen <= 0 || srcLen <= 0) {
     return taps;
   }
-  const at = (k) => reverse ? start + srcLen - 1 - k : start + k;
+  const at = (k) => start + k;
   if (dstLen >= srcLen) {
     for (let i = 0; i < dstLen; i++) {
       taps.push([[at(halftoneNearest(i, srcLen, dstLen)), 1]]);
     }
+    if (reverse) taps.reverse();
     return taps;
   }
   const step = Math.ceil(srcLen * FIX / dstLen);
@@ -30553,6 +30554,7 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
     }
     taps.push(run);
   }
+  if (reverse) taps.reverse();
   return taps;
 }
 var SPECKLE_OVERSHOOT = 4;
@@ -30568,8 +30570,22 @@ function halftoneDespeckle(px, w, h) {
       const right = x < w - 1 ? x + 1 : Math.max(0, x - 1);
       let hClip = 0;
       let vClip = 0;
+      let alternating = 0;
       for (let c = 0; c < 3; c++) {
         const v = at(x, y, c);
+        const axial = Math.max(
+          Math.abs(v - at(left, y, c)),
+          Math.abs(v - at(right, y, c)),
+          Math.abs(v - at(x, up, c)),
+          Math.abs(v - at(x, down, c))
+        );
+        const diagonal = Math.min(
+          Math.abs(v - at(left, up, c)),
+          Math.abs(v - at(right, up, c)),
+          Math.abs(v - at(left, down, c)),
+          Math.abs(v - at(right, down, c))
+        );
+        if (diagonal < axial) alternating++;
         if (over(6 * v - at(left, y, c) - at(right, y, c))) {
           hClip++;
         }
@@ -30577,7 +30593,7 @@ function halftoneDespeckle(px, w, h) {
           vClip++;
         }
       }
-      if (hClip < 2 || vClip < 2) {
+      if (hClip < 2 || vClip < 2 || alternating < 2) {
         continue;
       }
       for (let c = 0; c < 3; c++) {
@@ -30631,15 +30647,29 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const enlarging = W >= SW && H >= SH && (W > SW || H > SH);
   const reducing = W < SW && H < SH;
   const mixed = W > SW && H < SH || W < SW && H > SH;
-  if (enlarging && !directDib) {
+  const nearestMixed = mixed && (!adjust || adjustAfterSampling) && (W < SW && W * 2 > SW || H < SH && H * 2 > SH);
+  const nativeMixed = mixed && (!adjust || adjustAfterSampling) && Math.min(SW, W) >= 2 && Math.min(SH, H) >= 2 && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
+  if ((enlarging || nearestMixed) && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
   if (adjust && !adjustAfterSampling) {
     adjust(rect);
   }
-  const cols = halftoneAxis(0, SW, W, flipX);
-  const rows = halftoneAxis(0, SH, H, flipY);
-  if (mixed) {
+  const sampleW = nativeMixed ? Math.min(SW, W) : W;
+  const sampleH = nativeMixed ? Math.min(SH, H) : H;
+  const cols = halftoneAxis(0, SW, sampleW, flipX);
+  const rows = halftoneAxis(0, SH, sampleH, flipY);
+  if (nearestMixed) {
+    const nearest = (taps, src2, dst, reverse) => {
+      for (let i = 0; i < dst; i++) {
+        const index = reverse ? dst - 1 - i : i;
+        const k = dst < src2 ? Math.floor(((index + 1) * 2 * src2 - dst) / (2 * dst)) : halftoneNearest(index, src2, dst);
+        taps[i] = [[Math.max(0, Math.min(src2 - 1, k)), 1]];
+      }
+    };
+    nearest(cols, SW, W, flipX);
+    nearest(rows, SH, H, flipY);
+  } else if (mixed && !nativeMixed) {
     const linear = (taps, src2, dst, reverse) => {
       if (dst <= src2) return;
       for (let i = 0; i < dst; i++) {
@@ -30652,10 +30682,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     linear(cols, SW, W, flipX);
     linear(rows, SH, H, flipY);
   }
-  const out = new Int32Array(W * H * 3);
-  for (let y = 0; y < H; y++) {
+  let out = nativeMixed ? new Float64Array(sampleW * sampleH * 3) : new Int32Array(W * H * 3);
+  for (let y = 0; y < sampleH; y++) {
     const ys = rows[y];
-    for (let x = 0; x < W; x++) {
+    for (let x = 0; x < sampleW; x++) {
       const xs = cols[x];
       let r = 0;
       let g = 0;
@@ -30671,16 +30701,51 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
           b += rect[i + 2] * w;
         }
       }
-      const o = (y * W + x) * 3;
-      out[o] = mixed ? Math.ceil(r / total - 0.5) : Math.floor((2 * r + total) / (2 * total));
-      out[o + 1] = mixed ? Math.ceil(g / total - 0.5) : Math.floor((2 * g + total) / (2 * total));
-      out[o + 2] = mixed ? Math.ceil(b / total - 0.5) : Math.floor((2 * b + total) / (2 * total));
+      const o = (y * sampleW + x) * 3;
+      const round = (value) => nativeMixed ? value / total : mixed ? Math.ceil(value / total - 0.5) : Math.floor((2 * value + total) / (2 * total));
+      out[o] = round(r);
+      out[o + 1] = round(g);
+      out[o + 2] = round(b);
     }
   }
   if (reducing) {
     halftoneSharpen(out, W, H);
   }
-  if (mixed) {
+  if (nativeMixed) {
+    const reduceHorizontal = W < SW;
+    for (const horizontal of [reduceHorizontal, !reduceHorizontal]) {
+      const source2 = out;
+      out = new Int32Array(source2.length);
+      const at = (x, y, c) => source2[(Math.max(0, Math.min(sampleH - 1, y)) * sampleW + Math.max(0, Math.min(sampleW - 1, x))) * 3 + c];
+      for (let y = 0; y < sampleH; y++) {
+        for (let x = 0; x < sampleW; x++) {
+          for (let c = 0; c < 3; c++) {
+            const v = at(x, y, c);
+            const sum = horizontal ? at(x - 1, y, c) + at(x + 1, y, c) : at(x, y - 1, c) + at(x, y + 1, c);
+            out[(y * sampleW + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + (2 * v - sum) / 4)));
+          }
+        }
+      }
+    }
+    const source = out;
+    out = new Int32Array(W * H * 3);
+    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);
+        }
+      }
+    }
+  }
+  if (mixed && !nativeMixed && !nearestMixed) {
     const source = out.slice();
     const at = (x, y, c) => source[(Math.max(0, Math.min(H - 1, y)) * W + Math.max(0, Math.min(W - 1, x))) * 3 + c];
     for (let y = 0; y < H; y++) {

package/package.json

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