emf-converter 4.18.0 → 4.18.1

package/dist/browser.js

@@ -29639,6 +29639,12 @@ function gdiDevicePixelX(r) {
 function gdiDevicePixelY(r) {
   return !r.useMappingMode || r.deviceToCanvas ? r.sy : 1;
 }
+function gdiDeviceToCanvasX(r, x) {
+  return !r.useMappingMode || r.deviceToCanvas ? (x - r.bounds.left) * r.sx : x;
+}
+function gdiDeviceToCanvasY(r, y) {
+  return !r.useMappingMode || r.deviceToCanvas ? (y - r.bounds.top) * r.sy : y;
+}
 function activateGdiMappingMode(r) {
   r.useMappingMode = true;
 }
@@ -37234,11 +37240,13 @@ function handleExtSelectClipRgn(rCtx, dataOff, recSize) {
     const top = view.getInt32(rOff + 4, true);
     const right = view.getInt32(rOff + 8, true);
     const bottom = view.getInt32(rOff + 12, true);
+    const x = gdiDeviceToCanvasX(rCtx, left);
+    const y = gdiDeviceToCanvasY(rCtx, top);
     rects.push({
-      x: gmx(rCtx, left),
-      y: gmy(rCtx, top),
-      w: gmw(rCtx, right - left),
-      h: gmh(rCtx, bottom - top)
+      x,
+      y,
+      w: gdiDeviceToCanvasX(rCtx, right) - x,
+      h: gdiDeviceToCanvasY(rCtx, bottom) - y
     });
   }
   if (rects.length === 0) {
@@ -37253,7 +37261,11 @@ function handleOffsetClipRgn(rCtx, dataOff, recSize) {
     const dx = rCtx.view.getInt32(dataOff, true);
     const dy = rCtx.view.getInt32(dataOff + 4, true);
     if (rCtx.clipRegion) {
-      rCtx.clipRegion = translateClipRegion(rCtx.clipRegion, gmw(rCtx, dx), gmh(rCtx, dy));
+      const px = gdiDevicePixelX(rCtx);
+      const py = gdiDevicePixelY(rCtx);
+      const ox = Math.round(gmw(rCtx, dx) / px) * px;
+      const oy = Math.round(gmh(rCtx, dy) / py) * py;
+      rCtx.clipRegion = translateClipRegion(rCtx.clipRegion, ox, oy);
       reapplyClipRegion(rCtx, rCtx.clipRegion);
     }
   }

package/dist/browser.mjs

@@ -29637,6 +29637,12 @@ function gdiDevicePixelX(r) {
 function gdiDevicePixelY(r) {
   return !r.useMappingMode || r.deviceToCanvas ? r.sy : 1;
 }
+function gdiDeviceToCanvasX(r, x) {
+  return !r.useMappingMode || r.deviceToCanvas ? (x - r.bounds.left) * r.sx : x;
+}
+function gdiDeviceToCanvasY(r, y) {
+  return !r.useMappingMode || r.deviceToCanvas ? (y - r.bounds.top) * r.sy : y;
+}
 function activateGdiMappingMode(r) {
   r.useMappingMode = true;
 }
@@ -37232,11 +37238,13 @@ function handleExtSelectClipRgn(rCtx, dataOff, recSize) {
     const top = view.getInt32(rOff + 4, true);
     const right = view.getInt32(rOff + 8, true);
     const bottom = view.getInt32(rOff + 12, true);
+    const x = gdiDeviceToCanvasX(rCtx, left);
+    const y = gdiDeviceToCanvasY(rCtx, top);
     rects.push({
-      x: gmx(rCtx, left),
-      y: gmy(rCtx, top),
-      w: gmw(rCtx, right - left),
-      h: gmh(rCtx, bottom - top)
+      x,
+      y,
+      w: gdiDeviceToCanvasX(rCtx, right) - x,
+      h: gdiDeviceToCanvasY(rCtx, bottom) - y
     });
   }
   if (rects.length === 0) {
@@ -37251,7 +37259,11 @@ function handleOffsetClipRgn(rCtx, dataOff, recSize) {
     const dx = rCtx.view.getInt32(dataOff, true);
     const dy = rCtx.view.getInt32(dataOff + 4, true);
     if (rCtx.clipRegion) {
-      rCtx.clipRegion = translateClipRegion(rCtx.clipRegion, gmw(rCtx, dx), gmh(rCtx, dy));
+      const px = gdiDevicePixelX(rCtx);
+      const py = gdiDevicePixelY(rCtx);
+      const ox = Math.round(gmw(rCtx, dx) / px) * px;
+      const oy = Math.round(gmh(rCtx, dy) / py) * py;
+      rCtx.clipRegion = translateClipRegion(rCtx.clipRegion, ox, oy);
       reapplyClipRegion(rCtx, rCtx.clipRegion);
     }
   }

package/dist/index.js

@@ -29640,6 +29640,12 @@ function gdiDevicePixelX(r) {
 function gdiDevicePixelY(r) {
   return !r.useMappingMode || r.deviceToCanvas ? r.sy : 1;
 }
+function gdiDeviceToCanvasX(r, x) {
+  return !r.useMappingMode || r.deviceToCanvas ? (x - r.bounds.left) * r.sx : x;
+}
+function gdiDeviceToCanvasY(r, y) {
+  return !r.useMappingMode || r.deviceToCanvas ? (y - r.bounds.top) * r.sy : y;
+}
 function activateGdiMappingMode(r) {
   r.useMappingMode = true;
 }
@@ -37235,11 +37241,13 @@ function handleExtSelectClipRgn(rCtx, dataOff, recSize) {
     const top = view.getInt32(rOff + 4, true);
     const right = view.getInt32(rOff + 8, true);
     const bottom = view.getInt32(rOff + 12, true);
+    const x = gdiDeviceToCanvasX(rCtx, left);
+    const y = gdiDeviceToCanvasY(rCtx, top);
     rects.push({
-      x: gmx(rCtx, left),
-      y: gmy(rCtx, top),
-      w: gmw(rCtx, right - left),
-      h: gmh(rCtx, bottom - top)
+      x,
+      y,
+      w: gdiDeviceToCanvasX(rCtx, right) - x,
+      h: gdiDeviceToCanvasY(rCtx, bottom) - y
     });
   }
   if (rects.length === 0) {
@@ -37254,7 +37262,11 @@ function handleOffsetClipRgn(rCtx, dataOff, recSize) {
     const dx = rCtx.view.getInt32(dataOff, true);
     const dy = rCtx.view.getInt32(dataOff + 4, true);
     if (rCtx.clipRegion) {
-      rCtx.clipRegion = translateClipRegion(rCtx.clipRegion, gmw(rCtx, dx), gmh(rCtx, dy));
+      const px = gdiDevicePixelX(rCtx);
+      const py = gdiDevicePixelY(rCtx);
+      const ox = Math.round(gmw(rCtx, dx) / px) * px;
+      const oy = Math.round(gmh(rCtx, dy) / py) * py;
+      rCtx.clipRegion = translateClipRegion(rCtx.clipRegion, ox, oy);
       reapplyClipRegion(rCtx, rCtx.clipRegion);
     }
   }

package/dist/index.mjs

@@ -29638,6 +29638,12 @@ function gdiDevicePixelX(r) {
 function gdiDevicePixelY(r) {
   return !r.useMappingMode || r.deviceToCanvas ? r.sy : 1;
 }
+function gdiDeviceToCanvasX(r, x) {
+  return !r.useMappingMode || r.deviceToCanvas ? (x - r.bounds.left) * r.sx : x;
+}
+function gdiDeviceToCanvasY(r, y) {
+  return !r.useMappingMode || r.deviceToCanvas ? (y - r.bounds.top) * r.sy : y;
+}
 function activateGdiMappingMode(r) {
   r.useMappingMode = true;
 }
@@ -37233,11 +37239,13 @@ function handleExtSelectClipRgn(rCtx, dataOff, recSize) {
     const top = view.getInt32(rOff + 4, true);
     const right = view.getInt32(rOff + 8, true);
     const bottom = view.getInt32(rOff + 12, true);
+    const x = gdiDeviceToCanvasX(rCtx, left);
+    const y = gdiDeviceToCanvasY(rCtx, top);
     rects.push({
-      x: gmx(rCtx, left),
-      y: gmy(rCtx, top),
-      w: gmw(rCtx, right - left),
-      h: gmh(rCtx, bottom - top)
+      x,
+      y,
+      w: gdiDeviceToCanvasX(rCtx, right) - x,
+      h: gdiDeviceToCanvasY(rCtx, bottom) - y
     });
   }
   if (rects.length === 0) {
@@ -37252,7 +37260,11 @@ function handleOffsetClipRgn(rCtx, dataOff, recSize) {
     const dx = rCtx.view.getInt32(dataOff, true);
     const dy = rCtx.view.getInt32(dataOff + 4, true);
     if (rCtx.clipRegion) {
-      rCtx.clipRegion = translateClipRegion(rCtx.clipRegion, gmw(rCtx, dx), gmh(rCtx, dy));
+      const px = gdiDevicePixelX(rCtx);
+      const py = gdiDevicePixelY(rCtx);
+      const ox = Math.round(gmw(rCtx, dx) / px) * px;
+      const oy = Math.round(gmh(rCtx, dy) / py) * py;
+      rCtx.clipRegion = translateClipRegion(rCtx.clipRegion, ox, oy);
       reapplyClipRegion(rCtx, rCtx.clipRegion);
     }
   }

package/package.json

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