Update reference tests

JuliaImages · Sep 23, 2024 · b76cdfc · b76cdfc
1 parent 4b8c074
commit b76cdfc
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 121 deletions.
diff --git a/src/DitherPunk.jl b/src/DitherPunk.jl
@@ -2,7 +2,8 @@ module DitherPunk
 
 using Base: require_one_based_indexing
 using FixedPointNumbers: N0f8, floattype
-using ColorTypes: ColorTypes, AbstractGray, Color, Colorant, RGB, Gray, HSV, Lab, XYZ
+using ColorTypes: ColorTypes, AbstractGray, Color, Colorant
+using ColorTypes: RGB, HSV, Lab, XYZ, Gray, gray
 using Colors:
     DifferenceMetric,
     EuclideanDifferenceMetric,

diff --git a/src/colordiff.jl b/src/colordiff.jl
@@ -17,8 +17,15 @@ function _colordiff(a::Colorant, b::Colorant, m::FastEuclideanMetric)
     b = convert(RGB{N0f8}, b)
     return _colordiff(a, b, m)
 end
+# avoid method ambiguity
+function _colordiff(a::Color, b::Color, m::FastEuclideanMetric)
+    a = convert(RGB{N0f8}, a)
+    b = convert(RGB{N0f8}, b)
+    return _colordiff(a, b, m)
+end
+# TODO: safe coversion to RGB{N0f8} using clamp01
 
-# TODO: add fast metric for numberic inputs
+# TODO: add fast metric for numeric inputs
 
 # Performance can be gained by converting colors to the colorspace `colordiff`
 # operates in for a given metric

diff --git a/test/references/color/Bayer.txt b/test/references/color/Bayer.txt
diff --git a/test/references/color/Bayer_from_gray.txt b/test/references/color/Bayer_from_gray.txt
diff --git a/test/references/color/ClosestColor.txt b/test/references/color/ClosestColor.txt
diff --git a/test/references/color/ClosestColor_from_gray.txt b/test/references/color/ClosestColor_from_gray.txt
diff --git a/test/references/color/FloydSteinberg.txt b/test/references/color/FloydSteinberg.txt
diff --git a/test/references/color/FloydSteinberg_clamp_error.txt b/test/references/color/FloydSteinberg_clamp_error.txt
diff --git a/test/references/color/FloydSteinberg_from_gray.txt b/test/references/color/FloydSteinberg_from_gray.txt