emf-converter 4.8.14 → 4.8.15

package/dist/browser.js

@@ -20434,7 +20434,7 @@ function axisFilter(kernel, scale, copy) {
       return { radius: 0.5, weight: (i, c) => Math.floor(c + 0.5) === i ? 1 : 0 };
   }
 }
-function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge = { wrap: void 0, clamp: null }) {
+function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge = { wrap: void 0, clamp: null }, integerBicubic = false) {
   const [outer0, outerW, inner0, innerW] = verticalFirst ? [iu0, wu, iv0, wv] : [iv0, wv, iu0, wu];
   const [oMin, oMax, iMin, iMax] = verticalFirst ? [box.x0, box.x1, box.y0, box.y1] : [box.y0, box.y1, box.x0, box.x1];
   let r = 0;
@@ -20475,11 +20475,17 @@ function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge
       }
       const alpha = px[s + 3];
       const wa = wi * alpha / 255;
-      lr += wa * px[s];
-      lg += wa * px[s + 1];
-      lb += wa * px[s + 2];
+      lr += integerBicubic ? wi * Math.round(alpha * px[s] / 255) : wa * px[s];
+      lg += integerBicubic ? wi * Math.round(alpha * px[s + 1] / 255) : wa * px[s + 1];
+      lb += integerBicubic ? wi * Math.round(alpha * px[s + 2] / 255) : wa * px[s + 2];
       la += wi * alpha;
     }
+    if (integerBicubic) {
+      lr = Math.trunc(lr);
+      lg = Math.trunc(lg);
+      lb = Math.trunc(lb);
+      la = Math.trunc(la);
+    }
     la = Math.min(255, Math.max(0, la));
     r += wo * Math.min(la, Math.max(0, lr));
     g += wo * Math.min(la, Math.max(0, lg));
@@ -20527,6 +20533,7 @@ function resampleImage(rgba, width, height, spec, surface) {
   let kernel = spec.kernel;
   const hq = kernel === "hq-bilinear" || kernel === "hq-bicubic";
   const axisAligned = m[1] === 0 && m[2] === 0;
+  const integerBicubic = kernel === "bicubic" && axisAligned;
   let farFade = false;
   let shiftX = 0;
   let shiftY = 0;
@@ -20608,12 +20615,17 @@ function resampleImage(rgba, width, height, spec, surface) {
     mirrorX: spec.wrap === "tile-flip-x" || spec.wrap === "tile-flip-xy",
     mirrorY: spec.wrap === "tile-flip-y" || spec.wrap === "tile-flip-xy"
   };
+  const bicubicDu = Math.round(inv2[0] * FIX16);
+  const bicubicDv = Math.round(inv2[1] * FIX16);
   for (let j = 0; j < h; j++) {
     const py = by0 + j + o;
+    let start = -1;
+    let su = 0;
+    let sv = 0;
     for (let i = 0; i < w; i++) {
       const px = bx0 + i + o;
-      const u = inv2[0] * (px - shiftX) + inv2[2] * (py - shiftY) + inv2[4];
-      const v = inv2[1] * (px - shiftX) + inv2[3] * (py - shiftY) + inv2[5];
+      let u = inv2[0] * (px - shiftX) + inv2[2] * (py - shiftY) + inv2[4];
+      let v = inv2[1] * (px - shiftX) + inv2[3] * (py - shiftY) + inv2[5];
       const cx = px + COVERAGE_NUDGE_X;
       const cy = py + COVERAGE_NUDGE_Y;
       const eu = inv2[0] * cx + inv2[2] * cy + inv2[4];
@@ -20621,6 +20633,15 @@ function resampleImage(rgba, width, height, spec, surface) {
       if (eu < spec.srcX || ev < spec.srcY || eu >= uMax || ev >= vMax) {
         continue;
       }
+      if (integerBicubic) {
+        if (start < 0) {
+          start = i;
+          su = Math.round(u * FIX16);
+          sv = Math.round(v * FIX16);
+        }
+        u = Math.floor((su + (i - start) * bicubicDu) / (FIX16 / 64)) / 64;
+        v = Math.floor((sv + (i - start) * bicubicDv) / (FIX16 / 64)) / 64;
+      }
       const box = { x0: 0, y0: 0, x1: width, y1: height };
       const sampleAt = (cu, cv) => {
         const iu0 = Math.ceil(cu - fu.radius);
@@ -20635,7 +20656,7 @@ function resampleImage(rgba, width, height, spec, surface) {
         for (let t = iv0; t <= iv1; t++) {
           wv.push(fv.weight(t, cv));
         }
-        return blendSeparable(rgba, width, box, iu0, wu, iv0, wv, kernel === "bicubic", edge);
+        return blendSeparable(rgba, width, box, iu0, wu, iv0, wv, kernel === "bicubic", edge, integerBicubic);
       };
       let [r, g, b, a] = sampleAt(u, v);
       if (farFade && !spec.wrap && a > 0) {
@@ -20653,6 +20674,13 @@ function resampleImage(rgba, width, height, spec, surface) {
       if (a <= 0) {
         continue;
       }
+      if (integerBicubic) {
+        r = Math.trunc(r);
+        g = Math.trunc(g);
+        b = Math.trunc(b);
+        a = Math.trunc(a);
+        if (a <= 0) continue;
+      }
       const alpha = Math.min(255, a);
       const dst = (j * w + i) * 4;
       out[dst] = Math.min(Math.max(0, r), alpha) * 255 / alpha;

package/dist/browser.mjs

@@ -20432,7 +20432,7 @@ function axisFilter(kernel, scale, copy) {
       return { radius: 0.5, weight: (i, c) => Math.floor(c + 0.5) === i ? 1 : 0 };
   }
 }
-function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge = { wrap: void 0, clamp: null }) {
+function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge = { wrap: void 0, clamp: null }, integerBicubic = false) {
   const [outer0, outerW, inner0, innerW] = verticalFirst ? [iu0, wu, iv0, wv] : [iv0, wv, iu0, wu];
   const [oMin, oMax, iMin, iMax] = verticalFirst ? [box.x0, box.x1, box.y0, box.y1] : [box.y0, box.y1, box.x0, box.x1];
   let r = 0;
@@ -20473,11 +20473,17 @@ function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge
       }
       const alpha = px[s + 3];
       const wa = wi * alpha / 255;
-      lr += wa * px[s];
-      lg += wa * px[s + 1];
-      lb += wa * px[s + 2];
+      lr += integerBicubic ? wi * Math.round(alpha * px[s] / 255) : wa * px[s];
+      lg += integerBicubic ? wi * Math.round(alpha * px[s + 1] / 255) : wa * px[s + 1];
+      lb += integerBicubic ? wi * Math.round(alpha * px[s + 2] / 255) : wa * px[s + 2];
       la += wi * alpha;
     }
+    if (integerBicubic) {
+      lr = Math.trunc(lr);
+      lg = Math.trunc(lg);
+      lb = Math.trunc(lb);
+      la = Math.trunc(la);
+    }
     la = Math.min(255, Math.max(0, la));
     r += wo * Math.min(la, Math.max(0, lr));
     g += wo * Math.min(la, Math.max(0, lg));
@@ -20525,6 +20531,7 @@ function resampleImage(rgba, width, height, spec, surface) {
   let kernel = spec.kernel;
   const hq = kernel === "hq-bilinear" || kernel === "hq-bicubic";
   const axisAligned = m[1] === 0 && m[2] === 0;
+  const integerBicubic = kernel === "bicubic" && axisAligned;
   let farFade = false;
   let shiftX = 0;
   let shiftY = 0;
@@ -20606,12 +20613,17 @@ function resampleImage(rgba, width, height, spec, surface) {
     mirrorX: spec.wrap === "tile-flip-x" || spec.wrap === "tile-flip-xy",
     mirrorY: spec.wrap === "tile-flip-y" || spec.wrap === "tile-flip-xy"
   };
+  const bicubicDu = Math.round(inv2[0] * FIX16);
+  const bicubicDv = Math.round(inv2[1] * FIX16);
   for (let j = 0; j < h; j++) {
     const py = by0 + j + o;
+    let start = -1;
+    let su = 0;
+    let sv = 0;
     for (let i = 0; i < w; i++) {
       const px = bx0 + i + o;
-      const u = inv2[0] * (px - shiftX) + inv2[2] * (py - shiftY) + inv2[4];
-      const v = inv2[1] * (px - shiftX) + inv2[3] * (py - shiftY) + inv2[5];
+      let u = inv2[0] * (px - shiftX) + inv2[2] * (py - shiftY) + inv2[4];
+      let v = inv2[1] * (px - shiftX) + inv2[3] * (py - shiftY) + inv2[5];
       const cx = px + COVERAGE_NUDGE_X;
       const cy = py + COVERAGE_NUDGE_Y;
       const eu = inv2[0] * cx + inv2[2] * cy + inv2[4];
@@ -20619,6 +20631,15 @@ function resampleImage(rgba, width, height, spec, surface) {
       if (eu < spec.srcX || ev < spec.srcY || eu >= uMax || ev >= vMax) {
         continue;
       }
+      if (integerBicubic) {
+        if (start < 0) {
+          start = i;
+          su = Math.round(u * FIX16);
+          sv = Math.round(v * FIX16);
+        }
+        u = Math.floor((su + (i - start) * bicubicDu) / (FIX16 / 64)) / 64;
+        v = Math.floor((sv + (i - start) * bicubicDv) / (FIX16 / 64)) / 64;
+      }
       const box = { x0: 0, y0: 0, x1: width, y1: height };
       const sampleAt = (cu, cv) => {
         const iu0 = Math.ceil(cu - fu.radius);
@@ -20633,7 +20654,7 @@ function resampleImage(rgba, width, height, spec, surface) {
         for (let t = iv0; t <= iv1; t++) {
           wv.push(fv.weight(t, cv));
         }
-        return blendSeparable(rgba, width, box, iu0, wu, iv0, wv, kernel === "bicubic", edge);
+        return blendSeparable(rgba, width, box, iu0, wu, iv0, wv, kernel === "bicubic", edge, integerBicubic);
       };
       let [r, g, b, a] = sampleAt(u, v);
       if (farFade && !spec.wrap && a > 0) {
@@ -20651,6 +20672,13 @@ function resampleImage(rgba, width, height, spec, surface) {
       if (a <= 0) {
         continue;
       }
+      if (integerBicubic) {
+        r = Math.trunc(r);
+        g = Math.trunc(g);
+        b = Math.trunc(b);
+        a = Math.trunc(a);
+        if (a <= 0) continue;
+      }
       const alpha = Math.min(255, a);
       const dst = (j * w + i) * 4;
       out[dst] = Math.min(Math.max(0, r), alpha) * 255 / alpha;

package/dist/index.js

@@ -20435,7 +20435,7 @@ function axisFilter(kernel, scale, copy) {
       return { radius: 0.5, weight: (i, c) => Math.floor(c + 0.5) === i ? 1 : 0 };
   }
 }
-function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge = { wrap: void 0, clamp: null }) {
+function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge = { wrap: void 0, clamp: null }, integerBicubic = false) {
   const [outer0, outerW, inner0, innerW] = verticalFirst ? [iu0, wu, iv0, wv] : [iv0, wv, iu0, wu];
   const [oMin, oMax, iMin, iMax] = verticalFirst ? [box.x0, box.x1, box.y0, box.y1] : [box.y0, box.y1, box.x0, box.x1];
   let r = 0;
@@ -20476,11 +20476,17 @@ function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge
       }
       const alpha = px[s + 3];
       const wa = wi * alpha / 255;
-      lr += wa * px[s];
-      lg += wa * px[s + 1];
-      lb += wa * px[s + 2];
+      lr += integerBicubic ? wi * Math.round(alpha * px[s] / 255) : wa * px[s];
+      lg += integerBicubic ? wi * Math.round(alpha * px[s + 1] / 255) : wa * px[s + 1];
+      lb += integerBicubic ? wi * Math.round(alpha * px[s + 2] / 255) : wa * px[s + 2];
       la += wi * alpha;
     }
+    if (integerBicubic) {
+      lr = Math.trunc(lr);
+      lg = Math.trunc(lg);
+      lb = Math.trunc(lb);
+      la = Math.trunc(la);
+    }
     la = Math.min(255, Math.max(0, la));
     r += wo * Math.min(la, Math.max(0, lr));
     g += wo * Math.min(la, Math.max(0, lg));
@@ -20528,6 +20534,7 @@ function resampleImage(rgba, width, height, spec, surface) {
   let kernel = spec.kernel;
   const hq = kernel === "hq-bilinear" || kernel === "hq-bicubic";
   const axisAligned = m[1] === 0 && m[2] === 0;
+  const integerBicubic = kernel === "bicubic" && axisAligned;
   let farFade = false;
   let shiftX = 0;
   let shiftY = 0;
@@ -20609,12 +20616,17 @@ function resampleImage(rgba, width, height, spec, surface) {
     mirrorX: spec.wrap === "tile-flip-x" || spec.wrap === "tile-flip-xy",
     mirrorY: spec.wrap === "tile-flip-y" || spec.wrap === "tile-flip-xy"
   };
+  const bicubicDu = Math.round(inv2[0] * FIX16);
+  const bicubicDv = Math.round(inv2[1] * FIX16);
   for (let j = 0; j < h; j++) {
     const py = by0 + j + o;
+    let start = -1;
+    let su = 0;
+    let sv = 0;
     for (let i = 0; i < w; i++) {
       const px = bx0 + i + o;
-      const u = inv2[0] * (px - shiftX) + inv2[2] * (py - shiftY) + inv2[4];
-      const v = inv2[1] * (px - shiftX) + inv2[3] * (py - shiftY) + inv2[5];
+      let u = inv2[0] * (px - shiftX) + inv2[2] * (py - shiftY) + inv2[4];
+      let v = inv2[1] * (px - shiftX) + inv2[3] * (py - shiftY) + inv2[5];
       const cx = px + COVERAGE_NUDGE_X;
       const cy = py + COVERAGE_NUDGE_Y;
       const eu = inv2[0] * cx + inv2[2] * cy + inv2[4];
@@ -20622,6 +20634,15 @@ function resampleImage(rgba, width, height, spec, surface) {
       if (eu < spec.srcX || ev < spec.srcY || eu >= uMax || ev >= vMax) {
         continue;
       }
+      if (integerBicubic) {
+        if (start < 0) {
+          start = i;
+          su = Math.round(u * FIX16);
+          sv = Math.round(v * FIX16);
+        }
+        u = Math.floor((su + (i - start) * bicubicDu) / (FIX16 / 64)) / 64;
+        v = Math.floor((sv + (i - start) * bicubicDv) / (FIX16 / 64)) / 64;
+      }
       const box = { x0: 0, y0: 0, x1: width, y1: height };
       const sampleAt = (cu, cv) => {
         const iu0 = Math.ceil(cu - fu.radius);
@@ -20636,7 +20657,7 @@ function resampleImage(rgba, width, height, spec, surface) {
         for (let t = iv0; t <= iv1; t++) {
           wv.push(fv.weight(t, cv));
         }
-        return blendSeparable(rgba, width, box, iu0, wu, iv0, wv, kernel === "bicubic", edge);
+        return blendSeparable(rgba, width, box, iu0, wu, iv0, wv, kernel === "bicubic", edge, integerBicubic);
       };
       let [r, g, b, a] = sampleAt(u, v);
       if (farFade && !spec.wrap && a > 0) {
@@ -20654,6 +20675,13 @@ function resampleImage(rgba, width, height, spec, surface) {
       if (a <= 0) {
         continue;
       }
+      if (integerBicubic) {
+        r = Math.trunc(r);
+        g = Math.trunc(g);
+        b = Math.trunc(b);
+        a = Math.trunc(a);
+        if (a <= 0) continue;
+      }
       const alpha = Math.min(255, a);
       const dst = (j * w + i) * 4;
       out[dst] = Math.min(Math.max(0, r), alpha) * 255 / alpha;

package/dist/index.mjs

@@ -20433,7 +20433,7 @@ function axisFilter(kernel, scale, copy) {
       return { radius: 0.5, weight: (i, c) => Math.floor(c + 0.5) === i ? 1 : 0 };
   }
 }
-function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge = { wrap: void 0, clamp: null }) {
+function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge = { wrap: void 0, clamp: null }, integerBicubic = false) {
   const [outer0, outerW, inner0, innerW] = verticalFirst ? [iu0, wu, iv0, wv] : [iv0, wv, iu0, wu];
   const [oMin, oMax, iMin, iMax] = verticalFirst ? [box.x0, box.x1, box.y0, box.y1] : [box.y0, box.y1, box.x0, box.x1];
   let r = 0;
@@ -20474,11 +20474,17 @@ function blendSeparable(rgba, width, box, iu0, wu, iv0, wv, verticalFirst, edge
       }
       const alpha = px[s + 3];
       const wa = wi * alpha / 255;
-      lr += wa * px[s];
-      lg += wa * px[s + 1];
-      lb += wa * px[s + 2];
+      lr += integerBicubic ? wi * Math.round(alpha * px[s] / 255) : wa * px[s];
+      lg += integerBicubic ? wi * Math.round(alpha * px[s + 1] / 255) : wa * px[s + 1];
+      lb += integerBicubic ? wi * Math.round(alpha * px[s + 2] / 255) : wa * px[s + 2];
       la += wi * alpha;
     }
+    if (integerBicubic) {
+      lr = Math.trunc(lr);
+      lg = Math.trunc(lg);
+      lb = Math.trunc(lb);
+      la = Math.trunc(la);
+    }
     la = Math.min(255, Math.max(0, la));
     r += wo * Math.min(la, Math.max(0, lr));
     g += wo * Math.min(la, Math.max(0, lg));
@@ -20526,6 +20532,7 @@ function resampleImage(rgba, width, height, spec, surface) {
   let kernel = spec.kernel;
   const hq = kernel === "hq-bilinear" || kernel === "hq-bicubic";
   const axisAligned = m[1] === 0 && m[2] === 0;
+  const integerBicubic = kernel === "bicubic" && axisAligned;
   let farFade = false;
   let shiftX = 0;
   let shiftY = 0;
@@ -20607,12 +20614,17 @@ function resampleImage(rgba, width, height, spec, surface) {
     mirrorX: spec.wrap === "tile-flip-x" || spec.wrap === "tile-flip-xy",
     mirrorY: spec.wrap === "tile-flip-y" || spec.wrap === "tile-flip-xy"
   };
+  const bicubicDu = Math.round(inv2[0] * FIX16);
+  const bicubicDv = Math.round(inv2[1] * FIX16);
   for (let j = 0; j < h; j++) {
     const py = by0 + j + o;
+    let start = -1;
+    let su = 0;
+    let sv = 0;
     for (let i = 0; i < w; i++) {
       const px = bx0 + i + o;
-      const u = inv2[0] * (px - shiftX) + inv2[2] * (py - shiftY) + inv2[4];
-      const v = inv2[1] * (px - shiftX) + inv2[3] * (py - shiftY) + inv2[5];
+      let u = inv2[0] * (px - shiftX) + inv2[2] * (py - shiftY) + inv2[4];
+      let v = inv2[1] * (px - shiftX) + inv2[3] * (py - shiftY) + inv2[5];
       const cx = px + COVERAGE_NUDGE_X;
       const cy = py + COVERAGE_NUDGE_Y;
       const eu = inv2[0] * cx + inv2[2] * cy + inv2[4];
@@ -20620,6 +20632,15 @@ function resampleImage(rgba, width, height, spec, surface) {
       if (eu < spec.srcX || ev < spec.srcY || eu >= uMax || ev >= vMax) {
         continue;
       }
+      if (integerBicubic) {
+        if (start < 0) {
+          start = i;
+          su = Math.round(u * FIX16);
+          sv = Math.round(v * FIX16);
+        }
+        u = Math.floor((su + (i - start) * bicubicDu) / (FIX16 / 64)) / 64;
+        v = Math.floor((sv + (i - start) * bicubicDv) / (FIX16 / 64)) / 64;
+      }
       const box = { x0: 0, y0: 0, x1: width, y1: height };
       const sampleAt = (cu, cv) => {
         const iu0 = Math.ceil(cu - fu.radius);
@@ -20634,7 +20655,7 @@ function resampleImage(rgba, width, height, spec, surface) {
         for (let t = iv0; t <= iv1; t++) {
           wv.push(fv.weight(t, cv));
         }
-        return blendSeparable(rgba, width, box, iu0, wu, iv0, wv, kernel === "bicubic", edge);
+        return blendSeparable(rgba, width, box, iu0, wu, iv0, wv, kernel === "bicubic", edge, integerBicubic);
       };
       let [r, g, b, a] = sampleAt(u, v);
       if (farFade && !spec.wrap && a > 0) {
@@ -20652,6 +20673,13 @@ function resampleImage(rgba, width, height, spec, surface) {
       if (a <= 0) {
         continue;
       }
+      if (integerBicubic) {
+        r = Math.trunc(r);
+        g = Math.trunc(g);
+        b = Math.trunc(b);
+        a = Math.trunc(a);
+        if (a <= 0) continue;
+      }
       const alpha = Math.min(255, a);
       const dst = (j * w + i) * 4;
       out[dst] = Math.min(Math.max(0, r), alpha) * 255 / alpha;

package/package.json

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