emf-converter 4.4.2 → 4.4.4

package/dist/browser.js

@@ -10985,7 +10985,7 @@ function flattenBezierPath(pts) {
   }
   return out;
 }
-function roundRectCorners(l, t, r, b, cw, ch) {
+function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = false) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10994,10 +10994,12 @@ function roundRectCorners(l, t, r, b, cw, ch) {
     ew = 0;
     eh = 0;
   }
-  const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
-  const topX = Math.floor(r - ew / 2);
+  const hy = compatible ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
+  const topX = compatible ? Math.round(r - ew / 2) : Math.floor(r - ew / 2);
   const hx = r - topX;
-  const q = [r, t + hy, r, t + hy - Math.floor(KAPPA * hy), r - hx + Math.ceil(KAPPA * hx), t, topX, t];
+  const verticalControl = compatible && clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const horizontalControl = Math.ceil(KAPPA * hx);
+  const q = [r, t + hy, r, t + hy - verticalControl, r - hx + horizontalControl, t, topX, t];
   const mx = (x) => l + r - x;
   const my = (y) => t + b - y;
   return [
@@ -15698,10 +15700,9 @@ function blurKernel(radius) {
     k[0] = 1;
     return k;
   }
-  const sigma = radius / 1.98;
   let sum = 0;
   for (let i = -taps; i <= taps; i++) {
-    const w = Math.exp(-(i * i) / (2 * sigma * sigma));
+    const w = Math.exp(-1.96 * i * i / (radius * radius));
     k[i + taps] = w;
     sum += w;
   }
@@ -15722,6 +15723,8 @@ function mirror(p, n) {
 function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
+  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15731,7 +15734,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
       let s2 = 0;
       let s3 = 0;
       for (let j = -taps; j <= taps; j++) {
-        const p = row + mirror(x + j, w) * 4;
+        const p = row + horizontalIndex(x + j) * 4;
         const kw = k[j + taps];
         s0 += kw * src[p];
         s1 += kw * src[p + 1];
@@ -15739,38 +15742,37 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
         s3 += kw * src[p + 3];
       }
       const o = row + x * 4;
-      out[o] = s0;
-      out[o + 1] = s1;
-      out[o + 2] = s2;
-      out[o + 3] = s3;
+      out[o] = Math.round(s0);
+      out[o + 1] = Math.round(s1);
+      out[o + 2] = Math.round(s2);
+      out[o + 3] = Math.round(s3);
     }
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
-    const col = new Float64Array(w * 4);
-    for (let j = -taps; j <= taps; j++) {
-      const yy = vRow + j;
-      if (vZeroAbove && yy < vRow) {
-        continue;
-      }
-      const base = mirror(yy, h) * w * 4;
-      for (let i = 0; i < w * 4; i++) {
-        col[i] += k[j + taps] * out[base + i];
+    const horizontal = out.slice();
+    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    for (let row = vRow; row < endRow; row++) {
+      const col = new Float64Array(w * 4);
+      for (let j = -taps; j <= taps; j++) {
+        const yy = row + j;
+        if (vZeroAbove && yy < vRow) {
+          continue;
+        }
+        const base = verticalIndex(yy) * w * 4;
+        for (let i = 0; i < w * 4; i++) {
+          col[i] += k[j + taps] * horizontal[base + i];
+        }
       }
+      out.set(col, row * w * 4);
     }
-    out.set(col, vRow * w * 4);
   }
   return out;
 }
 function applyBlur(src, w, h, radius) {
   return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
 }
-var SHARPEN_FALLOFF = Math.log2(96 / 25);
-function sharpenGain(radius, amount) {
-  const x = amount / 100;
-  if (radius <= 3) {
-    return x * 2 * radius / 3;
-  }
-  return x * 2 * (3 / radius) ** SHARPEN_FALLOFF;
+function sharpenGain(_radius, amount) {
+  return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
   const blurred = gdipBlur(src, w, h, radius);
@@ -28497,9 +28499,9 @@ function boxFrame(box) {
   const h = Math.round(Math.hypot(box.eyx, box.eyy));
   return { l: 0, t: 0, r: w, b: h };
 }
-function roundRectDeviceBeziers(box, cw, ch, clockwise = false) {
+function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = false) {
   const f = boxFrame(box);
-  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch);
+  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible, clockwise);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
@@ -28507,9 +28509,9 @@ function roundRectDeviceBeziers(box, cw, ch, clockwise = false) {
   }
   return pts;
 }
-function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false) {
+function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false, compatible = false) {
   if (rectangle) return rectRasterPath(box, clockwise);
-  const pts = roundRectDeviceBeziers(box, cw, ch, clockwise);
+  const pts = roundRectDeviceBeziers(box, cw, ch, clockwise, compatible);
   const path = new GdiRasterPath();
   for (let c = 0; c < 4; c++) {
     const o = c * 8;
@@ -30087,6 +30089,9 @@ function handleEmfGdiShapeRecord(rCtx, recType, dataOff, recSize) {
 var CA_NEGATIVE = 1;
 var CA_LOG_FILTER = 2;
 var COLOR_ADJUSTMENT_SIZE = 24;
+function isChannelOnlyColorAdjustment(ca) {
+  return !!ca && (ca.flags & ~CA_LOG_FILTER) === 0 && (ca.illuminant === 0 || ca.illuminant === 6) && ca.referenceBlack === 0 && ca.referenceWhite === 1e4 && ca.contrast === 0 && ca.brightness === 0 && ca.colorfulness === 0 && ca.redGreenTint === 0;
+}
 function readColorAdjustment(view, off) {
   const ca = {
     flags: view.getUint16(off + 2, true),
@@ -30142,6 +30147,19 @@ function fromLightness(l) {
 }
 var clamp012 = (v) => v < 0 ? 0 : v > 1 ? 1 : v;
 function colorAdjustmentMapper(ca) {
+  if (ca.referenceBlack === 0 && ca.referenceWhite === 1e4 && ca.contrast === 0 && ca.brightness === 0 && ca.colorfulness === 0 && ca.redGreenTint === 0) {
+    const tables = [ca.redGamma, ca.greenGamma, ca.blueGamma].map((gamma) => {
+      const table = new Uint8Array(256);
+      for (let i = 0; i < 256; i++) {
+        const input = (ca.flags & CA_NEGATIVE) !== 0 ? 255 - i : i;
+        let value = (input / 255) ** (gamma / 1e4);
+        if ((ca.flags & CA_LOG_FILTER) !== 0) value = Math.log2(1 + 7 * value) / 3;
+        table[i] = Math.round(value * 255);
+      }
+      return table;
+    });
+    return (rgb2) => tables[0][rgb2 >> 16 & 255] << 16 | tables[1][rgb2 >> 8 & 255] << 8 | tables[2][rgb2 & 255];
+  }
   const black = ca.referenceBlack / 1e4;
   const span = Math.max(1e-6, ca.referenceWhite / 1e4 - black);
   const gammas = [ca.redGamma / 1e4, ca.greenGamma / 1e4, ca.blueGamma / 1e4];
@@ -30165,7 +30183,7 @@ function colorAdjustmentMapper(ca) {
   const out = (v, c) => {
     v = clamp012(fromLightness(slope * lightness(clamp012(v)) + offset)) ** (1 / gammas[c]);
     if (log) {
-      v = Math.log10(1 + 9 * v);
+      v = Math.log2(1 + 7 * v) / 3;
     }
     return Math.round(v * 255);
   };
@@ -30389,7 +30407,7 @@ function halftoneSharpen(px, w, h) {
     }
   }
 }
-function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
+function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSampling = false, directDib = false) {
   const W = Math.max(0, Math.round(Math.abs(dw)));
   const H = Math.max(0, Math.round(Math.abs(dh)));
   const SW = Math.round(Math.abs(sw));
@@ -30420,10 +30438,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
   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) {
+  if (enlarging && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
-  if (adjust) {
+  if (adjust && !adjustAfterSampling) {
     adjust(rect);
   }
   const cols = halftoneAxis(0, SW, W, flipX);
@@ -30482,6 +30500,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
       }
     }
   }
+  if (adjust && adjustAfterSampling) adjust(out);
   for (let i = 0, o = 0; i < W * H; i++, o += 3) {
     data[i * 4] = out[o];
     data[i * 4 + 1] = out[o + 1];
@@ -30513,7 +30532,18 @@ function patternOperand(rCtx, brush) {
 function drawSourceMapped(target, decoded, req, offsetX, offsetY, mode) {
   const dLeft = Math.min(req.dx, req.dx + req.dw) - offsetX;
   const dTop = Math.min(req.dy, req.dy + req.dh) - offsetY;
-  const px = mode === HALFTONE ? stretchHalftone(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, decoded.adjust) : stretchGdi(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, mode);
+  const px = mode === HALFTONE ? stretchHalftone(
+    decoded.pixels,
+    req.sx,
+    req.sy,
+    req.sw,
+    req.sh,
+    req.dw,
+    req.dh,
+    decoded.adjust,
+    decoded.adjustAfterSampling,
+    req.dibOrigin === "bottom-left"
+  ) : stretchGdi(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, mode);
   if (px.width === 0 || px.height === 0) {
     return;
   }
@@ -30548,7 +30578,7 @@ function decodeSource(rCtx, req) {
     sy = image.height - sy - req.sh;
   }
   return {
-    decoded: { pixels: image, adjust },
+    decoded: { pixels: image, adjust, adjustAfterSampling: isChannelOnlyColorAdjustment(ca) },
     req: { ...req, sy }
   };
 }
@@ -37531,12 +37561,16 @@ function wmfRectangle(p, l, t, r, b) {
     axisRect: { interior: rectInterior(p, box) }
   });
 }
-function compatCorner(p, w, h) {
+function compatCorner(p, w, h, box) {
   const m = gdiDeviceMatrix(p.rCtx);
   const cw = Math.round(Math.abs(w * m[0]) * 16);
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];
+  }
   if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
     return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
   }
@@ -37547,7 +37581,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const [cw, ch] = compatCorner(p, w, h);
+  const [cw, ch] = compatCorner(p, w, h, box);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -37572,7 +37606,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, !penIsNull(p) && penIsCosmetic(p.rCtx)),
     roundPen: true,
     fill: true,
     stroke: true

package/dist/browser.mjs

@@ -10983,7 +10983,7 @@ function flattenBezierPath(pts) {
   }
   return out;
 }
-function roundRectCorners(l, t, r, b, cw, ch) {
+function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = false) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10992,10 +10992,12 @@ function roundRectCorners(l, t, r, b, cw, ch) {
     ew = 0;
     eh = 0;
   }
-  const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
-  const topX = Math.floor(r - ew / 2);
+  const hy = compatible ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
+  const topX = compatible ? Math.round(r - ew / 2) : Math.floor(r - ew / 2);
   const hx = r - topX;
-  const q = [r, t + hy, r, t + hy - Math.floor(KAPPA * hy), r - hx + Math.ceil(KAPPA * hx), t, topX, t];
+  const verticalControl = compatible && clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const horizontalControl = Math.ceil(KAPPA * hx);
+  const q = [r, t + hy, r, t + hy - verticalControl, r - hx + horizontalControl, t, topX, t];
   const mx = (x) => l + r - x;
   const my = (y) => t + b - y;
   return [
@@ -15696,10 +15698,9 @@ function blurKernel(radius) {
     k[0] = 1;
     return k;
   }
-  const sigma = radius / 1.98;
   let sum = 0;
   for (let i = -taps; i <= taps; i++) {
-    const w = Math.exp(-(i * i) / (2 * sigma * sigma));
+    const w = Math.exp(-1.96 * i * i / (radius * radius));
     k[i + taps] = w;
     sum += w;
   }
@@ -15720,6 +15721,8 @@ function mirror(p, n) {
 function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
+  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15729,7 +15732,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
       let s2 = 0;
       let s3 = 0;
       for (let j = -taps; j <= taps; j++) {
-        const p = row + mirror(x + j, w) * 4;
+        const p = row + horizontalIndex(x + j) * 4;
         const kw = k[j + taps];
         s0 += kw * src[p];
         s1 += kw * src[p + 1];
@@ -15737,38 +15740,37 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
         s3 += kw * src[p + 3];
       }
       const o = row + x * 4;
-      out[o] = s0;
-      out[o + 1] = s1;
-      out[o + 2] = s2;
-      out[o + 3] = s3;
+      out[o] = Math.round(s0);
+      out[o + 1] = Math.round(s1);
+      out[o + 2] = Math.round(s2);
+      out[o + 3] = Math.round(s3);
     }
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
-    const col = new Float64Array(w * 4);
-    for (let j = -taps; j <= taps; j++) {
-      const yy = vRow + j;
-      if (vZeroAbove && yy < vRow) {
-        continue;
-      }
-      const base = mirror(yy, h) * w * 4;
-      for (let i = 0; i < w * 4; i++) {
-        col[i] += k[j + taps] * out[base + i];
+    const horizontal = out.slice();
+    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    for (let row = vRow; row < endRow; row++) {
+      const col = new Float64Array(w * 4);
+      for (let j = -taps; j <= taps; j++) {
+        const yy = row + j;
+        if (vZeroAbove && yy < vRow) {
+          continue;
+        }
+        const base = verticalIndex(yy) * w * 4;
+        for (let i = 0; i < w * 4; i++) {
+          col[i] += k[j + taps] * horizontal[base + i];
+        }
       }
+      out.set(col, row * w * 4);
     }
-    out.set(col, vRow * w * 4);
   }
   return out;
 }
 function applyBlur(src, w, h, radius) {
   return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
 }
-var SHARPEN_FALLOFF = Math.log2(96 / 25);
-function sharpenGain(radius, amount) {
-  const x = amount / 100;
-  if (radius <= 3) {
-    return x * 2 * radius / 3;
-  }
-  return x * 2 * (3 / radius) ** SHARPEN_FALLOFF;
+function sharpenGain(_radius, amount) {
+  return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
   const blurred = gdipBlur(src, w, h, radius);
@@ -28495,9 +28497,9 @@ function boxFrame(box) {
   const h = Math.round(Math.hypot(box.eyx, box.eyy));
   return { l: 0, t: 0, r: w, b: h };
 }
-function roundRectDeviceBeziers(box, cw, ch, clockwise = false) {
+function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = false) {
   const f = boxFrame(box);
-  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch);
+  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible, clockwise);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
@@ -28505,9 +28507,9 @@ function roundRectDeviceBeziers(box, cw, ch, clockwise = false) {
   }
   return pts;
 }
-function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false) {
+function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false, compatible = false) {
   if (rectangle) return rectRasterPath(box, clockwise);
-  const pts = roundRectDeviceBeziers(box, cw, ch, clockwise);
+  const pts = roundRectDeviceBeziers(box, cw, ch, clockwise, compatible);
   const path = new GdiRasterPath();
   for (let c = 0; c < 4; c++) {
     const o = c * 8;
@@ -30085,6 +30087,9 @@ function handleEmfGdiShapeRecord(rCtx, recType, dataOff, recSize) {
 var CA_NEGATIVE = 1;
 var CA_LOG_FILTER = 2;
 var COLOR_ADJUSTMENT_SIZE = 24;
+function isChannelOnlyColorAdjustment(ca) {
+  return !!ca && (ca.flags & ~CA_LOG_FILTER) === 0 && (ca.illuminant === 0 || ca.illuminant === 6) && ca.referenceBlack === 0 && ca.referenceWhite === 1e4 && ca.contrast === 0 && ca.brightness === 0 && ca.colorfulness === 0 && ca.redGreenTint === 0;
+}
 function readColorAdjustment(view, off) {
   const ca = {
     flags: view.getUint16(off + 2, true),
@@ -30140,6 +30145,19 @@ function fromLightness(l) {
 }
 var clamp012 = (v) => v < 0 ? 0 : v > 1 ? 1 : v;
 function colorAdjustmentMapper(ca) {
+  if (ca.referenceBlack === 0 && ca.referenceWhite === 1e4 && ca.contrast === 0 && ca.brightness === 0 && ca.colorfulness === 0 && ca.redGreenTint === 0) {
+    const tables = [ca.redGamma, ca.greenGamma, ca.blueGamma].map((gamma) => {
+      const table = new Uint8Array(256);
+      for (let i = 0; i < 256; i++) {
+        const input = (ca.flags & CA_NEGATIVE) !== 0 ? 255 - i : i;
+        let value = (input / 255) ** (gamma / 1e4);
+        if ((ca.flags & CA_LOG_FILTER) !== 0) value = Math.log2(1 + 7 * value) / 3;
+        table[i] = Math.round(value * 255);
+      }
+      return table;
+    });
+    return (rgb2) => tables[0][rgb2 >> 16 & 255] << 16 | tables[1][rgb2 >> 8 & 255] << 8 | tables[2][rgb2 & 255];
+  }
   const black = ca.referenceBlack / 1e4;
   const span = Math.max(1e-6, ca.referenceWhite / 1e4 - black);
   const gammas = [ca.redGamma / 1e4, ca.greenGamma / 1e4, ca.blueGamma / 1e4];
@@ -30163,7 +30181,7 @@ function colorAdjustmentMapper(ca) {
   const out = (v, c) => {
     v = clamp012(fromLightness(slope * lightness(clamp012(v)) + offset)) ** (1 / gammas[c]);
     if (log) {
-      v = Math.log10(1 + 9 * v);
+      v = Math.log2(1 + 7 * v) / 3;
     }
     return Math.round(v * 255);
   };
@@ -30387,7 +30405,7 @@ function halftoneSharpen(px, w, h) {
     }
   }
 }
-function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
+function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSampling = false, directDib = false) {
   const W = Math.max(0, Math.round(Math.abs(dw)));
   const H = Math.max(0, Math.round(Math.abs(dh)));
   const SW = Math.round(Math.abs(sw));
@@ -30418,10 +30436,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
   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) {
+  if (enlarging && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
-  if (adjust) {
+  if (adjust && !adjustAfterSampling) {
     adjust(rect);
   }
   const cols = halftoneAxis(0, SW, W, flipX);
@@ -30480,6 +30498,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
       }
     }
   }
+  if (adjust && adjustAfterSampling) adjust(out);
   for (let i = 0, o = 0; i < W * H; i++, o += 3) {
     data[i * 4] = out[o];
     data[i * 4 + 1] = out[o + 1];
@@ -30511,7 +30530,18 @@ function patternOperand(rCtx, brush) {
 function drawSourceMapped(target, decoded, req, offsetX, offsetY, mode) {
   const dLeft = Math.min(req.dx, req.dx + req.dw) - offsetX;
   const dTop = Math.min(req.dy, req.dy + req.dh) - offsetY;
-  const px = mode === HALFTONE ? stretchHalftone(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, decoded.adjust) : stretchGdi(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, mode);
+  const px = mode === HALFTONE ? stretchHalftone(
+    decoded.pixels,
+    req.sx,
+    req.sy,
+    req.sw,
+    req.sh,
+    req.dw,
+    req.dh,
+    decoded.adjust,
+    decoded.adjustAfterSampling,
+    req.dibOrigin === "bottom-left"
+  ) : stretchGdi(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, mode);
   if (px.width === 0 || px.height === 0) {
     return;
   }
@@ -30546,7 +30576,7 @@ function decodeSource(rCtx, req) {
     sy = image.height - sy - req.sh;
   }
   return {
-    decoded: { pixels: image, adjust },
+    decoded: { pixels: image, adjust, adjustAfterSampling: isChannelOnlyColorAdjustment(ca) },
     req: { ...req, sy }
   };
 }
@@ -37529,12 +37559,16 @@ function wmfRectangle(p, l, t, r, b) {
     axisRect: { interior: rectInterior(p, box) }
   });
 }
-function compatCorner(p, w, h) {
+function compatCorner(p, w, h, box) {
   const m = gdiDeviceMatrix(p.rCtx);
   const cw = Math.round(Math.abs(w * m[0]) * 16);
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];
+  }
   if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
     return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
   }
@@ -37545,7 +37579,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const [cw, ch] = compatCorner(p, w, h);
+  const [cw, ch] = compatCorner(p, w, h, box);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -37570,7 +37604,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, !penIsNull(p) && penIsCosmetic(p.rCtx)),
     roundPen: true,
     fill: true,
     stroke: true

package/dist/index.js

@@ -10986,7 +10986,7 @@ function flattenBezierPath(pts) {
   }
   return out;
 }
-function roundRectCorners(l, t, r, b, cw, ch) {
+function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = false) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10995,10 +10995,12 @@ function roundRectCorners(l, t, r, b, cw, ch) {
     ew = 0;
     eh = 0;
   }
-  const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
-  const topX = Math.floor(r - ew / 2);
+  const hy = compatible ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
+  const topX = compatible ? Math.round(r - ew / 2) : Math.floor(r - ew / 2);
   const hx = r - topX;
-  const q = [r, t + hy, r, t + hy - Math.floor(KAPPA * hy), r - hx + Math.ceil(KAPPA * hx), t, topX, t];
+  const verticalControl = compatible && clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const horizontalControl = Math.ceil(KAPPA * hx);
+  const q = [r, t + hy, r, t + hy - verticalControl, r - hx + horizontalControl, t, topX, t];
   const mx = (x) => l + r - x;
   const my = (y) => t + b - y;
   return [
@@ -15699,10 +15701,9 @@ function blurKernel(radius) {
     k[0] = 1;
     return k;
   }
-  const sigma = radius / 1.98;
   let sum = 0;
   for (let i = -taps; i <= taps; i++) {
-    const w = Math.exp(-(i * i) / (2 * sigma * sigma));
+    const w = Math.exp(-1.96 * i * i / (radius * radius));
     k[i + taps] = w;
     sum += w;
   }
@@ -15723,6 +15724,8 @@ function mirror(p, n) {
 function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
+  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15732,7 +15735,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
       let s2 = 0;
       let s3 = 0;
       for (let j = -taps; j <= taps; j++) {
-        const p = row + mirror(x + j, w) * 4;
+        const p = row + horizontalIndex(x + j) * 4;
         const kw = k[j + taps];
         s0 += kw * src[p];
         s1 += kw * src[p + 1];
@@ -15740,38 +15743,37 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
         s3 += kw * src[p + 3];
       }
       const o = row + x * 4;
-      out[o] = s0;
-      out[o + 1] = s1;
-      out[o + 2] = s2;
-      out[o + 3] = s3;
+      out[o] = Math.round(s0);
+      out[o + 1] = Math.round(s1);
+      out[o + 2] = Math.round(s2);
+      out[o + 3] = Math.round(s3);
     }
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
-    const col = new Float64Array(w * 4);
-    for (let j = -taps; j <= taps; j++) {
-      const yy = vRow + j;
-      if (vZeroAbove && yy < vRow) {
-        continue;
-      }
-      const base = mirror(yy, h) * w * 4;
-      for (let i = 0; i < w * 4; i++) {
-        col[i] += k[j + taps] * out[base + i];
+    const horizontal = out.slice();
+    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    for (let row = vRow; row < endRow; row++) {
+      const col = new Float64Array(w * 4);
+      for (let j = -taps; j <= taps; j++) {
+        const yy = row + j;
+        if (vZeroAbove && yy < vRow) {
+          continue;
+        }
+        const base = verticalIndex(yy) * w * 4;
+        for (let i = 0; i < w * 4; i++) {
+          col[i] += k[j + taps] * horizontal[base + i];
+        }
       }
+      out.set(col, row * w * 4);
     }
-    out.set(col, vRow * w * 4);
   }
   return out;
 }
 function applyBlur(src, w, h, radius) {
   return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
 }
-var SHARPEN_FALLOFF = Math.log2(96 / 25);
-function sharpenGain(radius, amount) {
-  const x = amount / 100;
-  if (radius <= 3) {
-    return x * 2 * radius / 3;
-  }
-  return x * 2 * (3 / radius) ** SHARPEN_FALLOFF;
+function sharpenGain(_radius, amount) {
+  return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
   const blurred = gdipBlur(src, w, h, radius);
@@ -28498,9 +28500,9 @@ function boxFrame(box) {
   const h = Math.round(Math.hypot(box.eyx, box.eyy));
   return { l: 0, t: 0, r: w, b: h };
 }
-function roundRectDeviceBeziers(box, cw, ch, clockwise = false) {
+function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = false) {
   const f = boxFrame(box);
-  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch);
+  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible, clockwise);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
@@ -28508,9 +28510,9 @@ function roundRectDeviceBeziers(box, cw, ch, clockwise = false) {
   }
   return pts;
 }
-function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false) {
+function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false, compatible = false) {
   if (rectangle) return rectRasterPath(box, clockwise);
-  const pts = roundRectDeviceBeziers(box, cw, ch, clockwise);
+  const pts = roundRectDeviceBeziers(box, cw, ch, clockwise, compatible);
   const path = new GdiRasterPath();
   for (let c = 0; c < 4; c++) {
     const o = c * 8;
@@ -30088,6 +30090,9 @@ function handleEmfGdiShapeRecord(rCtx, recType, dataOff, recSize) {
 var CA_NEGATIVE = 1;
 var CA_LOG_FILTER = 2;
 var COLOR_ADJUSTMENT_SIZE = 24;
+function isChannelOnlyColorAdjustment(ca) {
+  return !!ca && (ca.flags & ~CA_LOG_FILTER) === 0 && (ca.illuminant === 0 || ca.illuminant === 6) && ca.referenceBlack === 0 && ca.referenceWhite === 1e4 && ca.contrast === 0 && ca.brightness === 0 && ca.colorfulness === 0 && ca.redGreenTint === 0;
+}
 function readColorAdjustment(view, off) {
   const ca = {
     flags: view.getUint16(off + 2, true),
@@ -30143,6 +30148,19 @@ function fromLightness(l) {
 }
 var clamp012 = (v) => v < 0 ? 0 : v > 1 ? 1 : v;
 function colorAdjustmentMapper(ca) {
+  if (ca.referenceBlack === 0 && ca.referenceWhite === 1e4 && ca.contrast === 0 && ca.brightness === 0 && ca.colorfulness === 0 && ca.redGreenTint === 0) {
+    const tables = [ca.redGamma, ca.greenGamma, ca.blueGamma].map((gamma) => {
+      const table = new Uint8Array(256);
+      for (let i = 0; i < 256; i++) {
+        const input = (ca.flags & CA_NEGATIVE) !== 0 ? 255 - i : i;
+        let value = (input / 255) ** (gamma / 1e4);
+        if ((ca.flags & CA_LOG_FILTER) !== 0) value = Math.log2(1 + 7 * value) / 3;
+        table[i] = Math.round(value * 255);
+      }
+      return table;
+    });
+    return (rgb2) => tables[0][rgb2 >> 16 & 255] << 16 | tables[1][rgb2 >> 8 & 255] << 8 | tables[2][rgb2 & 255];
+  }
   const black = ca.referenceBlack / 1e4;
   const span = Math.max(1e-6, ca.referenceWhite / 1e4 - black);
   const gammas = [ca.redGamma / 1e4, ca.greenGamma / 1e4, ca.blueGamma / 1e4];
@@ -30166,7 +30184,7 @@ function colorAdjustmentMapper(ca) {
   const out = (v, c) => {
     v = clamp012(fromLightness(slope * lightness(clamp012(v)) + offset)) ** (1 / gammas[c]);
     if (log) {
-      v = Math.log10(1 + 9 * v);
+      v = Math.log2(1 + 7 * v) / 3;
     }
     return Math.round(v * 255);
   };
@@ -30390,7 +30408,7 @@ function halftoneSharpen(px, w, h) {
     }
   }
 }
-function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
+function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSampling = false, directDib = false) {
   const W = Math.max(0, Math.round(Math.abs(dw)));
   const H = Math.max(0, Math.round(Math.abs(dh)));
   const SW = Math.round(Math.abs(sw));
@@ -30421,10 +30439,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
   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) {
+  if (enlarging && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
-  if (adjust) {
+  if (adjust && !adjustAfterSampling) {
     adjust(rect);
   }
   const cols = halftoneAxis(0, SW, W, flipX);
@@ -30483,6 +30501,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
       }
     }
   }
+  if (adjust && adjustAfterSampling) adjust(out);
   for (let i = 0, o = 0; i < W * H; i++, o += 3) {
     data[i * 4] = out[o];
     data[i * 4 + 1] = out[o + 1];
@@ -30514,7 +30533,18 @@ function patternOperand(rCtx, brush) {
 function drawSourceMapped(target, decoded, req, offsetX, offsetY, mode) {
   const dLeft = Math.min(req.dx, req.dx + req.dw) - offsetX;
   const dTop = Math.min(req.dy, req.dy + req.dh) - offsetY;
-  const px = mode === HALFTONE ? stretchHalftone(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, decoded.adjust) : stretchGdi(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, mode);
+  const px = mode === HALFTONE ? stretchHalftone(
+    decoded.pixels,
+    req.sx,
+    req.sy,
+    req.sw,
+    req.sh,
+    req.dw,
+    req.dh,
+    decoded.adjust,
+    decoded.adjustAfterSampling,
+    req.dibOrigin === "bottom-left"
+  ) : stretchGdi(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, mode);
   if (px.width === 0 || px.height === 0) {
     return;
   }
@@ -30549,7 +30579,7 @@ function decodeSource(rCtx, req) {
     sy = image.height - sy - req.sh;
   }
   return {
-    decoded: { pixels: image, adjust },
+    decoded: { pixels: image, adjust, adjustAfterSampling: isChannelOnlyColorAdjustment(ca) },
     req: { ...req, sy }
   };
 }
@@ -37532,12 +37562,16 @@ function wmfRectangle(p, l, t, r, b) {
     axisRect: { interior: rectInterior(p, box) }
   });
 }
-function compatCorner(p, w, h) {
+function compatCorner(p, w, h, box) {
   const m = gdiDeviceMatrix(p.rCtx);
   const cw = Math.round(Math.abs(w * m[0]) * 16);
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];
+  }
   if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
     return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
   }
@@ -37548,7 +37582,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const [cw, ch] = compatCorner(p, w, h);
+  const [cw, ch] = compatCorner(p, w, h, box);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -37573,7 +37607,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, !penIsNull(p) && penIsCosmetic(p.rCtx)),
     roundPen: true,
     fill: true,
     stroke: true

package/dist/index.mjs

@@ -10984,7 +10984,7 @@ function flattenBezierPath(pts) {
   }
   return out;
 }
-function roundRectCorners(l, t, r, b, cw, ch) {
+function roundRectCorners(l, t, r, b, cw, ch, compatible = false, clockwise = false) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10993,10 +10993,12 @@ function roundRectCorners(l, t, r, b, cw, ch) {
     ew = 0;
     eh = 0;
   }
-  const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
-  const topX = Math.floor(r - ew / 2);
+  const hy = compatible ? Math.round(eh / 2) : Math.floor(h / 2) - Math.floor((h - eh) / 2);
+  const topX = compatible ? Math.round(r - ew / 2) : Math.floor(r - ew / 2);
   const hx = r - topX;
-  const q = [r, t + hy, r, t + hy - Math.floor(KAPPA * hy), r - hx + Math.ceil(KAPPA * hx), t, topX, t];
+  const verticalControl = compatible && clockwise ? Math.ceil(KAPPA * hy) : Math.floor(KAPPA * hy);
+  const horizontalControl = Math.ceil(KAPPA * hx);
+  const q = [r, t + hy, r, t + hy - verticalControl, r - hx + horizontalControl, t, topX, t];
   const mx = (x) => l + r - x;
   const my = (y) => t + b - y;
   return [
@@ -15697,10 +15699,9 @@ function blurKernel(radius) {
     k[0] = 1;
     return k;
   }
-  const sigma = radius / 1.98;
   let sum = 0;
   for (let i = -taps; i <= taps; i++) {
-    const w = Math.exp(-(i * i) / (2 * sigma * sigma));
+    const w = Math.exp(-1.96 * i * i / (radius * radius));
     k[i + taps] = w;
     sum += w;
   }
@@ -15721,6 +15722,8 @@ function mirror(p, n) {
 function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
+  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15730,7 +15733,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
       let s2 = 0;
       let s3 = 0;
       for (let j = -taps; j <= taps; j++) {
-        const p = row + mirror(x + j, w) * 4;
+        const p = row + horizontalIndex(x + j) * 4;
         const kw = k[j + taps];
         s0 += kw * src[p];
         s1 += kw * src[p + 1];
@@ -15738,38 +15741,37 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
         s3 += kw * src[p + 3];
       }
       const o = row + x * 4;
-      out[o] = s0;
-      out[o + 1] = s1;
-      out[o + 2] = s2;
-      out[o + 3] = s3;
+      out[o] = Math.round(s0);
+      out[o + 1] = Math.round(s1);
+      out[o + 2] = Math.round(s2);
+      out[o + 3] = Math.round(s3);
     }
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
-    const col = new Float64Array(w * 4);
-    for (let j = -taps; j <= taps; j++) {
-      const yy = vRow + j;
-      if (vZeroAbove && yy < vRow) {
-        continue;
-      }
-      const base = mirror(yy, h) * w * 4;
-      for (let i = 0; i < w * 4; i++) {
-        col[i] += k[j + taps] * out[base + i];
+    const horizontal = out.slice();
+    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    for (let row = vRow; row < endRow; row++) {
+      const col = new Float64Array(w * 4);
+      for (let j = -taps; j <= taps; j++) {
+        const yy = row + j;
+        if (vZeroAbove && yy < vRow) {
+          continue;
+        }
+        const base = verticalIndex(yy) * w * 4;
+        for (let i = 0; i < w * 4; i++) {
+          col[i] += k[j + taps] * horizontal[base + i];
+        }
       }
+      out.set(col, row * w * 4);
     }
-    out.set(col, vRow * w * 4);
   }
   return out;
 }
 function applyBlur(src, w, h, radius) {
   return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
 }
-var SHARPEN_FALLOFF = Math.log2(96 / 25);
-function sharpenGain(radius, amount) {
-  const x = amount / 100;
-  if (radius <= 3) {
-    return x * 2 * radius / 3;
-  }
-  return x * 2 * (3 / radius) ** SHARPEN_FALLOFF;
+function sharpenGain(_radius, amount) {
+  return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
   const blurred = gdipBlur(src, w, h, radius);
@@ -28496,9 +28498,9 @@ function boxFrame(box) {
   const h = Math.round(Math.hypot(box.eyx, box.eyy));
   return { l: 0, t: 0, r: w, b: h };
 }
-function roundRectDeviceBeziers(box, cw, ch, clockwise = false) {
+function roundRectDeviceBeziers(box, cw, ch, clockwise = false, compatible = false) {
   const f = boxFrame(box);
-  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch);
+  const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch, compatible, clockwise);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
@@ -28506,9 +28508,9 @@ function roundRectDeviceBeziers(box, cw, ch, clockwise = false) {
   }
   return pts;
 }
-function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false) {
+function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false, compatible = false) {
   if (rectangle) return rectRasterPath(box, clockwise);
-  const pts = roundRectDeviceBeziers(box, cw, ch, clockwise);
+  const pts = roundRectDeviceBeziers(box, cw, ch, clockwise, compatible);
   const path = new GdiRasterPath();
   for (let c = 0; c < 4; c++) {
     const o = c * 8;
@@ -30086,6 +30088,9 @@ function handleEmfGdiShapeRecord(rCtx, recType, dataOff, recSize) {
 var CA_NEGATIVE = 1;
 var CA_LOG_FILTER = 2;
 var COLOR_ADJUSTMENT_SIZE = 24;
+function isChannelOnlyColorAdjustment(ca) {
+  return !!ca && (ca.flags & ~CA_LOG_FILTER) === 0 && (ca.illuminant === 0 || ca.illuminant === 6) && ca.referenceBlack === 0 && ca.referenceWhite === 1e4 && ca.contrast === 0 && ca.brightness === 0 && ca.colorfulness === 0 && ca.redGreenTint === 0;
+}
 function readColorAdjustment(view, off) {
   const ca = {
     flags: view.getUint16(off + 2, true),
@@ -30141,6 +30146,19 @@ function fromLightness(l) {
 }
 var clamp012 = (v) => v < 0 ? 0 : v > 1 ? 1 : v;
 function colorAdjustmentMapper(ca) {
+  if (ca.referenceBlack === 0 && ca.referenceWhite === 1e4 && ca.contrast === 0 && ca.brightness === 0 && ca.colorfulness === 0 && ca.redGreenTint === 0) {
+    const tables = [ca.redGamma, ca.greenGamma, ca.blueGamma].map((gamma) => {
+      const table = new Uint8Array(256);
+      for (let i = 0; i < 256; i++) {
+        const input = (ca.flags & CA_NEGATIVE) !== 0 ? 255 - i : i;
+        let value = (input / 255) ** (gamma / 1e4);
+        if ((ca.flags & CA_LOG_FILTER) !== 0) value = Math.log2(1 + 7 * value) / 3;
+        table[i] = Math.round(value * 255);
+      }
+      return table;
+    });
+    return (rgb2) => tables[0][rgb2 >> 16 & 255] << 16 | tables[1][rgb2 >> 8 & 255] << 8 | tables[2][rgb2 & 255];
+  }
   const black = ca.referenceBlack / 1e4;
   const span = Math.max(1e-6, ca.referenceWhite / 1e4 - black);
   const gammas = [ca.redGamma / 1e4, ca.greenGamma / 1e4, ca.blueGamma / 1e4];
@@ -30164,7 +30182,7 @@ function colorAdjustmentMapper(ca) {
   const out = (v, c) => {
     v = clamp012(fromLightness(slope * lightness(clamp012(v)) + offset)) ** (1 / gammas[c]);
     if (log) {
-      v = Math.log10(1 + 9 * v);
+      v = Math.log2(1 + 7 * v) / 3;
     }
     return Math.round(v * 255);
   };
@@ -30388,7 +30406,7 @@ function halftoneSharpen(px, w, h) {
     }
   }
 }
-function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
+function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSampling = false, directDib = false) {
   const W = Math.max(0, Math.round(Math.abs(dw)));
   const H = Math.max(0, Math.round(Math.abs(dh)));
   const SW = Math.round(Math.abs(sw));
@@ -30419,10 +30437,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
   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) {
+  if (enlarging && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
-  if (adjust) {
+  if (adjust && !adjustAfterSampling) {
     adjust(rect);
   }
   const cols = halftoneAxis(0, SW, W, flipX);
@@ -30481,6 +30499,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
       }
     }
   }
+  if (adjust && adjustAfterSampling) adjust(out);
   for (let i = 0, o = 0; i < W * H; i++, o += 3) {
     data[i * 4] = out[o];
     data[i * 4 + 1] = out[o + 1];
@@ -30512,7 +30531,18 @@ function patternOperand(rCtx, brush) {
 function drawSourceMapped(target, decoded, req, offsetX, offsetY, mode) {
   const dLeft = Math.min(req.dx, req.dx + req.dw) - offsetX;
   const dTop = Math.min(req.dy, req.dy + req.dh) - offsetY;
-  const px = mode === HALFTONE ? stretchHalftone(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, decoded.adjust) : stretchGdi(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, mode);
+  const px = mode === HALFTONE ? stretchHalftone(
+    decoded.pixels,
+    req.sx,
+    req.sy,
+    req.sw,
+    req.sh,
+    req.dw,
+    req.dh,
+    decoded.adjust,
+    decoded.adjustAfterSampling,
+    req.dibOrigin === "bottom-left"
+  ) : stretchGdi(decoded.pixels, req.sx, req.sy, req.sw, req.sh, req.dw, req.dh, mode);
   if (px.width === 0 || px.height === 0) {
     return;
   }
@@ -30547,7 +30577,7 @@ function decodeSource(rCtx, req) {
     sy = image.height - sy - req.sh;
   }
   return {
-    decoded: { pixels: image, adjust },
+    decoded: { pixels: image, adjust, adjustAfterSampling: isChannelOnlyColorAdjustment(ca) },
     req: { ...req, sy }
   };
 }
@@ -37530,12 +37560,16 @@ function wmfRectangle(p, l, t, r, b) {
     axisRect: { interior: rectInterior(p, box) }
   });
 }
-function compatCorner(p, w, h) {
+function compatCorner(p, w, h, box) {
   const m = gdiDeviceMatrix(p.rCtx);
   const cw = Math.round(Math.abs(w * m[0]) * 16);
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];
+  }
   if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
     return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
   }
@@ -37546,7 +37580,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const [cw, ch] = compatCorner(p, w, h);
+  const [cw, ch] = compatCorner(p, w, h, box);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -37571,7 +37605,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0, !penIsNull(p) && penIsCosmetic(p.rCtx)),
     roundPen: true,
     fill: true,
     stroke: true

package/package.json

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