Pass arrays of colors to getColor()

color-js · Feb 26, 2024 · b96472a · b96472a
1 parent e3f867b
commit b96472a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,