emf-converter 4.8.6 → 4.8.8

package/dist/index.mjs

@@ -27797,10 +27797,10 @@ function parseEmfHeader(view) {
   };
 }
 function getRenderableEmfBounds(header) {
-  const boundsW = header.bounds.right - header.bounds.left;
-  const boundsH = header.bounds.bottom - header.bounds.top;
+  const boundsW = header.bounds.right - header.bounds.left + 1;
+  const boundsH = header.bounds.bottom - header.bounds.top + 1;
   if (boundsW > 0 && boundsH > 0) {
-    return header.bounds;
+    return { ...header.bounds, right: header.bounds.right + 1, bottom: header.bounds.bottom + 1 };
   }
   if (header.frameW > 0 && header.frameH > 0) {
     emfLog(
@@ -30832,6 +30832,13 @@ function insetFixBox(box, inset) {
   }
   return framed;
 }
+function sameEllipseRay(l, t, r, b, sx, sy, ex, ey) {
+  const ax = BigInt(2 * sx - l - r);
+  const ay = BigInt(2 * sy - t - b);
+  const bx = BigInt(2 * ex - l - r);
+  const by = BigInt(2 * ey - t - b);
+  return ax * by === ay * bx && ax * bx + ay * by > 0n;
+}
 function handleSetPixelV(rCtx, dataOff, recSize) {
   const { ctx, view } = rCtx;
   if (recSize >= 20) {
@@ -31189,7 +31196,9 @@ function handleArcFamily(rCtx, recType, dataOff, recSize) {
     const rx = Math.abs(r - l) / 2;
     const ry = Math.abs(b - t) / 2;
     const startAngle = Math.atan2((startY - cyA) / (ry || 1), (startX - cxA) / (rx || 1));
-    const endAngle = Math.atan2((endY - cyA) / (ry || 1), (endX - cxA) / (rx || 1));
+    const clockwise = state.arcDirection === 2;
+    const fullEllipse = recType !== EMR_PIE && rx > 0 && ry > 0 && sameEllipseRay(l, t, r, b, startX, startY, endX, endY);
+    const endAngle = fullEllipse ? startAngle + (clockwise ? 2 : -2) * Math.PI : Math.atan2((endY - cyA) / (ry || 1), (endX - cxA) / (rx || 1));
     const rotated = hasWorldRotation(rCtx);
     const unframed = fixBox(rCtx, l, t, r, b);
     const inset = insideFrameInset(rCtx, unframed);
@@ -31203,13 +31212,18 @@ function handleArcFamily(rCtx, recType, dataOff, recSize) {
     };
     const isArcTo = recType === EMR_ARCTO;
     const needsFill = recType === EMR_PIE || recType === EMR_CHORD;
-    const clockwise = state.arcDirection === 2;
     const startPoint = rotated ? gmapPoint(rCtx, cxA + rx * Math.cos(startAngle), cyA + ry * Math.sin(startAngle)) : { x: params.cx + params.rx * Math.cos(startAngle), y: params.cy + params.ry * Math.sin(startAngle) };
     const build = (c) => {
       if (recType === EMR_PIE) {
         c.moveTo(params.cx, params.cy);
+      } else if (!isArcTo && inPath) {
+        c.moveTo(startPoint.x, startPoint.y);
       }
       if (isArcTo) {
+        if (!inPath) {
+          const from = currentFix(rCtx);
+          c.moveTo(from[0] / 16, from[1] / 16);
+        }
         c.lineTo(startPoint.x, startPoint.y);
       }
       c.ellipse(params.cx, params.cy, params.rx, params.ry, params.rotation, startAngle, endAngle, !clockwise);
@@ -31229,7 +31243,9 @@ function handleArcFamily(rCtx, recType, dataOff, recSize) {
     const rasterArgs = (immediate = false) => ({
       box: inset ? framed : immediate && needsFill ? curvedFixBox(rCtx, l, t, r, b) : unframed,
       s: radialOnBox(fixPoint(rCtx, startX, startY)),
-      e: radialOnBox(fixPoint(rCtx, endX, endY)),
+      // Device FIX rounding can separate distinct radial points on the
+      // same logical ray. Preserve their proven endpoint identity.
+      e: fullEllipse ? radialOnBox(fixPoint(rCtx, startX, startY)) : radialOnBox(fixPoint(rCtx, endX, endY)),
       from: currentFix(rCtx)
     });
     if (inPath) {
@@ -31817,40 +31833,121 @@ function halftoneReduceTaps(srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
-var ENLARGE_KERNEL = [
-  0.7598,
-  0.7276,
-  0.6829,
-  0.6528,
-  0.6106,
-  0.5745,
-  0.5362,
-  0.4955,
-  0.457,
-  0.4121,
-  0.3762,
-  0.3233,
-  0.2741,
-  0.226,
-  0.1822,
-  0.1412,
-  0.1021,
-  0.0685,
-  0.0382,
-  0.0138,
+var ENLARGE_INNER = [
+  1e3,
+  992.47,
+  984.9399,
+  977.4099,
+  969.8798,
+  962.3498,
+  954.8198,
+  947.2897,
+  939.7597,
+  932.2296,
+  924.6996,
+  917.1695,
+  909.6395,
+  902.1095,
+  894.5665,
+  886.8087,
+  879.045,
+  871.2813,
+  863.4349,
+  855.5885,
+  847.7421,
+  839.8269,
+  831.9046,
+  823.912,
+  815.9193,
+  807.9266,
+  799.847,
+  791.7283,
+  783.6096,
+  775.449,
+  767.3204,
+  758.9233,
+  750.5263,
+  742.4271,
+  734.0547,
+  725.6823,
+  717.232,
+  708.7675,
+  700.2393,
+  691.7111,
+  683.0734,
+  674.4357,
+  665.7105,
+  656.9854,
+  648.2603,
+  639.3747,
+  630.4873,
+  621.5157,
+  612.5442
+];
+var ENLARGE_OUTER = [
+  375.1388,
+  364.2093,
+  353.2797,
+  342.4714,
+  331.7615,
+  321.1462,
+  310.6456,
+  300.2252,
+  289.9229,
+  279.7227,
+  269.6439,
+  259.6535,
+  249.7825,
+  240.0362,
+  230.3856,
+  220.8799,
+  211.4594,
+  202.1844,
+  192.9996,
+  183.9679,
+  175.1064,
+  166.2864,
+  157.6436,
+  149.1447,
+  140.7609,
+  132.5474,
+  124.4802,
+  116.5636,
+  108.778,
+  101.1602,
+  93.7098,
+  86.4419,
+  79.3251,
+  72.4091,
+  65.6853,
+  59.1472,
+  52.812,
+  46.6978,
+  40.8001,
+  35.1449,
+  29.7494,
+  24.6096,
+  19.7977,
+  15.2801,
+  11.1442,
+  7.3916,
+  4.1415,
+  1.4039,
   0
 ];
-var ENLARGE_BOX = 0.2429;
-var ENLARGE_STEP = 0.05;
+var ENLARGE_HALF = 500.0106;
+var ENLARGE_KNOTS = 96;
 function enlargeKernel(u) {
-  const edge = u / ENLARGE_STEP;
-  const i = Math.floor(edge);
-  const smooth = i >= ENLARGE_KERNEL.length - 1 ? 0 : ENLARGE_KERNEL[i] + (ENLARGE_KERNEL[i + 1] - ENLARGE_KERNEL[i]) * (edge - i);
-  return smooth + ENLARGE_BOX * (Math.abs(u - 0.5) < 1e-9 ? 0.5 : u < 0.5 ? 1 : 0);
+  if (u >= 1) return 0;
+  if (Math.abs(u - 0.5) < 1e-9) return ENLARGE_HALF;
+  const table = u < 0.5 ? ENLARGE_INNER : ENLARGE_OUTER;
+  const edge = u * ENLARGE_KNOTS - (u < 0.5 ? 0 : ENLARGE_KNOTS / 2);
+  const i = Math.min(table.length - 2, Math.floor(edge + 1e-9));
+  return table[i] + (table[i + 1] - table[i]) * (edge - i);
 }
 function halftoneEnlargeTaps(src, dst) {
   const ratio = dst / src;
-  const reach = Math.ceil((ENLARGE_KERNEL.length - 1) * ENLARGE_STEP * ratio);
+  const reach = Math.ceil(ratio) - 1;
   const fir = [];
   let total = 0;
   for (let k = 0; k <= reach; k++) {
@@ -31879,7 +31976,17 @@ function halftoneEnlargeTaps(src, dst) {
         weights.set(j, (weights.get(j) ?? 0) + w * v);
       }
     }
-    taps.push([...weights.entries()]);
+    const sorted = [...weights.entries()].sort((a, b) => a[0] - b[0]);
+    let prev = 0;
+    let cum = 0;
+    const row2 = [];
+    for (let i = 0; i < sorted.length; i++) {
+      cum += sorted[i][1] * 8192;
+      const c = i === sorted.length - 1 ? 8192 : Math.ceil(cum - 1e-7);
+      row2.push([sorted[i][0], (c - prev) / 8192]);
+      prev = c;
+    }
+    taps.push(row2);
   }
   return taps;
 }
@@ -32096,8 +32203,10 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const sampleW = nativeMixed ? Math.min(SW, W) : W;
   const sampleH = nativeMixed ? Math.min(SH, H) : H;
   const axis = nativeMixed ? (n, d, r) => halftoneReduceTaps(n, d, r) : (n, d, r) => halftoneAxis(0, n, d, r);
-  const cols = axis(SW, sampleW, flipX);
-  const rows = axis(SH, sampleH, flipY);
+  const enlargeX = nativeMixed && W > SW;
+  const enlargeY = nativeMixed && H > SH;
+  const cols = axis(SW, sampleW, flipX && !enlargeX);
+  const rows = axis(SH, sampleH, flipY && !enlargeY);
   if (nearestMixed) {
     const nearest = (taps, src2, dst, reverse) => {
       for (let i = 0; i < dst; i++) {
@@ -32206,6 +32315,8 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
       return halftoneEnlargeTaps(src2, dst);
     };
     const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
+    if (enlargeX && flipX) xt.reverse();
+    if (enlargeY && flipY) yt.reverse();
     for (let y = 0; y < H; y++) {
       for (let x = 0; x < W; x++) {
         for (let c = 0; c < 3; c++) {
@@ -35600,14 +35711,20 @@ function handleEmfObjectRecord(rCtx, recType, dataOff, recSize) {
 }
 
 // src/emf-gdi-transform-handlers.ts
+function extentsSettable(rCtx) {
+  return rCtx.mapMode === 7 || rCtx.mapMode === 8;
+}
 function handleCoordinateRecord(rCtx, recType, dataOff, recSize) {
   const { view } = rCtx;
   switch (recType) {
     case EMR_SETWINDOWEXTEX: {
-      if (recSize >= 16) {
-        rCtx.windowExt.cx = view.getInt32(dataOff, true);
-        rCtx.windowExt.cy = view.getInt32(dataOff + 4, true);
-        activateGdiMappingMode(rCtx);
+      if (recSize >= 16 && extentsSettable(rCtx)) {
+        const cx = view.getInt32(dataOff, true);
+        const cy = view.getInt32(dataOff + 4, true);
+        if (cx !== 0 && cy !== 0) {
+          rCtx.windowExt = { cx, cy };
+          activateGdiMappingMode(rCtx);
+        }
       }
       return true;
     }
@@ -35620,10 +35737,13 @@ function handleCoordinateRecord(rCtx, recType, dataOff, recSize) {
       return true;
     }
     case EMR_SETVIEWPORTEXTEX: {
-      if (recSize >= 16) {
-        rCtx.viewportExt.cx = view.getInt32(dataOff, true);
-        rCtx.viewportExt.cy = view.getInt32(dataOff + 4, true);
-        activateGdiMappingMode(rCtx);
+      if (recSize >= 16 && extentsSettable(rCtx)) {
+        const cx = view.getInt32(dataOff, true);
+        const cy = view.getInt32(dataOff + 4, true);
+        if (cx !== 0 && cy !== 0) {
+          rCtx.viewportExt = { cx, cy };
+          activateGdiMappingMode(rCtx);
+        }
       }
       return true;
     }
@@ -35638,14 +35758,21 @@ function handleCoordinateRecord(rCtx, recType, dataOff, recSize) {
     case EMR_SETMAPMODE: {
       if (recSize >= 12) {
         const mode = view.getUint32(dataOff, true);
-        if (mode === 8 || mode === 7) {
-          activateGdiMappingMode(rCtx);
+        if (mode >= 1 && mode <= 8) {
+          rCtx.mapMode = mode;
+          if (mode === 1) {
+            rCtx.windowExt = { cx: 1, cy: 1 };
+            rCtx.viewportExt = { cx: 1, cy: 1 };
+          }
+          if (mode === 1 || mode === 8 || mode === 7) {
+            activateGdiMappingMode(rCtx);
+          }
         }
       }
       return true;
     }
     case EMR_SCALEVIEWPORTEXTEX: {
-      if (recSize >= 24) {
+      if (recSize >= 24 && extentsSettable(rCtx)) {
         const xNum = view.getInt32(dataOff, true);
         const xDenom = view.getInt32(dataOff + 4, true);
         const yNum = view.getInt32(dataOff + 8, true);
@@ -35661,7 +35788,7 @@ function handleCoordinateRecord(rCtx, recType, dataOff, recSize) {
       return true;
     }
     case EMR_SCALEWINDOWEXTEX: {
-      if (recSize >= 24) {
+      if (recSize >= 24 && extentsSettable(rCtx)) {
         const xNum = view.getInt32(dataOff, true);
         const xDenom = view.getInt32(dataOff + 4, true);
         const yNum = view.getInt32(dataOff + 8, true);
@@ -35812,6 +35939,15 @@ function handleEmfGdiStateRecord(rCtx, recType, _offset, dataOff, recSize) {
       }
       rCtx.clipStack ?? (rCtx.clipStack = []);
       rCtx.clipStack.push({ region: rCtx.clipRegion ?? null });
+      rCtx.mappingStack ?? (rCtx.mappingStack = []);
+      rCtx.mappingStack.push({
+        mapMode: rCtx.mapMode,
+        windowOrg: { ...rCtx.windowOrg },
+        windowExt: { ...rCtx.windowExt },
+        viewportOrg: { ...rCtx.viewportOrg },
+        viewportExt: { ...rCtx.viewportExt },
+        useMappingMode: rCtx.useMappingMode
+      });
       rCtx.stateStack.push(cloneState(state));
       ctx.save();
       if (rCtx.clipRegion) {
@@ -35821,23 +35957,31 @@ function handleEmfGdiStateRecord(rCtx, recType, _offset, dataOff, recSize) {
     }
     case EMR_RESTOREDC: {
       if (recSize >= 12) {
-        while (rCtx.clipSaveDepth > 0) {
-          ctx.restore();
-          rCtx.clipSaveDepth--;
-        }
         let rel = view.getInt32(dataOff, true);
         if (rel < 0) {
           rel = rCtx.stateStack.length + rel + 1;
         }
-        while (rCtx.stateStack.length > rel && rCtx.stateStack.length > 0) {
+        if (rel < 1 || rel > rCtx.stateStack.length) {
+          return true;
+        }
+        while (rCtx.clipSaveDepth > 0) {
+          ctx.restore();
+          rCtx.clipSaveDepth--;
+        }
+        while (rCtx.stateStack.length > rel) {
           rCtx.stateStack.pop();
           rCtx.clipStack?.pop();
+          rCtx.mappingStack?.pop();
           ctx.restore();
         }
         const restored = rCtx.stateStack.pop();
         if (restored) {
           const clipSnapshot = rCtx.clipStack?.pop();
+          const mappingSnapshot = rCtx.mappingStack?.pop();
           Object.assign(state, restored);
+          if (mappingSnapshot) {
+            Object.assign(rCtx, mappingSnapshot);
+          }
           ctx.restore();
           rCtx.clipRegion = clipSnapshot?.region ?? null;
           if (rCtx.clipRegion) {
@@ -37936,9 +38080,11 @@ function replayEmfRecords(view, ctx, bounds, canvasW, canvasH, dpiScale = 1, rep
     // canvas like every other device coordinate (bounds' top-left to the
     // canvas origin, scaled by sx/sy); see `deviceToCanvas`.
     windowOrg: { x: 0, y: 0 },
-    windowExt: { cx: logicalW, cy: logicalH },
+    windowExt: { cx: 1, cy: 1 },
     viewportOrg: { x: 0, y: 0 },
-    viewportExt: { cx: logicalW, cy: logicalH },
+    viewportExt: { cx: 1, cy: 1 },
+    mapMode: 1,
+    // MM_TEXT: the default DC uses one-to-one page/device units.
     useMappingMode: false,
     deviceToCanvas: true,
     clipSaveDepth: 0,
@@ -38190,18 +38336,18 @@ function setMapMode(m, mode) {
   }
   m.mode = mode;
 }
-function extentsSettable(m) {
+function extentsSettable2(m) {
   return m.mode === MM_ISOTROPIC || m.mode === MM_ANISOTROPIC;
 }
 function setWindowExt(m, cx, cy) {
-  if (!extentsSettable(m) || cx === 0 || cy === 0) {
+  if (!extentsSettable2(m) || cx === 0 || cy === 0) {
     return;
   }
   m.winExt = { cx, cy };
   fixIsotropic(m);
 }
 function setViewportExt(m, cx, cy) {
-  if (!extentsSettable(m) || cx === 0 || cy === 0) {
+  if (!extentsSettable2(m) || cx === 0 || cy === 0) {
     return;
   }
   m.vpExt = { cx, cy };
@@ -38211,7 +38357,7 @@ function scaled(v, num, den) {
   return Math.trunc(v * num / den);
 }
 function scaleWindowExt(m, xNum, xDen, yNum, yDen) {
-  if (!extentsSettable(m) || !xDen || !yDen) {
+  if (!extentsSettable2(m) || !xDen || !yDen) {
     return;
   }
   const cx = scaled(m.winExt.cx, xNum, xDen);
@@ -38223,7 +38369,7 @@ function scaleWindowExt(m, xNum, xDen, yNum, yDen) {
   fixIsotropic(m);
 }
 function scaleViewportExt(m, xNum, xDen, yNum, yDen) {
-  if (!extentsSettable(m) || !xDen || !yDen) {
+  if (!extentsSettable2(m) || !xDen || !yDen) {
     return;
   }
   const cx = scaled(m.vpExt.cx, xNum, xDen);

package/package.json

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