emf-converter 4.8.5 → 4.8.6

package/dist/browser.js

@@ -16534,153 +16534,26 @@ function applyTint(src, hue, amount) {
 var TINT_FULL = 254;
 function applyRedEyeCorrection(src, width, height, areas) {
   const out = new Uint8ClampedArray(src);
+  const carry = { x: 0, y: 0 };
   for (const a of areas) {
-    correctRedEyeArea(out, width, clamp(a.left, 0, width), clamp(a.top, 0, height), clamp(a.right, 0, width), clamp(a.bottom, 0, height));
+    correctRedEyeArea(out, width, clamp(a.left, 0, width), clamp(a.top, 0, height), clamp(a.right, 0, width), clamp(a.bottom, 0, height), carry);
   }
   return out;
 }
-var RED_EYE_FALLOFF = new Float64Array(
-  [
-    24930,
-    24570,
-    24201,
-    23836,
-    23471,
-    23107,
-    22744,
-    22367,
-    21976,
-    21587,
-    21198,
-    20824,
-    20490,
-    20165,
-    19832,
-    19499,
-    19157,
-    18817,
-    18480,
-    18151,
-    17820,
-    17490,
-    17160,
-    16831,
-    16506,
-    16189,
-    15878,
-    15569,
-    15273,
-    14973,
-    14668,
-    14362,
-    14059,
-    13768,
-    13484,
-    13203,
-    12923,
-    12642,
-    12366,
-    12094,
-    11828,
-    11564,
-    11301,
-    11034,
-    10770,
-    10507,
-    10253,
-    10011,
-    9771,
-    9530,
-    9290,
-    9053,
-    8819,
-    8588,
-    8359,
-    8134,
-    7914,
-    7697,
-    7481,
-    7267,
-    7056,
-    6851,
-    6651,
-    6453,
-    6256,
-    6061,
-    5871,
-    5684,
-    5499,
-    5317,
-    5138,
-    4962,
-    4789,
-    4619,
-    4452,
-    4289,
-    4130,
-    3974,
-    3820,
-    3669,
-    3520,
-    3375,
-    3232,
-    3093,
-    2958,
-    2825,
-    2695,
-    2568,
-    2444,
-    2325,
-    2207,
-    2092,
-    1980,
-    1872,
-    1768,
-    1666,
-    1567,
-    1470,
-    1377,
-    1287,
-    1200,
-    1116,
-    1034,
-    956,
-    881,
-    808,
-    739,
-    674,
-    612,
-    541,
-    462,
-    381,
-    299,
-    220,
-    147,
-    85,
-    36,
-    3,
-    0
-  ].map((v) => v / 1e5)
-);
-function redEyeFalloff(u) {
-  const t = u * 128;
-  const i = Math.floor(t);
-  if (i >= RED_EYE_FALLOFF.length - 1) {
-    return 0;
-  }
-  return RED_EYE_FALLOFF[i] + (t - i) * (RED_EYE_FALLOFF[i + 1] - RED_EYE_FALLOFF[i]);
-}
 var RED_EYE_SECTORS = 60;
 var RED_EYE_BLUE_WEIGHT = 0.225;
-var RED_EYE_WEIGHT_CAP = 6;
-var RED_EYE_PURE_WEIGHT = RED_EYE_WEIGHT_CAP;
-var RED_EYE_DARK_STRENGTH = 0.49;
-var RED_EYE_DARK_RATIO = 0.6;
-var RED_EYE_GREEN_SHARE = 80 / 255;
-function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
+var RED_EYE_PURE_WEIGHT = 1 / (1 + RED_EYE_BLUE_WEIGHT);
+var RED_EYE_CARRY = 0.81;
+var RED_EYE_GREEN_SHARE = 5 / 16;
+var RED_EYE_SPREAD_STEPS = [31.5, 50, 98.78];
+var RED_EYE_STRENGTHS = [0.25, 0.5, 0.661, 0.75];
+function correctRedEyeArea(out, stride, x0, y0, x1, y1, carry) {
   const w = x1 - x0;
   const h = y1 - y0;
   const count = w * h;
+  if (!(count > 0)) {
+    return;
+  }
   const redness = new Float64Array(count);
   const dark = new Float64Array(count);
   let sx = 0;
@@ -16693,34 +16566,44 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
       const g = out[i + 1];
       const b = out[i + 2];
       const k = y * w + x;
-      dark[k] = Math.min(g, b);
+      const d = g + RED_EYE_BLUE_WEIGHT * b;
+      dark[k] = d;
       const v = r - Math.max(g, b);
       if (v > 0) {
         redness[k] = v;
-        const denominator = g + RED_EYE_BLUE_WEIGHT * b;
-        {
-          const weight = denominator >= 1 ? Math.min(RED_EYE_WEIGHT_CAP, v / denominator) : RED_EYE_PURE_WEIGHT;
-          sx += weight * (x + 0.5);
-          sy += weight * (y + 0.5);
-          sw += weight;
-        }
+        const weight = d >= 1 ? v / d : RED_EYE_PURE_WEIGHT;
+        sx += weight * (x + 0.5);
+        sy += weight * (y + 0.5);
+        sw += weight;
       }
     }
   }
   if (sw === 0) {
-    if (!redness.some((v) => v > 0)) {
-      return;
-    }
-    sx = w / 2;
-    sy = h / 2;
-    sw = 1;
+    return;
   }
-  const cx = sx / sw;
-  const cy = sy / sw;
-  const radius = Math.min(cx, cy) - 0.5;
+  let cx = (sx + RED_EYE_CARRY * carry.x) / sw;
+  let cy = (sy + RED_EYE_CARRY * carry.y) / sw;
+  carry.x = x0 + cx;
+  carry.y = y0 + cy;
+  if (Math.hypot(cx - w / 2, cy - h / 2) >= Math.max(Math.min(w, h) / 2, (w + h) / 6)) {
+    cx = w / 2;
+    cy = h / 2;
+  }
+  const ax = x0 + cx;
+  const ay = y0 + cy;
+  const edgeX = Math.round(cx) > w / 2 ? w - cx + 0.5 : cx - 0.5;
+  const edgeY = Math.round(cy) > h / 2 ? h - cy + 0.5 : cy - 0.5;
+  const radius = ax > ay ? Math.min(edgeX, ay - 0.5) : Math.min(edgeY, ax - 0.5);
   if (!(radius > 0)) {
     return;
   }
+  const sorted = Float64Array.from(dark).sort();
+  const spread = sorted[Math.floor(0.7 * count)] - sorted[Math.floor(0.3 * count)];
+  let level = 0;
+  while (level < RED_EYE_SPREAD_STEPS.length && spread >= RED_EYE_SPREAD_STEPS[level]) {
+    level++;
+  }
+  const strength = RED_EYE_STRENGTHS[level];
   const sector = new Uint8Array(count);
   const distance = new Float64Array(count);
   const sectorSum = new Float64Array(RED_EYE_SECTORS);
@@ -16758,7 +16641,8 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
       const mean = sectorSum[s] / sectorCount[s];
       const meanDark = sectorDark[s] / sectorCount[s];
       const ratio = meanDark > 0 ? dark[k] / meanDark : 1;
-      const falloff = Math.max(redEyeFalloff(distance[k] / radius), RED_EYE_DARK_STRENGTH * Math.max(0, 1 - ratio / RED_EYE_DARK_RATIO));
+      const u = distance[k] / radius;
+      const falloff = Math.max(strength * (1 - u) * (1 - u), 0.5 * Math.max(0, 1 - ratio) ** 2);
       const rest = (1 - falloff) * mean;
       if (rest >= v) {
         continue;

package/dist/browser.mjs

@@ -16532,153 +16532,26 @@ function applyTint(src, hue, amount) {
 var TINT_FULL = 254;
 function applyRedEyeCorrection(src, width, height, areas) {
   const out = new Uint8ClampedArray(src);
+  const carry = { x: 0, y: 0 };
   for (const a of areas) {
-    correctRedEyeArea(out, width, clamp(a.left, 0, width), clamp(a.top, 0, height), clamp(a.right, 0, width), clamp(a.bottom, 0, height));
+    correctRedEyeArea(out, width, clamp(a.left, 0, width), clamp(a.top, 0, height), clamp(a.right, 0, width), clamp(a.bottom, 0, height), carry);
   }
   return out;
 }
-var RED_EYE_FALLOFF = new Float64Array(
-  [
-    24930,
-    24570,
-    24201,
-    23836,
-    23471,
-    23107,
-    22744,
-    22367,
-    21976,
-    21587,
-    21198,
-    20824,
-    20490,
-    20165,
-    19832,
-    19499,
-    19157,
-    18817,
-    18480,
-    18151,
-    17820,
-    17490,
-    17160,
-    16831,
-    16506,
-    16189,
-    15878,
-    15569,
-    15273,
-    14973,
-    14668,
-    14362,
-    14059,
-    13768,
-    13484,
-    13203,
-    12923,
-    12642,
-    12366,
-    12094,
-    11828,
-    11564,
-    11301,
-    11034,
-    10770,
-    10507,
-    10253,
-    10011,
-    9771,
-    9530,
-    9290,
-    9053,
-    8819,
-    8588,
-    8359,
-    8134,
-    7914,
-    7697,
-    7481,
-    7267,
-    7056,
-    6851,
-    6651,
-    6453,
-    6256,
-    6061,
-    5871,
-    5684,
-    5499,
-    5317,
-    5138,
-    4962,
-    4789,
-    4619,
-    4452,
-    4289,
-    4130,
-    3974,
-    3820,
-    3669,
-    3520,
-    3375,
-    3232,
-    3093,
-    2958,
-    2825,
-    2695,
-    2568,
-    2444,
-    2325,
-    2207,
-    2092,
-    1980,
-    1872,
-    1768,
-    1666,
-    1567,
-    1470,
-    1377,
-    1287,
-    1200,
-    1116,
-    1034,
-    956,
-    881,
-    808,
-    739,
-    674,
-    612,
-    541,
-    462,
-    381,
-    299,
-    220,
-    147,
-    85,
-    36,
-    3,
-    0
-  ].map((v) => v / 1e5)
-);
-function redEyeFalloff(u) {
-  const t = u * 128;
-  const i = Math.floor(t);
-  if (i >= RED_EYE_FALLOFF.length - 1) {
-    return 0;
-  }
-  return RED_EYE_FALLOFF[i] + (t - i) * (RED_EYE_FALLOFF[i + 1] - RED_EYE_FALLOFF[i]);
-}
 var RED_EYE_SECTORS = 60;
 var RED_EYE_BLUE_WEIGHT = 0.225;
-var RED_EYE_WEIGHT_CAP = 6;
-var RED_EYE_PURE_WEIGHT = RED_EYE_WEIGHT_CAP;
-var RED_EYE_DARK_STRENGTH = 0.49;
-var RED_EYE_DARK_RATIO = 0.6;
-var RED_EYE_GREEN_SHARE = 80 / 255;
-function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
+var RED_EYE_PURE_WEIGHT = 1 / (1 + RED_EYE_BLUE_WEIGHT);
+var RED_EYE_CARRY = 0.81;
+var RED_EYE_GREEN_SHARE = 5 / 16;
+var RED_EYE_SPREAD_STEPS = [31.5, 50, 98.78];
+var RED_EYE_STRENGTHS = [0.25, 0.5, 0.661, 0.75];
+function correctRedEyeArea(out, stride, x0, y0, x1, y1, carry) {
   const w = x1 - x0;
   const h = y1 - y0;
   const count = w * h;
+  if (!(count > 0)) {
+    return;
+  }
   const redness = new Float64Array(count);
   const dark = new Float64Array(count);
   let sx = 0;
@@ -16691,34 +16564,44 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
       const g = out[i + 1];
       const b = out[i + 2];
       const k = y * w + x;
-      dark[k] = Math.min(g, b);
+      const d = g + RED_EYE_BLUE_WEIGHT * b;
+      dark[k] = d;
       const v = r - Math.max(g, b);
       if (v > 0) {
         redness[k] = v;
-        const denominator = g + RED_EYE_BLUE_WEIGHT * b;
-        {
-          const weight = denominator >= 1 ? Math.min(RED_EYE_WEIGHT_CAP, v / denominator) : RED_EYE_PURE_WEIGHT;
-          sx += weight * (x + 0.5);
-          sy += weight * (y + 0.5);
-          sw += weight;
-        }
+        const weight = d >= 1 ? v / d : RED_EYE_PURE_WEIGHT;
+        sx += weight * (x + 0.5);
+        sy += weight * (y + 0.5);
+        sw += weight;
       }
     }
   }
   if (sw === 0) {
-    if (!redness.some((v) => v > 0)) {
-      return;
-    }
-    sx = w / 2;
-    sy = h / 2;
-    sw = 1;
+    return;
   }
-  const cx = sx / sw;
-  const cy = sy / sw;
-  const radius = Math.min(cx, cy) - 0.5;
+  let cx = (sx + RED_EYE_CARRY * carry.x) / sw;
+  let cy = (sy + RED_EYE_CARRY * carry.y) / sw;
+  carry.x = x0 + cx;
+  carry.y = y0 + cy;
+  if (Math.hypot(cx - w / 2, cy - h / 2) >= Math.max(Math.min(w, h) / 2, (w + h) / 6)) {
+    cx = w / 2;
+    cy = h / 2;
+  }
+  const ax = x0 + cx;
+  const ay = y0 + cy;
+  const edgeX = Math.round(cx) > w / 2 ? w - cx + 0.5 : cx - 0.5;
+  const edgeY = Math.round(cy) > h / 2 ? h - cy + 0.5 : cy - 0.5;
+  const radius = ax > ay ? Math.min(edgeX, ay - 0.5) : Math.min(edgeY, ax - 0.5);
   if (!(radius > 0)) {
     return;
   }
+  const sorted = Float64Array.from(dark).sort();
+  const spread = sorted[Math.floor(0.7 * count)] - sorted[Math.floor(0.3 * count)];
+  let level = 0;
+  while (level < RED_EYE_SPREAD_STEPS.length && spread >= RED_EYE_SPREAD_STEPS[level]) {
+    level++;
+  }
+  const strength = RED_EYE_STRENGTHS[level];
   const sector = new Uint8Array(count);
   const distance = new Float64Array(count);
   const sectorSum = new Float64Array(RED_EYE_SECTORS);
@@ -16756,7 +16639,8 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
       const mean = sectorSum[s] / sectorCount[s];
       const meanDark = sectorDark[s] / sectorCount[s];
       const ratio = meanDark > 0 ? dark[k] / meanDark : 1;
-      const falloff = Math.max(redEyeFalloff(distance[k] / radius), RED_EYE_DARK_STRENGTH * Math.max(0, 1 - ratio / RED_EYE_DARK_RATIO));
+      const u = distance[k] / radius;
+      const falloff = Math.max(strength * (1 - u) * (1 - u), 0.5 * Math.max(0, 1 - ratio) ** 2);
       const rest = (1 - falloff) * mean;
       if (rest >= v) {
         continue;

package/dist/index.js

@@ -16535,153 +16535,26 @@ function applyTint(src, hue, amount) {
 var TINT_FULL = 254;
 function applyRedEyeCorrection(src, width, height, areas) {
   const out = new Uint8ClampedArray(src);
+  const carry = { x: 0, y: 0 };
   for (const a of areas) {
-    correctRedEyeArea(out, width, clamp(a.left, 0, width), clamp(a.top, 0, height), clamp(a.right, 0, width), clamp(a.bottom, 0, height));
+    correctRedEyeArea(out, width, clamp(a.left, 0, width), clamp(a.top, 0, height), clamp(a.right, 0, width), clamp(a.bottom, 0, height), carry);
   }
   return out;
 }
-var RED_EYE_FALLOFF = new Float64Array(
-  [
-    24930,
-    24570,
-    24201,
-    23836,
-    23471,
-    23107,
-    22744,
-    22367,
-    21976,
-    21587,
-    21198,
-    20824,
-    20490,
-    20165,
-    19832,
-    19499,
-    19157,
-    18817,
-    18480,
-    18151,
-    17820,
-    17490,
-    17160,
-    16831,
-    16506,
-    16189,
-    15878,
-    15569,
-    15273,
-    14973,
-    14668,
-    14362,
-    14059,
-    13768,
-    13484,
-    13203,
-    12923,
-    12642,
-    12366,
-    12094,
-    11828,
-    11564,
-    11301,
-    11034,
-    10770,
-    10507,
-    10253,
-    10011,
-    9771,
-    9530,
-    9290,
-    9053,
-    8819,
-    8588,
-    8359,
-    8134,
-    7914,
-    7697,
-    7481,
-    7267,
-    7056,
-    6851,
-    6651,
-    6453,
-    6256,
-    6061,
-    5871,
-    5684,
-    5499,
-    5317,
-    5138,
-    4962,
-    4789,
-    4619,
-    4452,
-    4289,
-    4130,
-    3974,
-    3820,
-    3669,
-    3520,
-    3375,
-    3232,
-    3093,
-    2958,
-    2825,
-    2695,
-    2568,
-    2444,
-    2325,
-    2207,
-    2092,
-    1980,
-    1872,
-    1768,
-    1666,
-    1567,
-    1470,
-    1377,
-    1287,
-    1200,
-    1116,
-    1034,
-    956,
-    881,
-    808,
-    739,
-    674,
-    612,
-    541,
-    462,
-    381,
-    299,
-    220,
-    147,
-    85,
-    36,
-    3,
-    0
-  ].map((v) => v / 1e5)
-);
-function redEyeFalloff(u) {
-  const t = u * 128;
-  const i = Math.floor(t);
-  if (i >= RED_EYE_FALLOFF.length - 1) {
-    return 0;
-  }
-  return RED_EYE_FALLOFF[i] + (t - i) * (RED_EYE_FALLOFF[i + 1] - RED_EYE_FALLOFF[i]);
-}
 var RED_EYE_SECTORS = 60;
 var RED_EYE_BLUE_WEIGHT = 0.225;
-var RED_EYE_WEIGHT_CAP = 6;
-var RED_EYE_PURE_WEIGHT = RED_EYE_WEIGHT_CAP;
-var RED_EYE_DARK_STRENGTH = 0.49;
-var RED_EYE_DARK_RATIO = 0.6;
-var RED_EYE_GREEN_SHARE = 80 / 255;
-function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
+var RED_EYE_PURE_WEIGHT = 1 / (1 + RED_EYE_BLUE_WEIGHT);
+var RED_EYE_CARRY = 0.81;
+var RED_EYE_GREEN_SHARE = 5 / 16;
+var RED_EYE_SPREAD_STEPS = [31.5, 50, 98.78];
+var RED_EYE_STRENGTHS = [0.25, 0.5, 0.661, 0.75];
+function correctRedEyeArea(out, stride, x0, y0, x1, y1, carry) {
   const w = x1 - x0;
   const h = y1 - y0;
   const count = w * h;
+  if (!(count > 0)) {
+    return;
+  }
   const redness = new Float64Array(count);
   const dark = new Float64Array(count);
   let sx = 0;
@@ -16694,34 +16567,44 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
       const g = out[i + 1];
       const b = out[i + 2];
       const k = y * w + x;
-      dark[k] = Math.min(g, b);
+      const d = g + RED_EYE_BLUE_WEIGHT * b;
+      dark[k] = d;
       const v = r - Math.max(g, b);
       if (v > 0) {
         redness[k] = v;
-        const denominator = g + RED_EYE_BLUE_WEIGHT * b;
-        {
-          const weight = denominator >= 1 ? Math.min(RED_EYE_WEIGHT_CAP, v / denominator) : RED_EYE_PURE_WEIGHT;
-          sx += weight * (x + 0.5);
-          sy += weight * (y + 0.5);
-          sw += weight;
-        }
+        const weight = d >= 1 ? v / d : RED_EYE_PURE_WEIGHT;
+        sx += weight * (x + 0.5);
+        sy += weight * (y + 0.5);
+        sw += weight;
       }
     }
   }
   if (sw === 0) {
-    if (!redness.some((v) => v > 0)) {
-      return;
-    }
-    sx = w / 2;
-    sy = h / 2;
-    sw = 1;
+    return;
   }
-  const cx = sx / sw;
-  const cy = sy / sw;
-  const radius = Math.min(cx, cy) - 0.5;
+  let cx = (sx + RED_EYE_CARRY * carry.x) / sw;
+  let cy = (sy + RED_EYE_CARRY * carry.y) / sw;
+  carry.x = x0 + cx;
+  carry.y = y0 + cy;
+  if (Math.hypot(cx - w / 2, cy - h / 2) >= Math.max(Math.min(w, h) / 2, (w + h) / 6)) {
+    cx = w / 2;
+    cy = h / 2;
+  }
+  const ax = x0 + cx;
+  const ay = y0 + cy;
+  const edgeX = Math.round(cx) > w / 2 ? w - cx + 0.5 : cx - 0.5;
+  const edgeY = Math.round(cy) > h / 2 ? h - cy + 0.5 : cy - 0.5;
+  const radius = ax > ay ? Math.min(edgeX, ay - 0.5) : Math.min(edgeY, ax - 0.5);
   if (!(radius > 0)) {
     return;
   }
+  const sorted = Float64Array.from(dark).sort();
+  const spread = sorted[Math.floor(0.7 * count)] - sorted[Math.floor(0.3 * count)];
+  let level = 0;
+  while (level < RED_EYE_SPREAD_STEPS.length && spread >= RED_EYE_SPREAD_STEPS[level]) {
+    level++;
+  }
+  const strength = RED_EYE_STRENGTHS[level];
   const sector = new Uint8Array(count);
   const distance = new Float64Array(count);
   const sectorSum = new Float64Array(RED_EYE_SECTORS);
@@ -16759,7 +16642,8 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
       const mean = sectorSum[s] / sectorCount[s];
       const meanDark = sectorDark[s] / sectorCount[s];
       const ratio = meanDark > 0 ? dark[k] / meanDark : 1;
-      const falloff = Math.max(redEyeFalloff(distance[k] / radius), RED_EYE_DARK_STRENGTH * Math.max(0, 1 - ratio / RED_EYE_DARK_RATIO));
+      const u = distance[k] / radius;
+      const falloff = Math.max(strength * (1 - u) * (1 - u), 0.5 * Math.max(0, 1 - ratio) ** 2);
       const rest = (1 - falloff) * mean;
       if (rest >= v) {
         continue;

package/dist/index.mjs

@@ -16533,153 +16533,26 @@ function applyTint(src, hue, amount) {
 var TINT_FULL = 254;
 function applyRedEyeCorrection(src, width, height, areas) {
   const out = new Uint8ClampedArray(src);
+  const carry = { x: 0, y: 0 };
   for (const a of areas) {
-    correctRedEyeArea(out, width, clamp(a.left, 0, width), clamp(a.top, 0, height), clamp(a.right, 0, width), clamp(a.bottom, 0, height));
+    correctRedEyeArea(out, width, clamp(a.left, 0, width), clamp(a.top, 0, height), clamp(a.right, 0, width), clamp(a.bottom, 0, height), carry);
   }
   return out;
 }
-var RED_EYE_FALLOFF = new Float64Array(
-  [
-    24930,
-    24570,
-    24201,
-    23836,
-    23471,
-    23107,
-    22744,
-    22367,
-    21976,
-    21587,
-    21198,
-    20824,
-    20490,
-    20165,
-    19832,
-    19499,
-    19157,
-    18817,
-    18480,
-    18151,
-    17820,
-    17490,
-    17160,
-    16831,
-    16506,
-    16189,
-    15878,
-    15569,
-    15273,
-    14973,
-    14668,
-    14362,
-    14059,
-    13768,
-    13484,
-    13203,
-    12923,
-    12642,
-    12366,
-    12094,
-    11828,
-    11564,
-    11301,
-    11034,
-    10770,
-    10507,
-    10253,
-    10011,
-    9771,
-    9530,
-    9290,
-    9053,
-    8819,
-    8588,
-    8359,
-    8134,
-    7914,
-    7697,
-    7481,
-    7267,
-    7056,
-    6851,
-    6651,
-    6453,
-    6256,
-    6061,
-    5871,
-    5684,
-    5499,
-    5317,
-    5138,
-    4962,
-    4789,
-    4619,
-    4452,
-    4289,
-    4130,
-    3974,
-    3820,
-    3669,
-    3520,
-    3375,
-    3232,
-    3093,
-    2958,
-    2825,
-    2695,
-    2568,
-    2444,
-    2325,
-    2207,
-    2092,
-    1980,
-    1872,
-    1768,
-    1666,
-    1567,
-    1470,
-    1377,
-    1287,
-    1200,
-    1116,
-    1034,
-    956,
-    881,
-    808,
-    739,
-    674,
-    612,
-    541,
-    462,
-    381,
-    299,
-    220,
-    147,
-    85,
-    36,
-    3,
-    0
-  ].map((v) => v / 1e5)
-);
-function redEyeFalloff(u) {
-  const t = u * 128;
-  const i = Math.floor(t);
-  if (i >= RED_EYE_FALLOFF.length - 1) {
-    return 0;
-  }
-  return RED_EYE_FALLOFF[i] + (t - i) * (RED_EYE_FALLOFF[i + 1] - RED_EYE_FALLOFF[i]);
-}
 var RED_EYE_SECTORS = 60;
 var RED_EYE_BLUE_WEIGHT = 0.225;
-var RED_EYE_WEIGHT_CAP = 6;
-var RED_EYE_PURE_WEIGHT = RED_EYE_WEIGHT_CAP;
-var RED_EYE_DARK_STRENGTH = 0.49;
-var RED_EYE_DARK_RATIO = 0.6;
-var RED_EYE_GREEN_SHARE = 80 / 255;
-function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
+var RED_EYE_PURE_WEIGHT = 1 / (1 + RED_EYE_BLUE_WEIGHT);
+var RED_EYE_CARRY = 0.81;
+var RED_EYE_GREEN_SHARE = 5 / 16;
+var RED_EYE_SPREAD_STEPS = [31.5, 50, 98.78];
+var RED_EYE_STRENGTHS = [0.25, 0.5, 0.661, 0.75];
+function correctRedEyeArea(out, stride, x0, y0, x1, y1, carry) {
   const w = x1 - x0;
   const h = y1 - y0;
   const count = w * h;
+  if (!(count > 0)) {
+    return;
+  }
   const redness = new Float64Array(count);
   const dark = new Float64Array(count);
   let sx = 0;
@@ -16692,34 +16565,44 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
       const g = out[i + 1];
       const b = out[i + 2];
       const k = y * w + x;
-      dark[k] = Math.min(g, b);
+      const d = g + RED_EYE_BLUE_WEIGHT * b;
+      dark[k] = d;
       const v = r - Math.max(g, b);
       if (v > 0) {
         redness[k] = v;
-        const denominator = g + RED_EYE_BLUE_WEIGHT * b;
-        {
-          const weight = denominator >= 1 ? Math.min(RED_EYE_WEIGHT_CAP, v / denominator) : RED_EYE_PURE_WEIGHT;
-          sx += weight * (x + 0.5);
-          sy += weight * (y + 0.5);
-          sw += weight;
-        }
+        const weight = d >= 1 ? v / d : RED_EYE_PURE_WEIGHT;
+        sx += weight * (x + 0.5);
+        sy += weight * (y + 0.5);
+        sw += weight;
       }
     }
   }
   if (sw === 0) {
-    if (!redness.some((v) => v > 0)) {
-      return;
-    }
-    sx = w / 2;
-    sy = h / 2;
-    sw = 1;
+    return;
   }
-  const cx = sx / sw;
-  const cy = sy / sw;
-  const radius = Math.min(cx, cy) - 0.5;
+  let cx = (sx + RED_EYE_CARRY * carry.x) / sw;
+  let cy = (sy + RED_EYE_CARRY * carry.y) / sw;
+  carry.x = x0 + cx;
+  carry.y = y0 + cy;
+  if (Math.hypot(cx - w / 2, cy - h / 2) >= Math.max(Math.min(w, h) / 2, (w + h) / 6)) {
+    cx = w / 2;
+    cy = h / 2;
+  }
+  const ax = x0 + cx;
+  const ay = y0 + cy;
+  const edgeX = Math.round(cx) > w / 2 ? w - cx + 0.5 : cx - 0.5;
+  const edgeY = Math.round(cy) > h / 2 ? h - cy + 0.5 : cy - 0.5;
+  const radius = ax > ay ? Math.min(edgeX, ay - 0.5) : Math.min(edgeY, ax - 0.5);
   if (!(radius > 0)) {
     return;
   }
+  const sorted = Float64Array.from(dark).sort();
+  const spread = sorted[Math.floor(0.7 * count)] - sorted[Math.floor(0.3 * count)];
+  let level = 0;
+  while (level < RED_EYE_SPREAD_STEPS.length && spread >= RED_EYE_SPREAD_STEPS[level]) {
+    level++;
+  }
+  const strength = RED_EYE_STRENGTHS[level];
   const sector = new Uint8Array(count);
   const distance = new Float64Array(count);
   const sectorSum = new Float64Array(RED_EYE_SECTORS);
@@ -16757,7 +16640,8 @@ function correctRedEyeArea(out, stride, x0, y0, x1, y1) {
       const mean = sectorSum[s] / sectorCount[s];
       const meanDark = sectorDark[s] / sectorCount[s];
       const ratio = meanDark > 0 ? dark[k] / meanDark : 1;
-      const falloff = Math.max(redEyeFalloff(distance[k] / radius), RED_EYE_DARK_STRENGTH * Math.max(0, 1 - ratio / RED_EYE_DARK_RATIO));
+      const u = distance[k] / radius;
+      const falloff = Math.max(strength * (1 - u) * (1 - u), 0.5 * Math.max(0, 1 - ratio) ** 2);
       const rest = (1 - falloff) * mean;
       if (rest >= v) {
         continue;

package/package.json

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