From b96472a830e032c03573e3e1c163b5140cf1e06d Mon Sep 17 00:00:00 2001 From: Lloyd Kupchanko Date: Sun, 25 Feb 2024 19:52:00 -0700 Subject: [PATCH] Pass arrays of colors to getColor() --- src/deltaE/deltaE2000.js | 3 +-- src/deltaE/deltaE76.js | 3 ++- src/deltaE/deltaECMC.js | 3 +-- src/deltaE/deltaEHCT.js | 3 +-- src/deltaE/deltaEITP.js | 3 +-- src/deltaE/deltaEJz.js | 3 +-- src/deltaE/deltaEOK.js | 3 +-- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/deltaE/deltaE2000.js b/src/deltaE/deltaE2000.js index 9ceab9a3a..ec54f00c8 100644 --- a/src/deltaE/deltaE2000.js +++ b/src/deltaE/deltaE2000.js @@ -25,8 +25,7 @@ function pow7 (x) { } export default function (color, sample, {kL = 1, kC = 1, kH = 1} = {}) { - color = getColor(color); - sample = getColor(sample); + [color, sample] = getColor([color, sample]); // Given this color as the reference // and the function parameter as the sample, diff --git a/src/deltaE/deltaE76.js b/src/deltaE/deltaE76.js index 99c344956..c5ef83bda 100644 --- a/src/deltaE/deltaE76.js +++ b/src/deltaE/deltaE76.js @@ -2,5 +2,6 @@ import distance from "../distance.js"; import getColor from "../getColor.js"; export default function deltaE76 (color, sample) { - return distance(getColor(color), getColor(sample), "lab"); + // Assume getColor() is called in the distance function + return distance(color, sample, "lab"); } diff --git a/src/deltaE/deltaECMC.js b/src/deltaE/deltaECMC.js index 07c3e45e3..09dec5ecf 100644 --- a/src/deltaE/deltaECMC.js +++ b/src/deltaE/deltaECMC.js @@ -14,8 +14,7 @@ const π = Math.PI; const d2r = π / 180; export default function (color, sample, {l = 2, c = 1} = {}) { - color = getColor(color); - sample = getColor(sample); + [color, sample] = getColor([color, sample]); // Given this color as the reference // and a sample, diff --git a/src/deltaE/deltaEHCT.js b/src/deltaE/deltaEHCT.js index 45ec7ed4c..686d14508 100644 --- a/src/deltaE/deltaEHCT.js +++ b/src/deltaE/deltaEHCT.js @@ -40,8 +40,7 @@ function convertUcsAb (coords) { * @return {number[]} */ export default function (color, sample) { - color = getColor(color); - sample = getColor(sample); + [color, sample] = getColor([color, sample]); let [ t1, a1, b1 ] = convertUcsAb(hct.from(color)); let [ t2, a2, b2 ] = convertUcsAb(hct.from(sample)); diff --git a/src/deltaE/deltaEITP.js b/src/deltaE/deltaEITP.js index 28e7638f5..33aaa834a 100644 --- a/src/deltaE/deltaEITP.js +++ b/src/deltaE/deltaEITP.js @@ -6,8 +6,7 @@ import getColor from "../getColor.js"; // formulae from ITU Rec. ITU-R BT.2124-0 export default function (color, sample) { - color = getColor(color); - sample = getColor(sample); + [color, sample] = getColor([color, sample]); // Given this color as the reference // and a sample, diff --git a/src/deltaE/deltaEJz.js b/src/deltaE/deltaEJz.js index e5878651a..aa25891f3 100644 --- a/src/deltaE/deltaEJz.js +++ b/src/deltaE/deltaEJz.js @@ -9,8 +9,7 @@ import getColor from "../getColor.js"; // gives good results. export default function (color, sample) { - color = getColor(color); - sample = getColor(sample); + [color, sample] = getColor([color, sample]); // Given this color as the reference // and a sample, diff --git a/src/deltaE/deltaEOK.js b/src/deltaE/deltaEOK.js index db145bbf6..2559c2d75 100644 --- a/src/deltaE/deltaEOK.js +++ b/src/deltaE/deltaEOK.js @@ -5,8 +5,7 @@ import oklab from "../spaces/oklab.js"; import getColor from "../getColor.js"; export default function (color, sample) { - color = getColor(color); - sample = getColor(sample); + [color, sample] = getColor([color, sample]); // Given this color as the reference // and a sample,