emf-converter 4.4.2 → 4.4.3

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) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10997,7 +10997,9 @@ function roundRectCorners(l, t, r, b, cw, ch) {
   const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = 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 ? Math.round(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 [
@@ -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);
   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 }
   };
 }
@@ -37572,7 +37602,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, true),
     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) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10995,7 +10995,9 @@ function roundRectCorners(l, t, r, b, cw, ch) {
   const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = 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 ? Math.round(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 [
@@ -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);
   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 }
   };
 }
@@ -37570,7 +37600,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, true),
     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) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10998,7 +10998,9 @@ function roundRectCorners(l, t, r, b, cw, ch) {
   const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = 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 ? Math.round(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 [
@@ -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);
   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 }
   };
 }
@@ -37573,7 +37603,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, true),
     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) {
   const w = r - l;
   const h = b - t;
   let ew = Math.min(Math.abs(cw), w);
@@ -10996,7 +10996,9 @@ function roundRectCorners(l, t, r, b, cw, ch) {
   const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = 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 ? Math.round(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 [
@@ -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);
   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 }
   };
 }
@@ -37571,7 +37601,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, true),
     roundPen: true,
     fill: true,
     stroke: true

package/package.json

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