emf-converter 4.4.0 → 4.4.2

package/dist/index.js

@@ -10332,6 +10332,16 @@ function decodeImageCodecFallback(bytes) {
       if (!f || !validSize(f.image.descriptor.width, f.image.descriptor.height)) return null;
       const frame2 = (0, import_gifuct_js.decompressFrame)(f, gif.gct, true);
       const data = new Uint8ClampedArray(width * height * 4);
+      const transparent = frame2.transparentIndex !== void 0;
+      const background = transparent ? frame2.colorTable[frame2.transparentIndex] : gif.gct?.[gif.lsd.backgroundColorIndex];
+      if (background) {
+        for (let i = 0; i < data.length; i += 4) {
+          data[i] = background[0];
+          data[i + 1] = background[1];
+          data[i + 2] = background[2];
+          data[i + 3] = transparent ? 0 : 255;
+        }
+      }
       const { top, left, width: fw, height: fh } = frame2.dims;
       for (let y = 0; y < fh && top + y < height; y++) {
         const n = Math.min(fw, width - left);
@@ -10355,6 +10365,15 @@ function decodeImageCodecFallback(bytes) {
   return null;
 }
 
+// src/node-canvas-loader.ts
+async function loadNodeCanvasModule() {
+  return import(
+    /* webpackIgnore: true */
+    /* @vite-ignore */
+    '@napi-rs/canvas'
+  );
+}
+
 // src/png-encoder.ts
 var crcTable = null;
 function crc32(bytes, start, end) {
@@ -14290,11 +14309,7 @@ async function ensureNodeCanvasModule() {
     return nodeCanvasModule;
   }
   try {
-    nodeCanvasModule = await import(
-      /* webpackIgnore: true */
-      /* @vite-ignore */
-      '@napi-rs/canvas'
-    );
+    nodeCanvasModule = await loadNodeCanvasModule();
   } catch {
     nodeCanvasModule = null;
   }
@@ -30405,6 +30420,7 @@ 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) {
     halftoneDespeckle(rect, SW, SH);
   }
@@ -30413,6 +30429,19 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
   }
   const cols = halftoneAxis(0, SW, W, flipX);
   const rows = halftoneAxis(0, SH, H, flipY);
+  if (mixed) {
+    const linear = (taps, src2, dst, reverse) => {
+      if (dst <= src2) return;
+      for (let i = 0; i < dst; i++) {
+        const position = Math.max(0, Math.min(src2 - 1, (i + 0.5) * src2 / dst - 0.5));
+        const left = Math.floor(position), fraction = position - left;
+        const at = (k) => reverse ? src2 - 1 - k : k;
+        taps[i] = [[at(left), 1 - fraction], [at(Math.min(src2 - 1, left + 1)), fraction]];
+      }
+    };
+    linear(cols, SW, W, flipX);
+    linear(rows, SH, H, flipY);
+  }
   const out = new Int32Array(W * H * 3);
   for (let y = 0; y < H; y++) {
     const ys = rows[y];
@@ -30433,14 +30462,27 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
         }
       }
       const o = (y * W + x) * 3;
-      out[o] = Math.floor((2 * r + total) / (2 * total));
-      out[o + 1] = Math.floor((2 * g + total) / (2 * total));
-      out[o + 2] = Math.floor((2 * b + total) / (2 * total));
+      out[o] = mixed ? Math.ceil(r / total - 0.5) : Math.floor((2 * r + total) / (2 * total));
+      out[o + 1] = mixed ? Math.ceil(g / total - 0.5) : Math.floor((2 * g + total) / (2 * total));
+      out[o + 2] = mixed ? Math.ceil(b / total - 0.5) : Math.floor((2 * b + total) / (2 * total));
     }
   }
   if (reducing) {
     halftoneSharpen(out, W, H);
   }
+  if (mixed) {
+    const source = out.slice();
+    const at = (x, y, c) => source[(Math.max(0, Math.min(H - 1, y)) * W + Math.max(0, Math.min(W - 1, x))) * 3 + c];
+    for (let y = 0; y < H; y++) {
+      for (let x = 0; x < W; x++) {
+        for (let c = 0; c < 3; c++) {
+          const v = at(x, y, c);
+          const sum = W < SW ? at(x - 1, y, c) + at(x + 1, y, c) : at(x, y - 1, c) + at(x, y + 1, c);
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, v + Math.floor((2 * v - sum) / 4)));
+        }
+      }
+    }
+  }
   for (let i = 0, o = 0; i < W * H; i++, o += 3) {
     data[i * 4] = out[o];
     data[i * 4 + 1] = out[o + 1];

package/dist/index.mjs

@@ -10330,6 +10330,16 @@ function decodeImageCodecFallback(bytes) {
       if (!f || !validSize(f.image.descriptor.width, f.image.descriptor.height)) return null;
       const frame2 = (0, import_gifuct_js.decompressFrame)(f, gif.gct, true);
       const data = new Uint8ClampedArray(width * height * 4);
+      const transparent = frame2.transparentIndex !== void 0;
+      const background = transparent ? frame2.colorTable[frame2.transparentIndex] : gif.gct?.[gif.lsd.backgroundColorIndex];
+      if (background) {
+        for (let i = 0; i < data.length; i += 4) {
+          data[i] = background[0];
+          data[i + 1] = background[1];
+          data[i + 2] = background[2];
+          data[i + 3] = transparent ? 0 : 255;
+        }
+      }
       const { top, left, width: fw, height: fh } = frame2.dims;
       for (let y = 0; y < fh && top + y < height; y++) {
         const n = Math.min(fw, width - left);
@@ -10353,6 +10363,15 @@ function decodeImageCodecFallback(bytes) {
   return null;
 }
 
+// src/node-canvas-loader.ts
+async function loadNodeCanvasModule() {
+  return import(
+    /* webpackIgnore: true */
+    /* @vite-ignore */
+    '@napi-rs/canvas'
+  );
+}
+
 // src/png-encoder.ts
 var crcTable = null;
 function crc32(bytes, start, end) {
@@ -14288,11 +14307,7 @@ async function ensureNodeCanvasModule() {
     return nodeCanvasModule;
   }
   try {
-    nodeCanvasModule = await import(
-      /* webpackIgnore: true */
-      /* @vite-ignore */
-      '@napi-rs/canvas'
-    );
+    nodeCanvasModule = await loadNodeCanvasModule();
   } catch {
     nodeCanvasModule = null;
   }
@@ -30403,6 +30418,7 @@ 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) {
     halftoneDespeckle(rect, SW, SH);
   }
@@ -30411,6 +30427,19 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
   }
   const cols = halftoneAxis(0, SW, W, flipX);
   const rows = halftoneAxis(0, SH, H, flipY);
+  if (mixed) {
+    const linear = (taps, src2, dst, reverse) => {
+      if (dst <= src2) return;
+      for (let i = 0; i < dst; i++) {
+        const position = Math.max(0, Math.min(src2 - 1, (i + 0.5) * src2 / dst - 0.5));
+        const left = Math.floor(position), fraction = position - left;
+        const at = (k) => reverse ? src2 - 1 - k : k;
+        taps[i] = [[at(left), 1 - fraction], [at(Math.min(src2 - 1, left + 1)), fraction]];
+      }
+    };
+    linear(cols, SW, W, flipX);
+    linear(rows, SH, H, flipY);
+  }
   const out = new Int32Array(W * H * 3);
   for (let y = 0; y < H; y++) {
     const ys = rows[y];
@@ -30431,14 +30460,27 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust) {
         }
       }
       const o = (y * W + x) * 3;
-      out[o] = Math.floor((2 * r + total) / (2 * total));
-      out[o + 1] = Math.floor((2 * g + total) / (2 * total));
-      out[o + 2] = Math.floor((2 * b + total) / (2 * total));
+      out[o] = mixed ? Math.ceil(r / total - 0.5) : Math.floor((2 * r + total) / (2 * total));
+      out[o + 1] = mixed ? Math.ceil(g / total - 0.5) : Math.floor((2 * g + total) / (2 * total));
+      out[o + 2] = mixed ? Math.ceil(b / total - 0.5) : Math.floor((2 * b + total) / (2 * total));
     }
   }
   if (reducing) {
     halftoneSharpen(out, W, H);
   }
+  if (mixed) {
+    const source = out.slice();
+    const at = (x, y, c) => source[(Math.max(0, Math.min(H - 1, y)) * W + Math.max(0, Math.min(W - 1, x))) * 3 + c];
+    for (let y = 0; y < H; y++) {
+      for (let x = 0; x < W; x++) {
+        for (let c = 0; c < 3; c++) {
+          const v = at(x, y, c);
+          const sum = W < SW ? at(x - 1, y, c) + at(x + 1, y, c) : at(x, y - 1, c) + at(x, y + 1, c);
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, v + Math.floor((2 * v - sum) / 4)));
+        }
+      }
+    }
+  }
   for (let i = 0, o = 0; i < W * H; i++, o += 3) {
     data[i * 4] = out[o];
     data[i * 4 + 1] = out[o + 1];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "emf-converter",
-	"version": "4.4.0",
+	"version": "4.4.2",
 	"description": "Convert EMF/WMF metafile binaries to PNG data URLs or SVG (markup, data URL, React/JSX)",
 	"keywords": [
 		"canvas",
@@ -31,19 +31,25 @@
 	],
 	"main": "dist/index.js",
 	"module": "dist/index.mjs",
+	"browser": "dist/browser.mjs",
 	"types": "dist/index.d.ts",
 	"exports": {
 		".": {
 			"types": "./dist/index.d.ts",
+			"browser": {
+				"import": "./dist/browser.mjs",
+				"require": "./dist/browser.js"
+			},
 			"import": "./dist/index.mjs",
 			"require": "./dist/index.js"
 		}
 	},
 	"scripts": {
-		"build": "tsup",
+		"build": "tsup && tsup --config tsup.browser.config.ts",
 		"dev": "tsup --watch",
 		"typecheck": "tsc --noEmit --pretty",
 		"test": "vitest run",
+		"test:browser-package": "node scripts/check-browser-package.mjs",
 		"test:watch": "vitest",
 		"pack": "bun run build && bun pm pack",
 		"docs:typecheck": "vue-tsc --noEmit -p docs/tsconfig.json",