emf-converter 4.4.5 → 4.4.7

package/dist/browser.js

@@ -10316,6 +10316,49 @@ async function decodePng(bytes) {
 var import_jpeg_js = __toESM(require_jpeg_js());
 var import_gifuct_js = __toESM(require_lib2());
 var UTIF = __toESM(require_UTIF());
+
+// src/tiff-group3.ts
+function normalizeGroup3(buffer, page) {
+  const options = Array.isArray(page.t292) ? Number(page.t292[0]) : 0;
+  if (!Array.isArray(page.t259) || page.t259[0] !== 3 || (options & 3) !== 0) return buffer;
+  const offsets = page.t273, lengths = page.t279;
+  if (!Array.isArray(offsets) || !Array.isArray(lengths) || offsets.length !== lengths.length) return buffer;
+  const source = new Uint8Array(buffer);
+  const leastFirst = Array.isArray(page.t266) && page.t266[0] === 2;
+  const strips = offsets.map((offset, i) => {
+    const start = Number(offset), length = Number(lengths[i]);
+    if (!Number.isInteger(start) || !Number.isInteger(length) || start < 0 || length < 0 || start + length > source.length) throw new Error("Invalid TIFF strip");
+    const output = new Uint8Array(Math.ceil(length * 8 * 13 / 12 / 8) + 1);
+    let position2 = 0, zeros = 0;
+    const write = (bit) => {
+      if (bit) output[position2 >>> 3] |= 1 << (leastFirst ? position2 & 7 : 7 - (position2 & 7));
+      position2++;
+    };
+    for (let bitPosition = 0; bitPosition < length * 8; bitPosition++) {
+      const bit = source[start + (bitPosition >>> 3)] >>> (leastFirst ? bitPosition & 7 : 7 - (bitPosition & 7)) & 1;
+      write(bit);
+      if (bit) {
+        if (zeros >= 11) write(1);
+        zeros = 0;
+      } else zeros++;
+    }
+    return output.subarray(0, Math.ceil(position2 / 8));
+  });
+  const normalized = new Uint8Array(strips.reduce((size, strip) => size + strip.length, source.length));
+  normalized.set(source);
+  let position = source.length;
+  page.t273 = strips.map((strip) => {
+    const offset = position;
+    normalized.set(strip, position);
+    position += strip.length;
+    return offset;
+  });
+  page.t279 = strips.map((strip) => strip.length);
+  page.t292 = [options | 1];
+  return normalized.buffer;
+}
+
+// src/image-codec-fallback.ts
 var validSize = (w, h) => Number.isInteger(w) && Number.isInteger(h) && w > 0 && h > 0 && w <= 8192 && h <= 8192;
 function decodeImageCodecFallback(bytes) {
   try {
@@ -10354,7 +10397,7 @@ function decodeImageCodecFallback(bytes) {
       const pages = UTIF.decode(buffer);
       const page = pages.find((p) => p.t256 && p.t257);
       if (!page || !Array.isArray(page.t256) || !Array.isArray(page.t257) || !validSize(Number(page.t256[0]), Number(page.t257[0]))) return null;
-      UTIF.decodeImage(buffer, page);
+      UTIF.decodeImage(normalizeGroup3(buffer, page), page);
       const width = page.width, height = page.height;
       if (!validSize(width, height)) return null;
       const data = UTIF.toRGBA8(page);
@@ -11290,7 +11333,7 @@ var GdiRasterPath = class {
   /** Appends every figure of `other`. */
   append(other) {
     for (const f of other.figures) {
-      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
+      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents), roundWiden: f.roundWiden });
     }
     for (let i = 0; i < other.getPath.types.length; i++) {
       this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
@@ -28030,7 +28073,8 @@ var Outliner = class {
     this.pen = penPolygon(opts.width);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
-    this.roundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.roundJoinSides = !!opts.roundCurveJoins || this.originalRoundJoinSides;
     this.maxX = Math.max(...this.pen.map((q) => Math.abs(q[0])));
   }
   /**
@@ -28043,7 +28087,8 @@ var Outliner = class {
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
-    return { dx, dy, L, R, v: flatVector(this.opts.width, dx, dy), e: squareExtension(this.opts.width, dx, dy) };
+    const perpendicular = this.opts.roundCurveJoins && drawDir ? drawDir : [dx, dy];
+    return { dx, dy, L, R, v: flatVector(this.opts.width, perpendicular[0], perpendicular[1]), e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28162,12 +28207,17 @@ var Outliner = class {
    * segment).
    */
   join(p, a, b, side, outer) {
-    const { join, cap, width, miterLimit } = this.opts;
-    const sa = this.joinSide(a, side);
-    const sb = this.joinSide(b, side);
+    const { cap, width, miterLimit } = this.opts;
+    const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
+    let sa = this.joinSide(a, side);
+    let sb = this.joinSide(b, side);
+    if (this.opts.roundCurveJoins && !this.originalRoundJoinSides && a.curveEnd && b.curveEnd) {
+      sa = side === "R" ? a.v : [-a.v[0], -a.v[1]];
+      sb = side === "R" ? b.v : [-b.v[0], -b.v[1]];
+    }
     const Da = side === "R" ? a.R : a.L;
     const Db = side === "R" ? b.R : b.L;
-    if (this.roundJoinSides && Da === Db) {
+    if (this.roundJoinSides && (Da === Db || this.opts.roundCurveJoins && sa[0] === sb[0] && sa[1] === sb[1])) {
       this.push(p, sa);
       return;
     }
@@ -28191,7 +28241,12 @@ var Outliner = class {
       }
     } else {
       this.pts.push([p[0], p[1]]);
-      if (join === "round" && cap === "flat") {
+      if (this.opts.roundCurveJoins && !this.originalRoundJoinSides) {
+        this.push(p, sb);
+        this.push(p, sa);
+        this.pts.push([p[0], p[1]]);
+      }
+      if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
         this.wedge(p, sb, sa, false, false);
         this.push(p, sa);
@@ -28361,9 +28416,9 @@ function dashPieces(P, tangents, pattern, shorten) {
 }
 function widenPath(path, opts) {
   const out = [];
-  const outliner = new Outliner(opts, out);
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
+    const outliner = new Outliner(fig.roundWiden ? { ...opts, roundCurveJoins: true } : opts, out);
     let P = [];
     const dirs = [];
     for (let i = 0; i + 1 < fig.pts.length; i += 2) {
@@ -28475,6 +28530,7 @@ function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
   path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
+  path.figures[0].roundWiden = true;
   return path;
 }
 function frameMapper(box, l, t, w, h) {
@@ -28594,7 +28650,7 @@ function penWidenOptions(rCtx, opts = {}) {
   const { state } = rCtx;
   const flags = state.penFlags ?? state.penStyle;
   const matrix = gdiDeviceMatrix(rCtx);
-  const widthPx = opts.rectangle && rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
+  const widthPx = rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const dashes = state.penExtended ? geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
@@ -33464,6 +33520,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37491,19 +37548,12 @@ function compatBox(p, l, t, r, b, opts = {}) {
     if (w > 1) {
       const matrix = gdiDeviceMatrix(p.rCtx);
       const rawWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) / p.kx;
-      if (!opts.curved) {
-        box.x1 += Math.round(ux);
-        box.y1 += Math.round(uy);
-        box.x0 += Math.round(rawWidth * ux / 2);
-        box.y0 += Math.round(rawWidth * uy / 2);
-        box.x1 -= Math.round(rawWidth * ux / 2);
-        box.y1 -= Math.round(rawWidth * uy / 2);
-        return box;
-      }
-      box.x0 += Math.round(Math.floor(w / 2) * ux);
-      box.y0 += Math.round(Math.floor(w / 2) * uy);
-      box.x1 -= Math.round(Math.floor((w - 1) / 2) * ux);
-      box.y1 -= Math.round(Math.floor((w - 1) / 2) * uy);
+      box.x1 += Math.round(ux);
+      box.y1 += Math.round(uy);
+      box.x0 += Math.round(rawWidth * ux / 2);
+      box.y0 += Math.round(rawWidth * uy / 2);
+      box.x1 -= Math.round(rawWidth * ux / 2);
+      box.y1 -= Math.round(rawWidth * uy / 2);
     }
   }
   return box;
@@ -37567,6 +37617,11 @@ function compatCorner(p, w, h, box) {
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
+    const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+  }
   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)];

package/dist/browser.mjs

@@ -10314,6 +10314,49 @@ async function decodePng(bytes) {
 var import_jpeg_js = __toESM(require_jpeg_js());
 var import_gifuct_js = __toESM(require_lib2());
 var UTIF = __toESM(require_UTIF());
+
+// src/tiff-group3.ts
+function normalizeGroup3(buffer, page) {
+  const options = Array.isArray(page.t292) ? Number(page.t292[0]) : 0;
+  if (!Array.isArray(page.t259) || page.t259[0] !== 3 || (options & 3) !== 0) return buffer;
+  const offsets = page.t273, lengths = page.t279;
+  if (!Array.isArray(offsets) || !Array.isArray(lengths) || offsets.length !== lengths.length) return buffer;
+  const source = new Uint8Array(buffer);
+  const leastFirst = Array.isArray(page.t266) && page.t266[0] === 2;
+  const strips = offsets.map((offset, i) => {
+    const start = Number(offset), length = Number(lengths[i]);
+    if (!Number.isInteger(start) || !Number.isInteger(length) || start < 0 || length < 0 || start + length > source.length) throw new Error("Invalid TIFF strip");
+    const output = new Uint8Array(Math.ceil(length * 8 * 13 / 12 / 8) + 1);
+    let position2 = 0, zeros = 0;
+    const write = (bit) => {
+      if (bit) output[position2 >>> 3] |= 1 << (leastFirst ? position2 & 7 : 7 - (position2 & 7));
+      position2++;
+    };
+    for (let bitPosition = 0; bitPosition < length * 8; bitPosition++) {
+      const bit = source[start + (bitPosition >>> 3)] >>> (leastFirst ? bitPosition & 7 : 7 - (bitPosition & 7)) & 1;
+      write(bit);
+      if (bit) {
+        if (zeros >= 11) write(1);
+        zeros = 0;
+      } else zeros++;
+    }
+    return output.subarray(0, Math.ceil(position2 / 8));
+  });
+  const normalized = new Uint8Array(strips.reduce((size, strip) => size + strip.length, source.length));
+  normalized.set(source);
+  let position = source.length;
+  page.t273 = strips.map((strip) => {
+    const offset = position;
+    normalized.set(strip, position);
+    position += strip.length;
+    return offset;
+  });
+  page.t279 = strips.map((strip) => strip.length);
+  page.t292 = [options | 1];
+  return normalized.buffer;
+}
+
+// src/image-codec-fallback.ts
 var validSize = (w, h) => Number.isInteger(w) && Number.isInteger(h) && w > 0 && h > 0 && w <= 8192 && h <= 8192;
 function decodeImageCodecFallback(bytes) {
   try {
@@ -10352,7 +10395,7 @@ function decodeImageCodecFallback(bytes) {
       const pages = UTIF.decode(buffer);
       const page = pages.find((p) => p.t256 && p.t257);
       if (!page || !Array.isArray(page.t256) || !Array.isArray(page.t257) || !validSize(Number(page.t256[0]), Number(page.t257[0]))) return null;
-      UTIF.decodeImage(buffer, page);
+      UTIF.decodeImage(normalizeGroup3(buffer, page), page);
       const width = page.width, height = page.height;
       if (!validSize(width, height)) return null;
       const data = UTIF.toRGBA8(page);
@@ -11288,7 +11331,7 @@ var GdiRasterPath = class {
   /** Appends every figure of `other`. */
   append(other) {
     for (const f of other.figures) {
-      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
+      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents), roundWiden: f.roundWiden });
     }
     for (let i = 0; i < other.getPath.types.length; i++) {
       this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
@@ -28028,7 +28071,8 @@ var Outliner = class {
     this.pen = penPolygon(opts.width);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
-    this.roundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.roundJoinSides = !!opts.roundCurveJoins || this.originalRoundJoinSides;
     this.maxX = Math.max(...this.pen.map((q) => Math.abs(q[0])));
   }
   /**
@@ -28041,7 +28085,8 @@ var Outliner = class {
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
-    return { dx, dy, L, R, v: flatVector(this.opts.width, dx, dy), e: squareExtension(this.opts.width, dx, dy) };
+    const perpendicular = this.opts.roundCurveJoins && drawDir ? drawDir : [dx, dy];
+    return { dx, dy, L, R, v: flatVector(this.opts.width, perpendicular[0], perpendicular[1]), e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28160,12 +28205,17 @@ var Outliner = class {
    * segment).
    */
   join(p, a, b, side, outer) {
-    const { join, cap, width, miterLimit } = this.opts;
-    const sa = this.joinSide(a, side);
-    const sb = this.joinSide(b, side);
+    const { cap, width, miterLimit } = this.opts;
+    const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
+    let sa = this.joinSide(a, side);
+    let sb = this.joinSide(b, side);
+    if (this.opts.roundCurveJoins && !this.originalRoundJoinSides && a.curveEnd && b.curveEnd) {
+      sa = side === "R" ? a.v : [-a.v[0], -a.v[1]];
+      sb = side === "R" ? b.v : [-b.v[0], -b.v[1]];
+    }
     const Da = side === "R" ? a.R : a.L;
     const Db = side === "R" ? b.R : b.L;
-    if (this.roundJoinSides && Da === Db) {
+    if (this.roundJoinSides && (Da === Db || this.opts.roundCurveJoins && sa[0] === sb[0] && sa[1] === sb[1])) {
       this.push(p, sa);
       return;
     }
@@ -28189,7 +28239,12 @@ var Outliner = class {
       }
     } else {
       this.pts.push([p[0], p[1]]);
-      if (join === "round" && cap === "flat") {
+      if (this.opts.roundCurveJoins && !this.originalRoundJoinSides) {
+        this.push(p, sb);
+        this.push(p, sa);
+        this.pts.push([p[0], p[1]]);
+      }
+      if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
         this.wedge(p, sb, sa, false, false);
         this.push(p, sa);
@@ -28359,9 +28414,9 @@ function dashPieces(P, tangents, pattern, shorten) {
 }
 function widenPath(path, opts) {
   const out = [];
-  const outliner = new Outliner(opts, out);
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
+    const outliner = new Outliner(fig.roundWiden ? { ...opts, roundCurveJoins: true } : opts, out);
     let P = [];
     const dirs = [];
     for (let i = 0; i + 1 < fig.pts.length; i += 2) {
@@ -28473,6 +28528,7 @@ function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
   path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
+  path.figures[0].roundWiden = true;
   return path;
 }
 function frameMapper(box, l, t, w, h) {
@@ -28592,7 +28648,7 @@ function penWidenOptions(rCtx, opts = {}) {
   const { state } = rCtx;
   const flags = state.penFlags ?? state.penStyle;
   const matrix = gdiDeviceMatrix(rCtx);
-  const widthPx = opts.rectangle && rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
+  const widthPx = rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const dashes = state.penExtended ? geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
@@ -33462,6 +33518,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37489,19 +37546,12 @@ function compatBox(p, l, t, r, b, opts = {}) {
     if (w > 1) {
       const matrix = gdiDeviceMatrix(p.rCtx);
       const rawWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) / p.kx;
-      if (!opts.curved) {
-        box.x1 += Math.round(ux);
-        box.y1 += Math.round(uy);
-        box.x0 += Math.round(rawWidth * ux / 2);
-        box.y0 += Math.round(rawWidth * uy / 2);
-        box.x1 -= Math.round(rawWidth * ux / 2);
-        box.y1 -= Math.round(rawWidth * uy / 2);
-        return box;
-      }
-      box.x0 += Math.round(Math.floor(w / 2) * ux);
-      box.y0 += Math.round(Math.floor(w / 2) * uy);
-      box.x1 -= Math.round(Math.floor((w - 1) / 2) * ux);
-      box.y1 -= Math.round(Math.floor((w - 1) / 2) * uy);
+      box.x1 += Math.round(ux);
+      box.y1 += Math.round(uy);
+      box.x0 += Math.round(rawWidth * ux / 2);
+      box.y0 += Math.round(rawWidth * uy / 2);
+      box.x1 -= Math.round(rawWidth * ux / 2);
+      box.y1 -= Math.round(rawWidth * uy / 2);
     }
   }
   return box;
@@ -37565,6 +37615,11 @@ function compatCorner(p, w, h, box) {
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
+    const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+  }
   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)];

package/dist/index.js

@@ -10316,6 +10316,49 @@ async function decodePng(bytes) {
 var import_jpeg_js = __toESM(require_jpeg_js());
 var import_gifuct_js = __toESM(require_lib2());
 var UTIF = __toESM(require_UTIF());
+
+// src/tiff-group3.ts
+function normalizeGroup3(buffer, page) {
+  const options = Array.isArray(page.t292) ? Number(page.t292[0]) : 0;
+  if (!Array.isArray(page.t259) || page.t259[0] !== 3 || (options & 3) !== 0) return buffer;
+  const offsets = page.t273, lengths = page.t279;
+  if (!Array.isArray(offsets) || !Array.isArray(lengths) || offsets.length !== lengths.length) return buffer;
+  const source = new Uint8Array(buffer);
+  const leastFirst = Array.isArray(page.t266) && page.t266[0] === 2;
+  const strips = offsets.map((offset, i) => {
+    const start = Number(offset), length = Number(lengths[i]);
+    if (!Number.isInteger(start) || !Number.isInteger(length) || start < 0 || length < 0 || start + length > source.length) throw new Error("Invalid TIFF strip");
+    const output = new Uint8Array(Math.ceil(length * 8 * 13 / 12 / 8) + 1);
+    let position2 = 0, zeros = 0;
+    const write = (bit) => {
+      if (bit) output[position2 >>> 3] |= 1 << (leastFirst ? position2 & 7 : 7 - (position2 & 7));
+      position2++;
+    };
+    for (let bitPosition = 0; bitPosition < length * 8; bitPosition++) {
+      const bit = source[start + (bitPosition >>> 3)] >>> (leastFirst ? bitPosition & 7 : 7 - (bitPosition & 7)) & 1;
+      write(bit);
+      if (bit) {
+        if (zeros >= 11) write(1);
+        zeros = 0;
+      } else zeros++;
+    }
+    return output.subarray(0, Math.ceil(position2 / 8));
+  });
+  const normalized = new Uint8Array(strips.reduce((size, strip) => size + strip.length, source.length));
+  normalized.set(source);
+  let position = source.length;
+  page.t273 = strips.map((strip) => {
+    const offset = position;
+    normalized.set(strip, position);
+    position += strip.length;
+    return offset;
+  });
+  page.t279 = strips.map((strip) => strip.length);
+  page.t292 = [options | 1];
+  return normalized.buffer;
+}
+
+// src/image-codec-fallback.ts
 var validSize = (w, h) => Number.isInteger(w) && Number.isInteger(h) && w > 0 && h > 0 && w <= 8192 && h <= 8192;
 function decodeImageCodecFallback(bytes) {
   try {
@@ -10354,7 +10397,7 @@ function decodeImageCodecFallback(bytes) {
       const pages = UTIF.decode(buffer);
       const page = pages.find((p) => p.t256 && p.t257);
       if (!page || !Array.isArray(page.t256) || !Array.isArray(page.t257) || !validSize(Number(page.t256[0]), Number(page.t257[0]))) return null;
-      UTIF.decodeImage(buffer, page);
+      UTIF.decodeImage(normalizeGroup3(buffer, page), page);
       const width = page.width, height = page.height;
       if (!validSize(width, height)) return null;
       const data = UTIF.toRGBA8(page);
@@ -11291,7 +11334,7 @@ var GdiRasterPath = class {
   /** Appends every figure of `other`. */
   append(other) {
     for (const f of other.figures) {
-      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
+      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents), roundWiden: f.roundWiden });
     }
     for (let i = 0; i < other.getPath.types.length; i++) {
       this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
@@ -28031,7 +28074,8 @@ var Outliner = class {
     this.pen = penPolygon(opts.width);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
-    this.roundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.roundJoinSides = !!opts.roundCurveJoins || this.originalRoundJoinSides;
     this.maxX = Math.max(...this.pen.map((q) => Math.abs(q[0])));
   }
   /**
@@ -28044,7 +28088,8 @@ var Outliner = class {
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
-    return { dx, dy, L, R, v: flatVector(this.opts.width, dx, dy), e: squareExtension(this.opts.width, dx, dy) };
+    const perpendicular = this.opts.roundCurveJoins && drawDir ? drawDir : [dx, dy];
+    return { dx, dy, L, R, v: flatVector(this.opts.width, perpendicular[0], perpendicular[1]), e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28163,12 +28208,17 @@ var Outliner = class {
    * segment).
    */
   join(p, a, b, side, outer) {
-    const { join, cap, width, miterLimit } = this.opts;
-    const sa = this.joinSide(a, side);
-    const sb = this.joinSide(b, side);
+    const { cap, width, miterLimit } = this.opts;
+    const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
+    let sa = this.joinSide(a, side);
+    let sb = this.joinSide(b, side);
+    if (this.opts.roundCurveJoins && !this.originalRoundJoinSides && a.curveEnd && b.curveEnd) {
+      sa = side === "R" ? a.v : [-a.v[0], -a.v[1]];
+      sb = side === "R" ? b.v : [-b.v[0], -b.v[1]];
+    }
     const Da = side === "R" ? a.R : a.L;
     const Db = side === "R" ? b.R : b.L;
-    if (this.roundJoinSides && Da === Db) {
+    if (this.roundJoinSides && (Da === Db || this.opts.roundCurveJoins && sa[0] === sb[0] && sa[1] === sb[1])) {
       this.push(p, sa);
       return;
     }
@@ -28192,7 +28242,12 @@ var Outliner = class {
       }
     } else {
       this.pts.push([p[0], p[1]]);
-      if (join === "round" && cap === "flat") {
+      if (this.opts.roundCurveJoins && !this.originalRoundJoinSides) {
+        this.push(p, sb);
+        this.push(p, sa);
+        this.pts.push([p[0], p[1]]);
+      }
+      if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
         this.wedge(p, sb, sa, false, false);
         this.push(p, sa);
@@ -28362,9 +28417,9 @@ function dashPieces(P, tangents, pattern, shorten) {
 }
 function widenPath(path, opts) {
   const out = [];
-  const outliner = new Outliner(opts, out);
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
+    const outliner = new Outliner(fig.roundWiden ? { ...opts, roundCurveJoins: true } : opts, out);
     let P = [];
     const dirs = [];
     for (let i = 0; i + 1 < fig.pts.length; i += 2) {
@@ -28476,6 +28531,7 @@ function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
   path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
+  path.figures[0].roundWiden = true;
   return path;
 }
 function frameMapper(box, l, t, w, h) {
@@ -28595,7 +28651,7 @@ function penWidenOptions(rCtx, opts = {}) {
   const { state } = rCtx;
   const flags = state.penFlags ?? state.penStyle;
   const matrix = gdiDeviceMatrix(rCtx);
-  const widthPx = opts.rectangle && rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
+  const widthPx = rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const dashes = state.penExtended ? geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
@@ -33465,6 +33521,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37492,19 +37549,12 @@ function compatBox(p, l, t, r, b, opts = {}) {
     if (w > 1) {
       const matrix = gdiDeviceMatrix(p.rCtx);
       const rawWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) / p.kx;
-      if (!opts.curved) {
-        box.x1 += Math.round(ux);
-        box.y1 += Math.round(uy);
-        box.x0 += Math.round(rawWidth * ux / 2);
-        box.y0 += Math.round(rawWidth * uy / 2);
-        box.x1 -= Math.round(rawWidth * ux / 2);
-        box.y1 -= Math.round(rawWidth * uy / 2);
-        return box;
-      }
-      box.x0 += Math.round(Math.floor(w / 2) * ux);
-      box.y0 += Math.round(Math.floor(w / 2) * uy);
-      box.x1 -= Math.round(Math.floor((w - 1) / 2) * ux);
-      box.y1 -= Math.round(Math.floor((w - 1) / 2) * uy);
+      box.x1 += Math.round(ux);
+      box.y1 += Math.round(uy);
+      box.x0 += Math.round(rawWidth * ux / 2);
+      box.y0 += Math.round(rawWidth * uy / 2);
+      box.x1 -= Math.round(rawWidth * ux / 2);
+      box.y1 -= Math.round(rawWidth * uy / 2);
     }
   }
   return box;
@@ -37568,6 +37618,11 @@ function compatCorner(p, w, h, box) {
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
+    const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+  }
   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)];

package/dist/index.mjs

@@ -10314,6 +10314,49 @@ async function decodePng(bytes) {
 var import_jpeg_js = __toESM(require_jpeg_js());
 var import_gifuct_js = __toESM(require_lib2());
 var UTIF = __toESM(require_UTIF());
+
+// src/tiff-group3.ts
+function normalizeGroup3(buffer, page) {
+  const options = Array.isArray(page.t292) ? Number(page.t292[0]) : 0;
+  if (!Array.isArray(page.t259) || page.t259[0] !== 3 || (options & 3) !== 0) return buffer;
+  const offsets = page.t273, lengths = page.t279;
+  if (!Array.isArray(offsets) || !Array.isArray(lengths) || offsets.length !== lengths.length) return buffer;
+  const source = new Uint8Array(buffer);
+  const leastFirst = Array.isArray(page.t266) && page.t266[0] === 2;
+  const strips = offsets.map((offset, i) => {
+    const start = Number(offset), length = Number(lengths[i]);
+    if (!Number.isInteger(start) || !Number.isInteger(length) || start < 0 || length < 0 || start + length > source.length) throw new Error("Invalid TIFF strip");
+    const output = new Uint8Array(Math.ceil(length * 8 * 13 / 12 / 8) + 1);
+    let position2 = 0, zeros = 0;
+    const write = (bit) => {
+      if (bit) output[position2 >>> 3] |= 1 << (leastFirst ? position2 & 7 : 7 - (position2 & 7));
+      position2++;
+    };
+    for (let bitPosition = 0; bitPosition < length * 8; bitPosition++) {
+      const bit = source[start + (bitPosition >>> 3)] >>> (leastFirst ? bitPosition & 7 : 7 - (bitPosition & 7)) & 1;
+      write(bit);
+      if (bit) {
+        if (zeros >= 11) write(1);
+        zeros = 0;
+      } else zeros++;
+    }
+    return output.subarray(0, Math.ceil(position2 / 8));
+  });
+  const normalized = new Uint8Array(strips.reduce((size, strip) => size + strip.length, source.length));
+  normalized.set(source);
+  let position = source.length;
+  page.t273 = strips.map((strip) => {
+    const offset = position;
+    normalized.set(strip, position);
+    position += strip.length;
+    return offset;
+  });
+  page.t279 = strips.map((strip) => strip.length);
+  page.t292 = [options | 1];
+  return normalized.buffer;
+}
+
+// src/image-codec-fallback.ts
 var validSize = (w, h) => Number.isInteger(w) && Number.isInteger(h) && w > 0 && h > 0 && w <= 8192 && h <= 8192;
 function decodeImageCodecFallback(bytes) {
   try {
@@ -10352,7 +10395,7 @@ function decodeImageCodecFallback(bytes) {
       const pages = UTIF.decode(buffer);
       const page = pages.find((p) => p.t256 && p.t257);
       if (!page || !Array.isArray(page.t256) || !Array.isArray(page.t257) || !validSize(Number(page.t256[0]), Number(page.t257[0]))) return null;
-      UTIF.decodeImage(buffer, page);
+      UTIF.decodeImage(normalizeGroup3(buffer, page), page);
       const width = page.width, height = page.height;
       if (!validSize(width, height)) return null;
       const data = UTIF.toRGBA8(page);
@@ -11289,7 +11332,7 @@ var GdiRasterPath = class {
   /** Appends every figure of `other`. */
   append(other) {
     for (const f of other.figures) {
-      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
+      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents), roundWiden: f.roundWiden });
     }
     for (let i = 0; i < other.getPath.types.length; i++) {
       this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
@@ -28029,7 +28072,8 @@ var Outliner = class {
     this.pen = penPolygon(opts.width);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
-    this.roundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.roundJoinSides = !!opts.roundCurveJoins || this.originalRoundJoinSides;
     this.maxX = Math.max(...this.pen.map((q) => Math.abs(q[0])));
   }
   /**
@@ -28042,7 +28086,8 @@ var Outliner = class {
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
-    return { dx, dy, L, R, v: flatVector(this.opts.width, dx, dy), e: squareExtension(this.opts.width, dx, dy) };
+    const perpendicular = this.opts.roundCurveJoins && drawDir ? drawDir : [dx, dy];
+    return { dx, dy, L, R, v: flatVector(this.opts.width, perpendicular[0], perpendicular[1]), e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28161,12 +28206,17 @@ var Outliner = class {
    * segment).
    */
   join(p, a, b, side, outer) {
-    const { join, cap, width, miterLimit } = this.opts;
-    const sa = this.joinSide(a, side);
-    const sb = this.joinSide(b, side);
+    const { cap, width, miterLimit } = this.opts;
+    const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
+    let sa = this.joinSide(a, side);
+    let sb = this.joinSide(b, side);
+    if (this.opts.roundCurveJoins && !this.originalRoundJoinSides && a.curveEnd && b.curveEnd) {
+      sa = side === "R" ? a.v : [-a.v[0], -a.v[1]];
+      sb = side === "R" ? b.v : [-b.v[0], -b.v[1]];
+    }
     const Da = side === "R" ? a.R : a.L;
     const Db = side === "R" ? b.R : b.L;
-    if (this.roundJoinSides && Da === Db) {
+    if (this.roundJoinSides && (Da === Db || this.opts.roundCurveJoins && sa[0] === sb[0] && sa[1] === sb[1])) {
       this.push(p, sa);
       return;
     }
@@ -28190,7 +28240,12 @@ var Outliner = class {
       }
     } else {
       this.pts.push([p[0], p[1]]);
-      if (join === "round" && cap === "flat") {
+      if (this.opts.roundCurveJoins && !this.originalRoundJoinSides) {
+        this.push(p, sb);
+        this.push(p, sa);
+        this.pts.push([p[0], p[1]]);
+      }
+      if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
         this.wedge(p, sb, sa, false, false);
         this.push(p, sa);
@@ -28360,9 +28415,9 @@ function dashPieces(P, tangents, pattern, shorten) {
 }
 function widenPath(path, opts) {
   const out = [];
-  const outliner = new Outliner(opts, out);
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
+    const outliner = new Outliner(fig.roundWiden ? { ...opts, roundCurveJoins: true } : opts, out);
     let P = [];
     const dirs = [];
     for (let i = 0; i + 1 < fig.pts.length; i += 2) {
@@ -28474,6 +28529,7 @@ function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
   path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
+  path.figures[0].roundWiden = true;
   return path;
 }
 function frameMapper(box, l, t, w, h) {
@@ -28593,7 +28649,7 @@ function penWidenOptions(rCtx, opts = {}) {
   const { state } = rCtx;
   const flags = state.penFlags ?? state.penStyle;
   const matrix = gdiDeviceMatrix(rCtx);
-  const widthPx = opts.rectangle && rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
+  const widthPx = rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const dashes = state.penExtended ? geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
@@ -33463,6 +33519,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37490,19 +37547,12 @@ function compatBox(p, l, t, r, b, opts = {}) {
     if (w > 1) {
       const matrix = gdiDeviceMatrix(p.rCtx);
       const rawWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) / p.kx;
-      if (!opts.curved) {
-        box.x1 += Math.round(ux);
-        box.y1 += Math.round(uy);
-        box.x0 += Math.round(rawWidth * ux / 2);
-        box.y0 += Math.round(rawWidth * uy / 2);
-        box.x1 -= Math.round(rawWidth * ux / 2);
-        box.y1 -= Math.round(rawWidth * uy / 2);
-        return box;
-      }
-      box.x0 += Math.round(Math.floor(w / 2) * ux);
-      box.y0 += Math.round(Math.floor(w / 2) * uy);
-      box.x1 -= Math.round(Math.floor((w - 1) / 2) * ux);
-      box.y1 -= Math.round(Math.floor((w - 1) / 2) * uy);
+      box.x1 += Math.round(ux);
+      box.y1 += Math.round(uy);
+      box.x0 += Math.round(rawWidth * ux / 2);
+      box.y0 += Math.round(rawWidth * uy / 2);
+      box.x1 -= Math.round(rawWidth * ux / 2);
+      box.y1 -= Math.round(rawWidth * uy / 2);
     }
   }
   return box;
@@ -37566,6 +37616,11 @@ function compatCorner(p, w, h, box) {
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
+    const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+  }
   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)];

package/package.json

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