emf-converter 4.8.0 → 4.8.1

package/dist/browser.js

@@ -16403,8 +16403,8 @@ function midtoneGamma(t) {
     low = high;
     high = (high + 100) / 2;
   }
-  gamma = Math.abs(t) === 100 ? 10 : Math.min(10, gamma + (Math.abs(t) - low) / (high - low));
-  return Math.fround(t < 0 ? gamma : 1 / gamma);
+  gamma = Math.abs(t) === 100 ? 10 : Math.min(10, truncF32(gamma + truncF32(truncF32(Math.abs(t) - low) / truncF32(high - low))));
+  return t < 0 ? truncF32(gamma) : truncF32(1 / truncF32(gamma));
 }
 function brightnessContrastLut(brightness, contrast) {
   const gain = contrast >= 100 ? 1e6 : contrast >= 0 ? 100 / (100 - contrast) : (100 + contrast) / 100;
@@ -16421,6 +16421,23 @@ function curveAdjustmentLut(adjustment, intensity) {
   return nativeCurveLookup(adjustment, clamp(Math.trunc(intensity), min, max)).slice();
 }
 function levelsLut(highlight, midtone, shadow) {
+  if (highlight !== shadow) {
+    const forward = highlight > shadow;
+    const lo = truncF32((forward ? shadow : highlight) * 255 / 100);
+    const hi = truncF32((forward ? highlight : shadow) * 255 / 100);
+    const scale = truncF32(1 / truncF32(hi - lo));
+    const exponent2 = midtoneGamma(midtone);
+    const lut = new Uint8Array(256);
+    for (let v = 0; v < 256; v++) {
+      let level = clamp(truncF32(truncF32(v - lo) * scale), 0, 1);
+      if (midtone !== 0) {
+        level = truncF32(level ** exponent2);
+      }
+      const out = forward ? truncF32(255 * level) : truncF32(255 - truncF32(255 * level));
+      lut[v] = clamp(Math.floor(out + 0.5), 0, 255);
+    }
+    return lut;
+  }
   const base = shadow * 255 / 100 - (highlight === shadow && shadow < 50 ? 1 : 0);
   const span = highlight === shadow ? 1 : (highlight - shadow) * 255 / 100;
   const exponent = midtoneGamma(midtone);
@@ -16453,14 +16470,6 @@ function applyColorMatrix(src, m) {
   }
   return out;
 }
-function hslToRgb(h, s, l) {
-  const c = (1 - Math.abs(2 * l - 1)) * s;
-  const hp = (h % 360 + 360) % 360 / 60;
-  const x = c * (1 - Math.abs(hp % 2 - 1));
-  const m = l - c / 2;
-  const [r, g, b] = hp < 1 ? [c, x, 0] : hp < 2 ? [x, c, 0] : hp < 3 ? [0, c, x] : hp < 4 ? [0, x, c] : hp < 5 ? [x, 0, c] : [c, 0, x];
-  return [r + m, g + m, b + m];
-}
 var HUE_SEXTANT = 43;
 var HUE_CIRCLE = 255;
 function gdipHue(r, g, b) {
@@ -16483,29 +16492,30 @@ function gdipHue(r, g, b) {
 function applyHueSaturationLightness(src, hue, saturation, lightness) {
   const out = new Uint8ClampedArray(src);
   const shift = Math.round(hue * HUE_CIRCLE / 360);
-  const sMul = 1 + saturation / 100;
+  const satScale = 65536 + Math.floor(saturation * 65536 / 100);
+  const lightOffset = Math.round(255 * Math.floor(lightness * 65536 / 100) / 65536);
   for (let i = 0; i < src.length; i += 4) {
     const r = src[i];
     const g = src[i + 1];
     const b = src[i + 2];
     const max = Math.max(r, g, b);
     const min = Math.min(r, g, b);
-    const l = clamp(Math.round(((max + min >> 1) * 100 + 255 * lightness) / 100), 0, 255);
+    const l = clamp((max + min >> 1) + lightOffset, 0, 255);
     if (max === min) {
       out[i] = out[i + 1] = out[i + 2] = l;
       continue;
     }
     const sum = max + min;
-    const s = Math.fround(clamp((max - min) / (sum <= 255 ? sum : 510 - sum) * sMul, 0, 1));
-    const hi = l <= 127 ? l * (1 + s) : l + s * (255 - l);
-    const m1 = l <= 127 ? 2 * l - Math.trunc(hi) : Math.round(2 * l - hi);
-    const m2 = 2 * l - m1;
+    const sat2 = clamp(Math.round(Math.floor((max - min) * 255 / (sum <= 255 ? sum : 510 - sum)) * satScale / 65536), 0, 255);
+    const hi = l <= 127 ? Math.floor(l * (255 + sat2) / 255) : l + sat2 - Math.floor(l * sat2 / 255);
+    const m1 = 2 * l - hi;
+    const m2 = hi;
     const index = ((gdipHue(r, g, b) + shift) % HUE_CIRCLE + HUE_CIRCLE) % HUE_CIRCLE;
     const q = index + Math.floor((index + 41) / 85);
     const sextant = Math.min(5, Math.floor(q / HUE_SEXTANT));
-    const f = (q - sextant * HUE_SEXTANT) / HUE_SEXTANT;
-    const up = Math.trunc(m1 + (m2 - m1) * f);
-    const down = Math.trunc(m1 + (m2 - m1) * (1 - f));
+    const position = q - sextant * HUE_SEXTANT;
+    const up = m1 + Math.floor((m2 - m1) * position / HUE_SEXTANT);
+    const down = m1 + Math.floor((m2 - m1) * (HUE_SEXTANT - position) / HUE_SEXTANT);
     const [nr, ng, nb] = [
       [m2, up, m1],
       [down, m2, m1],
@@ -16520,28 +16530,40 @@ function applyHueSaturationLightness(src, hue, saturation, lightness) {
   }
   return out;
 }
-var LUMA_709 = [0.2126, 0.7152, 0.0722];
-var TINT_CHROMA_SCALE = 0.985;
 function applyTint(src, hue, amount) {
   const index = (Math.round(hue * 255 / 360) + 256) % 256;
   const q = (index + Math.floor((index + 41) / 85)) % 258;
-  const tint = hslToRgb(q * 60 / 43, 1, 0.5);
-  const ty = tint[0] * LUMA_709[0] + tint[1] * LUMA_709[1] + tint[2] * LUMA_709[2];
-  const chroma = tint.map((c) => (c - ty) * TINT_CHROMA_SCALE);
-  const a = amount / 100;
+  const sextant = Math.min(5, Math.floor(q / HUE_SEXTANT));
+  const position = q - sextant * HUE_SEXTANT;
+  const up = Math.floor(TINT_FULL * position / HUE_SEXTANT);
+  const down = Math.floor(TINT_FULL * (HUE_SEXTANT - position) / HUE_SEXTANT);
+  const [tr, tg, tb] = [
+    [TINT_FULL, up, 0],
+    [down, TINT_FULL, 0],
+    [0, TINT_FULL, up],
+    [0, down, TINT_FULL],
+    [up, 0, TINT_FULL],
+    [TINT_FULL, 0, down]
+  ][sextant];
+  const weight = Math.sign(amount) * Math.floor((255 * Math.abs(amount) + 49) / 100);
+  const original = 255 - weight;
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {
     const r = src[i];
     const g = src[i + 1];
     const b = src[i + 2];
-    const y = r * LUMA_709[0] + g * LUMA_709[1] + b * LUMA_709[2];
-    const v = Math.max(r, g, b);
-    out[i] = Math.round((1 - a) * r + a * (y + v * chroma[0]));
-    out[i + 1] = Math.round((1 - a) * g + a * (y + v * chroma[1]));
-    out[i + 2] = Math.round((1 - a) * b + a * (y + v * chroma[2]));
+    const u = weight * Math.max(r, g, b) >> 8;
+    const x0 = original * r + tr * u;
+    const x1 = original * g + tg * u;
+    const x2 = original * b + tb * u;
+    const base = 54 * r + 183 * g + 19 * b - (54 * (x0 >> 8) + 183 * (x1 >> 8) + 19 * (x2 >> 8));
+    out[i] = base + x0 >> 8;
+    out[i + 1] = base + x1 >> 8;
+    out[i + 2] = base + x2 >> 8;
   }
   return out;
 }
+var TINT_FULL = 254;
 function applyRedEyeCorrection(src, width, height, areas) {
   const out = new Uint8ClampedArray(src);
   for (const a of areas) {
@@ -20541,8 +20563,7 @@ function resampleImage(rgba, width, height, spec, surface) {
   const axisAligned = m[1] === 0 && m[2] === 0;
   if (hq && axisAligned) {
     const ox = m[0] * spec.srcX + m[4];
-    const oy = m[3] * spec.srcY + m[5];
-    m = [m[0], 0, 0, m[3], m[4] + mirroredOrigin(ox) - ox, m[5] + mirroredOrigin(oy) - oy];
+    m = [m[0], 0, 0, m[3], m[4] + mirroredOrigin(ox) - ox, m[5]];
   }
   const inv2 = invert2(m);
   if (!inv2) {
@@ -23355,6 +23376,21 @@ var nestedReplayer = null;
 function registerNestedMetafileReplayer(fn) {
   nestedReplayer = fn;
 }
+function inclusiveNestedMapping(toDevice, srcX, srcY, srcW, srcH) {
+  const [a, b, c, d, e, f] = toDevice;
+  const lengthU = Math.hypot(a, b) * srcW;
+  const lengthV = Math.hypot(c, d) * srcH;
+  if (!(srcW > 1 && srcH > 1 && lengthU > 1 && lengthV > 1)) {
+    return toDevice;
+  }
+  const ku = (lengthU - 1) / lengthU * (srcW / (srcW - 1));
+  const kv = (lengthV - 1) / lengthV * (srcH / (srcH - 1));
+  const na = a * ku;
+  const nb = b * ku;
+  const nc = c * kv;
+  const nd = d * kv;
+  return [na, nb, nc, nd, e + (a - na) * srcX + (c - nc) * srcY, f + (b - nb) * srcX + (d - nd) * srcY];
+}
 function drawNestedMetafile(rCtx, img, cached, source) {
   const depth = rCtx.nestingDepth ?? 0;
   if (!nestedReplayer || !source || !img.data || source.unit !== UNIT_PIXEL || depth >= MAX_NESTED_METAFILE_DEPTH) {
@@ -23368,9 +23404,12 @@ function drawNestedMetafile(rCtx, img, cached, source) {
   if (!size) {
     return false;
   }
-  const toCanvas = mulMatrix(
-    [1, 0, 0, 1, -0.5, -0.5],
-    mulMatrix(mulMatrix(plusWorldMatrix(rCtx), source.toWorld(srcX, srcY, srcW, srcH)), [1, 0, 0, 1, 0.5, 0.5])
+  const toCanvas = inclusiveNestedMapping(
+    mulMatrix(plusWorldMatrix(rCtx), source.toWorld(srcX, srcY, srcW, srcH)),
+    srcX,
+    srcY,
+    srcW,
+    srcH
   );
   const bytes = img.data.slice(0);
   const caches = cached && cached.kind === "metafile" ? cached.caches : void 0;

package/dist/browser.mjs

@@ -16401,8 +16401,8 @@ function midtoneGamma(t) {
     low = high;
     high = (high + 100) / 2;
   }
-  gamma = Math.abs(t) === 100 ? 10 : Math.min(10, gamma + (Math.abs(t) - low) / (high - low));
-  return Math.fround(t < 0 ? gamma : 1 / gamma);
+  gamma = Math.abs(t) === 100 ? 10 : Math.min(10, truncF32(gamma + truncF32(truncF32(Math.abs(t) - low) / truncF32(high - low))));
+  return t < 0 ? truncF32(gamma) : truncF32(1 / truncF32(gamma));
 }
 function brightnessContrastLut(brightness, contrast) {
   const gain = contrast >= 100 ? 1e6 : contrast >= 0 ? 100 / (100 - contrast) : (100 + contrast) / 100;
@@ -16419,6 +16419,23 @@ function curveAdjustmentLut(adjustment, intensity) {
   return nativeCurveLookup(adjustment, clamp(Math.trunc(intensity), min, max)).slice();
 }
 function levelsLut(highlight, midtone, shadow) {
+  if (highlight !== shadow) {
+    const forward = highlight > shadow;
+    const lo = truncF32((forward ? shadow : highlight) * 255 / 100);
+    const hi = truncF32((forward ? highlight : shadow) * 255 / 100);
+    const scale = truncF32(1 / truncF32(hi - lo));
+    const exponent2 = midtoneGamma(midtone);
+    const lut = new Uint8Array(256);
+    for (let v = 0; v < 256; v++) {
+      let level = clamp(truncF32(truncF32(v - lo) * scale), 0, 1);
+      if (midtone !== 0) {
+        level = truncF32(level ** exponent2);
+      }
+      const out = forward ? truncF32(255 * level) : truncF32(255 - truncF32(255 * level));
+      lut[v] = clamp(Math.floor(out + 0.5), 0, 255);
+    }
+    return lut;
+  }
   const base = shadow * 255 / 100 - (highlight === shadow && shadow < 50 ? 1 : 0);
   const span = highlight === shadow ? 1 : (highlight - shadow) * 255 / 100;
   const exponent = midtoneGamma(midtone);
@@ -16451,14 +16468,6 @@ function applyColorMatrix(src, m) {
   }
   return out;
 }
-function hslToRgb(h, s, l) {
-  const c = (1 - Math.abs(2 * l - 1)) * s;
-  const hp = (h % 360 + 360) % 360 / 60;
-  const x = c * (1 - Math.abs(hp % 2 - 1));
-  const m = l - c / 2;
-  const [r, g, b] = hp < 1 ? [c, x, 0] : hp < 2 ? [x, c, 0] : hp < 3 ? [0, c, x] : hp < 4 ? [0, x, c] : hp < 5 ? [x, 0, c] : [c, 0, x];
-  return [r + m, g + m, b + m];
-}
 var HUE_SEXTANT = 43;
 var HUE_CIRCLE = 255;
 function gdipHue(r, g, b) {
@@ -16481,29 +16490,30 @@ function gdipHue(r, g, b) {
 function applyHueSaturationLightness(src, hue, saturation, lightness) {
   const out = new Uint8ClampedArray(src);
   const shift = Math.round(hue * HUE_CIRCLE / 360);
-  const sMul = 1 + saturation / 100;
+  const satScale = 65536 + Math.floor(saturation * 65536 / 100);
+  const lightOffset = Math.round(255 * Math.floor(lightness * 65536 / 100) / 65536);
   for (let i = 0; i < src.length; i += 4) {
     const r = src[i];
     const g = src[i + 1];
     const b = src[i + 2];
     const max = Math.max(r, g, b);
     const min = Math.min(r, g, b);
-    const l = clamp(Math.round(((max + min >> 1) * 100 + 255 * lightness) / 100), 0, 255);
+    const l = clamp((max + min >> 1) + lightOffset, 0, 255);
     if (max === min) {
       out[i] = out[i + 1] = out[i + 2] = l;
       continue;
     }
     const sum = max + min;
-    const s = Math.fround(clamp((max - min) / (sum <= 255 ? sum : 510 - sum) * sMul, 0, 1));
-    const hi = l <= 127 ? l * (1 + s) : l + s * (255 - l);
-    const m1 = l <= 127 ? 2 * l - Math.trunc(hi) : Math.round(2 * l - hi);
-    const m2 = 2 * l - m1;
+    const sat2 = clamp(Math.round(Math.floor((max - min) * 255 / (sum <= 255 ? sum : 510 - sum)) * satScale / 65536), 0, 255);
+    const hi = l <= 127 ? Math.floor(l * (255 + sat2) / 255) : l + sat2 - Math.floor(l * sat2 / 255);
+    const m1 = 2 * l - hi;
+    const m2 = hi;
     const index = ((gdipHue(r, g, b) + shift) % HUE_CIRCLE + HUE_CIRCLE) % HUE_CIRCLE;
     const q = index + Math.floor((index + 41) / 85);
     const sextant = Math.min(5, Math.floor(q / HUE_SEXTANT));
-    const f = (q - sextant * HUE_SEXTANT) / HUE_SEXTANT;
-    const up = Math.trunc(m1 + (m2 - m1) * f);
-    const down = Math.trunc(m1 + (m2 - m1) * (1 - f));
+    const position = q - sextant * HUE_SEXTANT;
+    const up = m1 + Math.floor((m2 - m1) * position / HUE_SEXTANT);
+    const down = m1 + Math.floor((m2 - m1) * (HUE_SEXTANT - position) / HUE_SEXTANT);
     const [nr, ng, nb] = [
       [m2, up, m1],
       [down, m2, m1],
@@ -16518,28 +16528,40 @@ function applyHueSaturationLightness(src, hue, saturation, lightness) {
   }
   return out;
 }
-var LUMA_709 = [0.2126, 0.7152, 0.0722];
-var TINT_CHROMA_SCALE = 0.985;
 function applyTint(src, hue, amount) {
   const index = (Math.round(hue * 255 / 360) + 256) % 256;
   const q = (index + Math.floor((index + 41) / 85)) % 258;
-  const tint = hslToRgb(q * 60 / 43, 1, 0.5);
-  const ty = tint[0] * LUMA_709[0] + tint[1] * LUMA_709[1] + tint[2] * LUMA_709[2];
-  const chroma = tint.map((c) => (c - ty) * TINT_CHROMA_SCALE);
-  const a = amount / 100;
+  const sextant = Math.min(5, Math.floor(q / HUE_SEXTANT));
+  const position = q - sextant * HUE_SEXTANT;
+  const up = Math.floor(TINT_FULL * position / HUE_SEXTANT);
+  const down = Math.floor(TINT_FULL * (HUE_SEXTANT - position) / HUE_SEXTANT);
+  const [tr, tg, tb] = [
+    [TINT_FULL, up, 0],
+    [down, TINT_FULL, 0],
+    [0, TINT_FULL, up],
+    [0, down, TINT_FULL],
+    [up, 0, TINT_FULL],
+    [TINT_FULL, 0, down]
+  ][sextant];
+  const weight = Math.sign(amount) * Math.floor((255 * Math.abs(amount) + 49) / 100);
+  const original = 255 - weight;
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {
     const r = src[i];
     const g = src[i + 1];
     const b = src[i + 2];
-    const y = r * LUMA_709[0] + g * LUMA_709[1] + b * LUMA_709[2];
-    const v = Math.max(r, g, b);
-    out[i] = Math.round((1 - a) * r + a * (y + v * chroma[0]));
-    out[i + 1] = Math.round((1 - a) * g + a * (y + v * chroma[1]));
-    out[i + 2] = Math.round((1 - a) * b + a * (y + v * chroma[2]));
+    const u = weight * Math.max(r, g, b) >> 8;
+    const x0 = original * r + tr * u;
+    const x1 = original * g + tg * u;
+    const x2 = original * b + tb * u;
+    const base = 54 * r + 183 * g + 19 * b - (54 * (x0 >> 8) + 183 * (x1 >> 8) + 19 * (x2 >> 8));
+    out[i] = base + x0 >> 8;
+    out[i + 1] = base + x1 >> 8;
+    out[i + 2] = base + x2 >> 8;
   }
   return out;
 }
+var TINT_FULL = 254;
 function applyRedEyeCorrection(src, width, height, areas) {
   const out = new Uint8ClampedArray(src);
   for (const a of areas) {
@@ -20539,8 +20561,7 @@ function resampleImage(rgba, width, height, spec, surface) {
   const axisAligned = m[1] === 0 && m[2] === 0;
   if (hq && axisAligned) {
     const ox = m[0] * spec.srcX + m[4];
-    const oy = m[3] * spec.srcY + m[5];
-    m = [m[0], 0, 0, m[3], m[4] + mirroredOrigin(ox) - ox, m[5] + mirroredOrigin(oy) - oy];
+    m = [m[0], 0, 0, m[3], m[4] + mirroredOrigin(ox) - ox, m[5]];
   }
   const inv2 = invert2(m);
   if (!inv2) {
@@ -23353,6 +23374,21 @@ var nestedReplayer = null;
 function registerNestedMetafileReplayer(fn) {
   nestedReplayer = fn;
 }
+function inclusiveNestedMapping(toDevice, srcX, srcY, srcW, srcH) {
+  const [a, b, c, d, e, f] = toDevice;
+  const lengthU = Math.hypot(a, b) * srcW;
+  const lengthV = Math.hypot(c, d) * srcH;
+  if (!(srcW > 1 && srcH > 1 && lengthU > 1 && lengthV > 1)) {
+    return toDevice;
+  }
+  const ku = (lengthU - 1) / lengthU * (srcW / (srcW - 1));
+  const kv = (lengthV - 1) / lengthV * (srcH / (srcH - 1));
+  const na = a * ku;
+  const nb = b * ku;
+  const nc = c * kv;
+  const nd = d * kv;
+  return [na, nb, nc, nd, e + (a - na) * srcX + (c - nc) * srcY, f + (b - nb) * srcX + (d - nd) * srcY];
+}
 function drawNestedMetafile(rCtx, img, cached, source) {
   const depth = rCtx.nestingDepth ?? 0;
   if (!nestedReplayer || !source || !img.data || source.unit !== UNIT_PIXEL || depth >= MAX_NESTED_METAFILE_DEPTH) {
@@ -23366,9 +23402,12 @@ function drawNestedMetafile(rCtx, img, cached, source) {
   if (!size) {
     return false;
   }
-  const toCanvas = mulMatrix(
-    [1, 0, 0, 1, -0.5, -0.5],
-    mulMatrix(mulMatrix(plusWorldMatrix(rCtx), source.toWorld(srcX, srcY, srcW, srcH)), [1, 0, 0, 1, 0.5, 0.5])
+  const toCanvas = inclusiveNestedMapping(
+    mulMatrix(plusWorldMatrix(rCtx), source.toWorld(srcX, srcY, srcW, srcH)),
+    srcX,
+    srcY,
+    srcW,
+    srcH
   );
   const bytes = img.data.slice(0);
   const caches = cached && cached.kind === "metafile" ? cached.caches : void 0;

package/dist/index.js

@@ -16404,8 +16404,8 @@ function midtoneGamma(t) {
     low = high;
     high = (high + 100) / 2;
   }
-  gamma = Math.abs(t) === 100 ? 10 : Math.min(10, gamma + (Math.abs(t) - low) / (high - low));
-  return Math.fround(t < 0 ? gamma : 1 / gamma);
+  gamma = Math.abs(t) === 100 ? 10 : Math.min(10, truncF32(gamma + truncF32(truncF32(Math.abs(t) - low) / truncF32(high - low))));
+  return t < 0 ? truncF32(gamma) : truncF32(1 / truncF32(gamma));
 }
 function brightnessContrastLut(brightness, contrast) {
   const gain = contrast >= 100 ? 1e6 : contrast >= 0 ? 100 / (100 - contrast) : (100 + contrast) / 100;
@@ -16422,6 +16422,23 @@ function curveAdjustmentLut(adjustment, intensity) {
   return nativeCurveLookup(adjustment, clamp(Math.trunc(intensity), min, max)).slice();
 }
 function levelsLut(highlight, midtone, shadow) {
+  if (highlight !== shadow) {
+    const forward = highlight > shadow;
+    const lo = truncF32((forward ? shadow : highlight) * 255 / 100);
+    const hi = truncF32((forward ? highlight : shadow) * 255 / 100);
+    const scale = truncF32(1 / truncF32(hi - lo));
+    const exponent2 = midtoneGamma(midtone);
+    const lut = new Uint8Array(256);
+    for (let v = 0; v < 256; v++) {
+      let level = clamp(truncF32(truncF32(v - lo) * scale), 0, 1);
+      if (midtone !== 0) {
+        level = truncF32(level ** exponent2);
+      }
+      const out = forward ? truncF32(255 * level) : truncF32(255 - truncF32(255 * level));
+      lut[v] = clamp(Math.floor(out + 0.5), 0, 255);
+    }
+    return lut;
+  }
   const base = shadow * 255 / 100 - (highlight === shadow && shadow < 50 ? 1 : 0);
   const span = highlight === shadow ? 1 : (highlight - shadow) * 255 / 100;
   const exponent = midtoneGamma(midtone);
@@ -16454,14 +16471,6 @@ function applyColorMatrix(src, m) {
   }
   return out;
 }
-function hslToRgb(h, s, l) {
-  const c = (1 - Math.abs(2 * l - 1)) * s;
-  const hp = (h % 360 + 360) % 360 / 60;
-  const x = c * (1 - Math.abs(hp % 2 - 1));
-  const m = l - c / 2;
-  const [r, g, b] = hp < 1 ? [c, x, 0] : hp < 2 ? [x, c, 0] : hp < 3 ? [0, c, x] : hp < 4 ? [0, x, c] : hp < 5 ? [x, 0, c] : [c, 0, x];
-  return [r + m, g + m, b + m];
-}
 var HUE_SEXTANT = 43;
 var HUE_CIRCLE = 255;
 function gdipHue(r, g, b) {
@@ -16484,29 +16493,30 @@ function gdipHue(r, g, b) {
 function applyHueSaturationLightness(src, hue, saturation, lightness) {
   const out = new Uint8ClampedArray(src);
   const shift = Math.round(hue * HUE_CIRCLE / 360);
-  const sMul = 1 + saturation / 100;
+  const satScale = 65536 + Math.floor(saturation * 65536 / 100);
+  const lightOffset = Math.round(255 * Math.floor(lightness * 65536 / 100) / 65536);
   for (let i = 0; i < src.length; i += 4) {
     const r = src[i];
     const g = src[i + 1];
     const b = src[i + 2];
     const max = Math.max(r, g, b);
     const min = Math.min(r, g, b);
-    const l = clamp(Math.round(((max + min >> 1) * 100 + 255 * lightness) / 100), 0, 255);
+    const l = clamp((max + min >> 1) + lightOffset, 0, 255);
     if (max === min) {
       out[i] = out[i + 1] = out[i + 2] = l;
       continue;
     }
     const sum = max + min;
-    const s = Math.fround(clamp((max - min) / (sum <= 255 ? sum : 510 - sum) * sMul, 0, 1));
-    const hi = l <= 127 ? l * (1 + s) : l + s * (255 - l);
-    const m1 = l <= 127 ? 2 * l - Math.trunc(hi) : Math.round(2 * l - hi);
-    const m2 = 2 * l - m1;
+    const sat2 = clamp(Math.round(Math.floor((max - min) * 255 / (sum <= 255 ? sum : 510 - sum)) * satScale / 65536), 0, 255);
+    const hi = l <= 127 ? Math.floor(l * (255 + sat2) / 255) : l + sat2 - Math.floor(l * sat2 / 255);
+    const m1 = 2 * l - hi;
+    const m2 = hi;
     const index = ((gdipHue(r, g, b) + shift) % HUE_CIRCLE + HUE_CIRCLE) % HUE_CIRCLE;
     const q = index + Math.floor((index + 41) / 85);
     const sextant = Math.min(5, Math.floor(q / HUE_SEXTANT));
-    const f = (q - sextant * HUE_SEXTANT) / HUE_SEXTANT;
-    const up = Math.trunc(m1 + (m2 - m1) * f);
-    const down = Math.trunc(m1 + (m2 - m1) * (1 - f));
+    const position = q - sextant * HUE_SEXTANT;
+    const up = m1 + Math.floor((m2 - m1) * position / HUE_SEXTANT);
+    const down = m1 + Math.floor((m2 - m1) * (HUE_SEXTANT - position) / HUE_SEXTANT);
     const [nr, ng, nb] = [
       [m2, up, m1],
       [down, m2, m1],
@@ -16521,28 +16531,40 @@ function applyHueSaturationLightness(src, hue, saturation, lightness) {
   }
   return out;
 }
-var LUMA_709 = [0.2126, 0.7152, 0.0722];
-var TINT_CHROMA_SCALE = 0.985;
 function applyTint(src, hue, amount) {
   const index = (Math.round(hue * 255 / 360) + 256) % 256;
   const q = (index + Math.floor((index + 41) / 85)) % 258;
-  const tint = hslToRgb(q * 60 / 43, 1, 0.5);
-  const ty = tint[0] * LUMA_709[0] + tint[1] * LUMA_709[1] + tint[2] * LUMA_709[2];
-  const chroma = tint.map((c) => (c - ty) * TINT_CHROMA_SCALE);
-  const a = amount / 100;
+  const sextant = Math.min(5, Math.floor(q / HUE_SEXTANT));
+  const position = q - sextant * HUE_SEXTANT;
+  const up = Math.floor(TINT_FULL * position / HUE_SEXTANT);
+  const down = Math.floor(TINT_FULL * (HUE_SEXTANT - position) / HUE_SEXTANT);
+  const [tr, tg, tb] = [
+    [TINT_FULL, up, 0],
+    [down, TINT_FULL, 0],
+    [0, TINT_FULL, up],
+    [0, down, TINT_FULL],
+    [up, 0, TINT_FULL],
+    [TINT_FULL, 0, down]
+  ][sextant];
+  const weight = Math.sign(amount) * Math.floor((255 * Math.abs(amount) + 49) / 100);
+  const original = 255 - weight;
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {
     const r = src[i];
     const g = src[i + 1];
     const b = src[i + 2];
-    const y = r * LUMA_709[0] + g * LUMA_709[1] + b * LUMA_709[2];
-    const v = Math.max(r, g, b);
-    out[i] = Math.round((1 - a) * r + a * (y + v * chroma[0]));
-    out[i + 1] = Math.round((1 - a) * g + a * (y + v * chroma[1]));
-    out[i + 2] = Math.round((1 - a) * b + a * (y + v * chroma[2]));
+    const u = weight * Math.max(r, g, b) >> 8;
+    const x0 = original * r + tr * u;
+    const x1 = original * g + tg * u;
+    const x2 = original * b + tb * u;
+    const base = 54 * r + 183 * g + 19 * b - (54 * (x0 >> 8) + 183 * (x1 >> 8) + 19 * (x2 >> 8));
+    out[i] = base + x0 >> 8;
+    out[i + 1] = base + x1 >> 8;
+    out[i + 2] = base + x2 >> 8;
   }
   return out;
 }
+var TINT_FULL = 254;
 function applyRedEyeCorrection(src, width, height, areas) {
   const out = new Uint8ClampedArray(src);
   for (const a of areas) {
@@ -20542,8 +20564,7 @@ function resampleImage(rgba, width, height, spec, surface) {
   const axisAligned = m[1] === 0 && m[2] === 0;
   if (hq && axisAligned) {
     const ox = m[0] * spec.srcX + m[4];
-    const oy = m[3] * spec.srcY + m[5];
-    m = [m[0], 0, 0, m[3], m[4] + mirroredOrigin(ox) - ox, m[5] + mirroredOrigin(oy) - oy];
+    m = [m[0], 0, 0, m[3], m[4] + mirroredOrigin(ox) - ox, m[5]];
   }
   const inv2 = invert2(m);
   if (!inv2) {
@@ -23356,6 +23377,21 @@ var nestedReplayer = null;
 function registerNestedMetafileReplayer(fn) {
   nestedReplayer = fn;
 }
+function inclusiveNestedMapping(toDevice, srcX, srcY, srcW, srcH) {
+  const [a, b, c, d, e, f] = toDevice;
+  const lengthU = Math.hypot(a, b) * srcW;
+  const lengthV = Math.hypot(c, d) * srcH;
+  if (!(srcW > 1 && srcH > 1 && lengthU > 1 && lengthV > 1)) {
+    return toDevice;
+  }
+  const ku = (lengthU - 1) / lengthU * (srcW / (srcW - 1));
+  const kv = (lengthV - 1) / lengthV * (srcH / (srcH - 1));
+  const na = a * ku;
+  const nb = b * ku;
+  const nc = c * kv;
+  const nd = d * kv;
+  return [na, nb, nc, nd, e + (a - na) * srcX + (c - nc) * srcY, f + (b - nb) * srcX + (d - nd) * srcY];
+}
 function drawNestedMetafile(rCtx, img, cached, source) {
   const depth = rCtx.nestingDepth ?? 0;
   if (!nestedReplayer || !source || !img.data || source.unit !== UNIT_PIXEL || depth >= MAX_NESTED_METAFILE_DEPTH) {
@@ -23369,9 +23405,12 @@ function drawNestedMetafile(rCtx, img, cached, source) {
   if (!size) {
     return false;
   }
-  const toCanvas = mulMatrix(
-    [1, 0, 0, 1, -0.5, -0.5],
-    mulMatrix(mulMatrix(plusWorldMatrix(rCtx), source.toWorld(srcX, srcY, srcW, srcH)), [1, 0, 0, 1, 0.5, 0.5])
+  const toCanvas = inclusiveNestedMapping(
+    mulMatrix(plusWorldMatrix(rCtx), source.toWorld(srcX, srcY, srcW, srcH)),
+    srcX,
+    srcY,
+    srcW,
+    srcH
   );
   const bytes = img.data.slice(0);
   const caches = cached && cached.kind === "metafile" ? cached.caches : void 0;

package/dist/index.mjs

@@ -16402,8 +16402,8 @@ function midtoneGamma(t) {
     low = high;
     high = (high + 100) / 2;
   }
-  gamma = Math.abs(t) === 100 ? 10 : Math.min(10, gamma + (Math.abs(t) - low) / (high - low));
-  return Math.fround(t < 0 ? gamma : 1 / gamma);
+  gamma = Math.abs(t) === 100 ? 10 : Math.min(10, truncF32(gamma + truncF32(truncF32(Math.abs(t) - low) / truncF32(high - low))));
+  return t < 0 ? truncF32(gamma) : truncF32(1 / truncF32(gamma));
 }
 function brightnessContrastLut(brightness, contrast) {
   const gain = contrast >= 100 ? 1e6 : contrast >= 0 ? 100 / (100 - contrast) : (100 + contrast) / 100;
@@ -16420,6 +16420,23 @@ function curveAdjustmentLut(adjustment, intensity) {
   return nativeCurveLookup(adjustment, clamp(Math.trunc(intensity), min, max)).slice();
 }
 function levelsLut(highlight, midtone, shadow) {
+  if (highlight !== shadow) {
+    const forward = highlight > shadow;
+    const lo = truncF32((forward ? shadow : highlight) * 255 / 100);
+    const hi = truncF32((forward ? highlight : shadow) * 255 / 100);
+    const scale = truncF32(1 / truncF32(hi - lo));
+    const exponent2 = midtoneGamma(midtone);
+    const lut = new Uint8Array(256);
+    for (let v = 0; v < 256; v++) {
+      let level = clamp(truncF32(truncF32(v - lo) * scale), 0, 1);
+      if (midtone !== 0) {
+        level = truncF32(level ** exponent2);
+      }
+      const out = forward ? truncF32(255 * level) : truncF32(255 - truncF32(255 * level));
+      lut[v] = clamp(Math.floor(out + 0.5), 0, 255);
+    }
+    return lut;
+  }
   const base = shadow * 255 / 100 - (highlight === shadow && shadow < 50 ? 1 : 0);
   const span = highlight === shadow ? 1 : (highlight - shadow) * 255 / 100;
   const exponent = midtoneGamma(midtone);
@@ -16452,14 +16469,6 @@ function applyColorMatrix(src, m) {
   }
   return out;
 }
-function hslToRgb(h, s, l) {
-  const c = (1 - Math.abs(2 * l - 1)) * s;
-  const hp = (h % 360 + 360) % 360 / 60;
-  const x = c * (1 - Math.abs(hp % 2 - 1));
-  const m = l - c / 2;
-  const [r, g, b] = hp < 1 ? [c, x, 0] : hp < 2 ? [x, c, 0] : hp < 3 ? [0, c, x] : hp < 4 ? [0, x, c] : hp < 5 ? [x, 0, c] : [c, 0, x];
-  return [r + m, g + m, b + m];
-}
 var HUE_SEXTANT = 43;
 var HUE_CIRCLE = 255;
 function gdipHue(r, g, b) {
@@ -16482,29 +16491,30 @@ function gdipHue(r, g, b) {
 function applyHueSaturationLightness(src, hue, saturation, lightness) {
   const out = new Uint8ClampedArray(src);
   const shift = Math.round(hue * HUE_CIRCLE / 360);
-  const sMul = 1 + saturation / 100;
+  const satScale = 65536 + Math.floor(saturation * 65536 / 100);
+  const lightOffset = Math.round(255 * Math.floor(lightness * 65536 / 100) / 65536);
   for (let i = 0; i < src.length; i += 4) {
     const r = src[i];
     const g = src[i + 1];
     const b = src[i + 2];
     const max = Math.max(r, g, b);
     const min = Math.min(r, g, b);
-    const l = clamp(Math.round(((max + min >> 1) * 100 + 255 * lightness) / 100), 0, 255);
+    const l = clamp((max + min >> 1) + lightOffset, 0, 255);
     if (max === min) {
       out[i] = out[i + 1] = out[i + 2] = l;
       continue;
     }
     const sum = max + min;
-    const s = Math.fround(clamp((max - min) / (sum <= 255 ? sum : 510 - sum) * sMul, 0, 1));
-    const hi = l <= 127 ? l * (1 + s) : l + s * (255 - l);
-    const m1 = l <= 127 ? 2 * l - Math.trunc(hi) : Math.round(2 * l - hi);
-    const m2 = 2 * l - m1;
+    const sat2 = clamp(Math.round(Math.floor((max - min) * 255 / (sum <= 255 ? sum : 510 - sum)) * satScale / 65536), 0, 255);
+    const hi = l <= 127 ? Math.floor(l * (255 + sat2) / 255) : l + sat2 - Math.floor(l * sat2 / 255);
+    const m1 = 2 * l - hi;
+    const m2 = hi;
     const index = ((gdipHue(r, g, b) + shift) % HUE_CIRCLE + HUE_CIRCLE) % HUE_CIRCLE;
     const q = index + Math.floor((index + 41) / 85);
     const sextant = Math.min(5, Math.floor(q / HUE_SEXTANT));
-    const f = (q - sextant * HUE_SEXTANT) / HUE_SEXTANT;
-    const up = Math.trunc(m1 + (m2 - m1) * f);
-    const down = Math.trunc(m1 + (m2 - m1) * (1 - f));
+    const position = q - sextant * HUE_SEXTANT;
+    const up = m1 + Math.floor((m2 - m1) * position / HUE_SEXTANT);
+    const down = m1 + Math.floor((m2 - m1) * (HUE_SEXTANT - position) / HUE_SEXTANT);
     const [nr, ng, nb] = [
       [m2, up, m1],
       [down, m2, m1],
@@ -16519,28 +16529,40 @@ function applyHueSaturationLightness(src, hue, saturation, lightness) {
   }
   return out;
 }
-var LUMA_709 = [0.2126, 0.7152, 0.0722];
-var TINT_CHROMA_SCALE = 0.985;
 function applyTint(src, hue, amount) {
   const index = (Math.round(hue * 255 / 360) + 256) % 256;
   const q = (index + Math.floor((index + 41) / 85)) % 258;
-  const tint = hslToRgb(q * 60 / 43, 1, 0.5);
-  const ty = tint[0] * LUMA_709[0] + tint[1] * LUMA_709[1] + tint[2] * LUMA_709[2];
-  const chroma = tint.map((c) => (c - ty) * TINT_CHROMA_SCALE);
-  const a = amount / 100;
+  const sextant = Math.min(5, Math.floor(q / HUE_SEXTANT));
+  const position = q - sextant * HUE_SEXTANT;
+  const up = Math.floor(TINT_FULL * position / HUE_SEXTANT);
+  const down = Math.floor(TINT_FULL * (HUE_SEXTANT - position) / HUE_SEXTANT);
+  const [tr, tg, tb] = [
+    [TINT_FULL, up, 0],
+    [down, TINT_FULL, 0],
+    [0, TINT_FULL, up],
+    [0, down, TINT_FULL],
+    [up, 0, TINT_FULL],
+    [TINT_FULL, 0, down]
+  ][sextant];
+  const weight = Math.sign(amount) * Math.floor((255 * Math.abs(amount) + 49) / 100);
+  const original = 255 - weight;
   const out = new Uint8ClampedArray(src);
   for (let i = 0; i < src.length; i += 4) {
     const r = src[i];
     const g = src[i + 1];
     const b = src[i + 2];
-    const y = r * LUMA_709[0] + g * LUMA_709[1] + b * LUMA_709[2];
-    const v = Math.max(r, g, b);
-    out[i] = Math.round((1 - a) * r + a * (y + v * chroma[0]));
-    out[i + 1] = Math.round((1 - a) * g + a * (y + v * chroma[1]));
-    out[i + 2] = Math.round((1 - a) * b + a * (y + v * chroma[2]));
+    const u = weight * Math.max(r, g, b) >> 8;
+    const x0 = original * r + tr * u;
+    const x1 = original * g + tg * u;
+    const x2 = original * b + tb * u;
+    const base = 54 * r + 183 * g + 19 * b - (54 * (x0 >> 8) + 183 * (x1 >> 8) + 19 * (x2 >> 8));
+    out[i] = base + x0 >> 8;
+    out[i + 1] = base + x1 >> 8;
+    out[i + 2] = base + x2 >> 8;
   }
   return out;
 }
+var TINT_FULL = 254;
 function applyRedEyeCorrection(src, width, height, areas) {
   const out = new Uint8ClampedArray(src);
   for (const a of areas) {
@@ -20540,8 +20562,7 @@ function resampleImage(rgba, width, height, spec, surface) {
   const axisAligned = m[1] === 0 && m[2] === 0;
   if (hq && axisAligned) {
     const ox = m[0] * spec.srcX + m[4];
-    const oy = m[3] * spec.srcY + m[5];
-    m = [m[0], 0, 0, m[3], m[4] + mirroredOrigin(ox) - ox, m[5] + mirroredOrigin(oy) - oy];
+    m = [m[0], 0, 0, m[3], m[4] + mirroredOrigin(ox) - ox, m[5]];
   }
   const inv2 = invert2(m);
   if (!inv2) {
@@ -23354,6 +23375,21 @@ var nestedReplayer = null;
 function registerNestedMetafileReplayer(fn) {
   nestedReplayer = fn;
 }
+function inclusiveNestedMapping(toDevice, srcX, srcY, srcW, srcH) {
+  const [a, b, c, d, e, f] = toDevice;
+  const lengthU = Math.hypot(a, b) * srcW;
+  const lengthV = Math.hypot(c, d) * srcH;
+  if (!(srcW > 1 && srcH > 1 && lengthU > 1 && lengthV > 1)) {
+    return toDevice;
+  }
+  const ku = (lengthU - 1) / lengthU * (srcW / (srcW - 1));
+  const kv = (lengthV - 1) / lengthV * (srcH / (srcH - 1));
+  const na = a * ku;
+  const nb = b * ku;
+  const nc = c * kv;
+  const nd = d * kv;
+  return [na, nb, nc, nd, e + (a - na) * srcX + (c - nc) * srcY, f + (b - nb) * srcX + (d - nd) * srcY];
+}
 function drawNestedMetafile(rCtx, img, cached, source) {
   const depth = rCtx.nestingDepth ?? 0;
   if (!nestedReplayer || !source || !img.data || source.unit !== UNIT_PIXEL || depth >= MAX_NESTED_METAFILE_DEPTH) {
@@ -23367,9 +23403,12 @@ function drawNestedMetafile(rCtx, img, cached, source) {
   if (!size) {
     return false;
   }
-  const toCanvas = mulMatrix(
-    [1, 0, 0, 1, -0.5, -0.5],
-    mulMatrix(mulMatrix(plusWorldMatrix(rCtx), source.toWorld(srcX, srcY, srcW, srcH)), [1, 0, 0, 1, 0.5, 0.5])
+  const toCanvas = inclusiveNestedMapping(
+    mulMatrix(plusWorldMatrix(rCtx), source.toWorld(srcX, srcY, srcW, srcH)),
+    srcX,
+    srcY,
+    srcW,
+    srcH
   );
   const bytes = img.data.slice(0);
   const caches = cached && cached.kind === "metafile" ? cached.caches : void 0;

package/package.json

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