emf-converter 4.4.6 → 4.4.8

package/dist/browser.js

@@ -11333,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]);
@@ -15763,11 +15763,11 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
-  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
-  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
+  const horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = taps >= edgeHeight ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15793,7 +15793,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -15811,14 +15811,46 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   return out;
 }
+function blurReduction(radius) {
+  return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
+}
+function effectBlur(src, width, height, radius) {
+  const factor = blurReduction(radius);
+  if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
+    return gdipBlur(src, width, height, radius);
+  }
+  const w = Math.ceil(width / factor);
+  const h = Math.ceil(height / factor);
+  const reduced = new Uint8ClampedArray(w * h * 4);
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) {
+    const x1 = Math.min(width, (x + 1) * factor), y1 = Math.min(height, (y + 1) * factor);
+    const count = (x1 - x * factor) * (y1 - y * factor);
+    for (let c = 0; c < 4; c++) {
+      let sum = 0;
+      for (let yy = y * factor; yy < y1; yy++) for (let xx = x * factor; xx < x1; xx++) sum += src[(yy * width + xx) * 4 + c];
+      reduced[(y * w + x) * 4 + c] = Math.floor(sum / count);
+    }
+  }
+  const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  for (let i = 0; i < filtered.length; i++) filtered[i] = Math.round(filtered[i]);
+  const out = new Float64Array(src.length);
+  for (let y = 0; y < height; y++) for (let x = 0; x < width; x++) {
+    const px = clamp((x + 0.5) / factor - 0.5, 0, w - 1), py = clamp((y + 0.5) / factor - 0.5, 0, h - 1);
+    const ix = Math.floor(px), iy = Math.floor(py), fx = px - ix, fy = py - iy;
+    const a = (iy * w + ix) * 4, b = (iy * w + Math.min(w - 1, ix + 1)) * 4;
+    const d = (Math.min(h - 1, iy + 1) * w + ix) * 4, e = (Math.min(h - 1, iy + 1) * w + Math.min(w - 1, ix + 1)) * 4;
+    for (let c = 0; c < 4; c++) out[(y * width + x) * 4 + c] = Math.round((1 - fy) * ((1 - fx) * filtered[a + c] + fx * filtered[b + c]) + fy * ((1 - fx) * filtered[d + c] + fx * filtered[e + c]));
+  }
+  return out;
+}
 function applyBlur(src, w, h, radius) {
-  return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
+  return Uint8ClampedArray.from(effectBlur(src, w, h, radius), Math.round);
 }
 function sharpenGain(_radius, amount) {
   return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
-  const blurred = gdipBlur(src, w, h, radius);
+  const blurred = effectBlur(src, w, h, radius);
   const gain = sharpenGain(radius, amount);
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {
@@ -28073,7 +28105,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])));
   }
   /**
@@ -28086,7 +28119,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]]);
@@ -28205,12 +28239,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;
     }
@@ -28234,7 +28273,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);
@@ -28404,9 +28448,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) {
@@ -28518,6 +28562,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) {
@@ -28637,7 +28682,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;
@@ -33507,6 +33552,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37534,19 +37580,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;
@@ -37610,6 +37649,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

@@ -11331,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]);
@@ -15761,11 +15761,11 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
-  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
-  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
+  const horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = taps >= edgeHeight ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15791,7 +15791,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -15809,14 +15809,46 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   return out;
 }
+function blurReduction(radius) {
+  return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
+}
+function effectBlur(src, width, height, radius) {
+  const factor = blurReduction(radius);
+  if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
+    return gdipBlur(src, width, height, radius);
+  }
+  const w = Math.ceil(width / factor);
+  const h = Math.ceil(height / factor);
+  const reduced = new Uint8ClampedArray(w * h * 4);
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) {
+    const x1 = Math.min(width, (x + 1) * factor), y1 = Math.min(height, (y + 1) * factor);
+    const count = (x1 - x * factor) * (y1 - y * factor);
+    for (let c = 0; c < 4; c++) {
+      let sum = 0;
+      for (let yy = y * factor; yy < y1; yy++) for (let xx = x * factor; xx < x1; xx++) sum += src[(yy * width + xx) * 4 + c];
+      reduced[(y * w + x) * 4 + c] = Math.floor(sum / count);
+    }
+  }
+  const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  for (let i = 0; i < filtered.length; i++) filtered[i] = Math.round(filtered[i]);
+  const out = new Float64Array(src.length);
+  for (let y = 0; y < height; y++) for (let x = 0; x < width; x++) {
+    const px = clamp((x + 0.5) / factor - 0.5, 0, w - 1), py = clamp((y + 0.5) / factor - 0.5, 0, h - 1);
+    const ix = Math.floor(px), iy = Math.floor(py), fx = px - ix, fy = py - iy;
+    const a = (iy * w + ix) * 4, b = (iy * w + Math.min(w - 1, ix + 1)) * 4;
+    const d = (Math.min(h - 1, iy + 1) * w + ix) * 4, e = (Math.min(h - 1, iy + 1) * w + Math.min(w - 1, ix + 1)) * 4;
+    for (let c = 0; c < 4; c++) out[(y * width + x) * 4 + c] = Math.round((1 - fy) * ((1 - fx) * filtered[a + c] + fx * filtered[b + c]) + fy * ((1 - fx) * filtered[d + c] + fx * filtered[e + c]));
+  }
+  return out;
+}
 function applyBlur(src, w, h, radius) {
-  return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
+  return Uint8ClampedArray.from(effectBlur(src, w, h, radius), Math.round);
 }
 function sharpenGain(_radius, amount) {
   return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
-  const blurred = gdipBlur(src, w, h, radius);
+  const blurred = effectBlur(src, w, h, radius);
   const gain = sharpenGain(radius, amount);
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {
@@ -28071,7 +28103,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])));
   }
   /**
@@ -28084,7 +28117,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]]);
@@ -28203,12 +28237,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;
     }
@@ -28232,7 +28271,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);
@@ -28402,9 +28446,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) {
@@ -28516,6 +28560,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) {
@@ -28635,7 +28680,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;
@@ -33505,6 +33550,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37532,19 +37578,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;
@@ -37608,6 +37647,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

@@ -11334,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]);
@@ -15764,11 +15764,11 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
-  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
-  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
+  const horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = taps >= edgeHeight ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15794,7 +15794,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -15812,14 +15812,46 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   return out;
 }
+function blurReduction(radius) {
+  return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
+}
+function effectBlur(src, width, height, radius) {
+  const factor = blurReduction(radius);
+  if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
+    return gdipBlur(src, width, height, radius);
+  }
+  const w = Math.ceil(width / factor);
+  const h = Math.ceil(height / factor);
+  const reduced = new Uint8ClampedArray(w * h * 4);
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) {
+    const x1 = Math.min(width, (x + 1) * factor), y1 = Math.min(height, (y + 1) * factor);
+    const count = (x1 - x * factor) * (y1 - y * factor);
+    for (let c = 0; c < 4; c++) {
+      let sum = 0;
+      for (let yy = y * factor; yy < y1; yy++) for (let xx = x * factor; xx < x1; xx++) sum += src[(yy * width + xx) * 4 + c];
+      reduced[(y * w + x) * 4 + c] = Math.floor(sum / count);
+    }
+  }
+  const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  for (let i = 0; i < filtered.length; i++) filtered[i] = Math.round(filtered[i]);
+  const out = new Float64Array(src.length);
+  for (let y = 0; y < height; y++) for (let x = 0; x < width; x++) {
+    const px = clamp((x + 0.5) / factor - 0.5, 0, w - 1), py = clamp((y + 0.5) / factor - 0.5, 0, h - 1);
+    const ix = Math.floor(px), iy = Math.floor(py), fx = px - ix, fy = py - iy;
+    const a = (iy * w + ix) * 4, b = (iy * w + Math.min(w - 1, ix + 1)) * 4;
+    const d = (Math.min(h - 1, iy + 1) * w + ix) * 4, e = (Math.min(h - 1, iy + 1) * w + Math.min(w - 1, ix + 1)) * 4;
+    for (let c = 0; c < 4; c++) out[(y * width + x) * 4 + c] = Math.round((1 - fy) * ((1 - fx) * filtered[a + c] + fx * filtered[b + c]) + fy * ((1 - fx) * filtered[d + c] + fx * filtered[e + c]));
+  }
+  return out;
+}
 function applyBlur(src, w, h, radius) {
-  return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
+  return Uint8ClampedArray.from(effectBlur(src, w, h, radius), Math.round);
 }
 function sharpenGain(_radius, amount) {
   return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
-  const blurred = gdipBlur(src, w, h, radius);
+  const blurred = effectBlur(src, w, h, radius);
   const gain = sharpenGain(radius, amount);
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {
@@ -28074,7 +28106,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])));
   }
   /**
@@ -28087,7 +28120,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]]);
@@ -28206,12 +28240,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;
     }
@@ -28235,7 +28274,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);
@@ -28405,9 +28449,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) {
@@ -28519,6 +28563,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) {
@@ -28638,7 +28683,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;
@@ -33508,6 +33553,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37535,19 +37581,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;
@@ -37611,6 +37650,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

@@ -11332,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]);
@@ -15762,11 +15762,11 @@ function mirror(p, n) {
   }
   return p;
 }
-function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
+function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false, fullVertical = false, edgeWidth = w, edgeHeight = h) {
   const k = blurKernel(radius);
   const taps = (k.length - 1) / 2;
-  const horizontalIndex = radius <= 16 && radius >= w ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
-  const verticalIndex = radius <= 16 && radius >= h ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
+  const horizontalIndex = taps >= edgeWidth ? (x) => Math.max(0, Math.min(w - 1, x)) : (x) => mirror(x, w);
+  const verticalIndex = taps >= edgeHeight ? (y) => Math.max(0, Math.min(h - 1, y)) : (y) => mirror(y, h);
   const out = new Float64Array(w * h * 4);
   for (let y = 0; y < h; y++) {
     const row = y * w * 4;
@@ -15792,7 +15792,7 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   if (taps > 0 && vRow >= 0 && vRow < h) {
     const horizontal = out.slice();
-    const endRow = Math.min(h, vRow + (radius <= 16 ? Math.ceil(h / w) : 1));
+    const endRow = fullVertical ? h : Math.min(h, vRow + Math.ceil(h / w));
     for (let row = vRow; row < endRow; row++) {
       const col = new Float64Array(w * 4);
       for (let j = -taps; j <= taps; j++) {
@@ -15810,14 +15810,46 @@ function gdipBlur(src, w, h, radius, vRow = 0, vZeroAbove = false) {
   }
   return out;
 }
+function blurReduction(radius) {
+  return radius < 20 ? 1 : radius < 40 ? 2 : radius <= 80 ? 4 : radius < 160 ? 8 : 16;
+}
+function effectBlur(src, width, height, radius) {
+  const factor = blurReduction(radius);
+  if (factor === 1 || (width < 4 || height < 4) && (width % factor !== 0 || height % factor !== 0)) {
+    return gdipBlur(src, width, height, radius);
+  }
+  const w = Math.ceil(width / factor);
+  const h = Math.ceil(height / factor);
+  const reduced = new Uint8ClampedArray(w * h * 4);
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) {
+    const x1 = Math.min(width, (x + 1) * factor), y1 = Math.min(height, (y + 1) * factor);
+    const count = (x1 - x * factor) * (y1 - y * factor);
+    for (let c = 0; c < 4; c++) {
+      let sum = 0;
+      for (let yy = y * factor; yy < y1; yy++) for (let xx = x * factor; xx < x1; xx++) sum += src[(yy * width + xx) * 4 + c];
+      reduced[(y * w + x) * 4 + c] = Math.floor(sum / count);
+    }
+  }
+  const filtered = gdipBlur(reduced, w, h, radius / factor, 0, false, true, Math.floor(width / factor), Math.floor(height / factor));
+  for (let i = 0; i < filtered.length; i++) filtered[i] = Math.round(filtered[i]);
+  const out = new Float64Array(src.length);
+  for (let y = 0; y < height; y++) for (let x = 0; x < width; x++) {
+    const px = clamp((x + 0.5) / factor - 0.5, 0, w - 1), py = clamp((y + 0.5) / factor - 0.5, 0, h - 1);
+    const ix = Math.floor(px), iy = Math.floor(py), fx = px - ix, fy = py - iy;
+    const a = (iy * w + ix) * 4, b = (iy * w + Math.min(w - 1, ix + 1)) * 4;
+    const d = (Math.min(h - 1, iy + 1) * w + ix) * 4, e = (Math.min(h - 1, iy + 1) * w + Math.min(w - 1, ix + 1)) * 4;
+    for (let c = 0; c < 4; c++) out[(y * width + x) * 4 + c] = Math.round((1 - fy) * ((1 - fx) * filtered[a + c] + fx * filtered[b + c]) + fy * ((1 - fx) * filtered[d + c] + fx * filtered[e + c]));
+  }
+  return out;
+}
 function applyBlur(src, w, h, radius) {
-  return Uint8ClampedArray.from(gdipBlur(src, w, h, radius), Math.round);
+  return Uint8ClampedArray.from(effectBlur(src, w, h, radius), Math.round);
 }
 function sharpenGain(_radius, amount) {
   return roundHalfDown(64 * amount / (250 - 2 * amount)) / 64;
 }
 function applySharpen(src, w, h, radius, amount) {
-  const blurred = gdipBlur(src, w, h, radius);
+  const blurred = effectBlur(src, w, h, radius);
   const gain = sharpenGain(radius, amount);
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {
@@ -28072,7 +28104,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])));
   }
   /**
@@ -28085,7 +28118,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]]);
@@ -28204,12 +28238,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;
     }
@@ -28233,7 +28272,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);
@@ -28403,9 +28447,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) {
@@ -28517,6 +28561,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) {
@@ -28636,7 +28681,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;
@@ -33506,6 +33551,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37533,19 +37579,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;
@@ -37609,6 +37648,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.6",
+	"version": "4.4.8",
 	"description": "Convert EMF/WMF metafile binaries to PNG data URLs or SVG (markup, data URL, React/JSX)",
 	"keywords": [
 		"canvas",