CompatHelper: bump compat for "ImageCore" to "0.9" (#213)

* CompatHelper: bump compat for "ImageCore" to "0.9"

* upgrade to ImageCore 0.9
and remove direct dependency to ColorVectorSpace

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Johnny Chen <[email protected]>

Author: github-actions[bot]

Project.toml

@@ -5,7 +5,6 @@ version = "0.6.21"
 
 [deps]
 CatIndices = "aafaddc9-749c-510e-ac4f-586e18779b91"
-ColorVectorSpace = "c3611d14-8923-5661-9e6a-0046d554d3a4"
 ComputationalResources = "ed09eef8-17a6-5b46-8889-db040fac31e3"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 FFTViews = "4f61f5a4-77b1-5117-aa51-3ab5ef4ef0cd"
@@ -21,12 +20,11 @@ TiledIteration = "06e1c1a7-607b-532d-9fad-de7d9aa2abac"
 
 [compat]
 CatIndices = "0.2"
-ColorVectorSpace = "0.6, 0.7, 0.8, 0.9"
 ComputationalResources = "0.3"
 DataStructures = "0.17.7, 0.18"
 FFTViews = "0.3"
 FFTW = "0.3, 1"
-ImageCore = "0.8.1"
+ImageCore = "0.9"
 ImageMetadata = "0.9"
 OffsetArrays = "1.1"
 Requires = "0.5, 1.0"

src/ImageFiltering.jl

@@ -6,7 +6,6 @@ using ImageCore, FFTViews, OffsetArrays, StaticArrays, ComputationalResources, T
 # using FixedPointNumbers: Normed, N0f8 # reexported by ImageCore
 using ImageCore.MappedArrays
 using Statistics, LinearAlgebra
-using ColorVectorSpace  # for filtering RGB arrays
 using Base: Indices, tail, fill_to_length, @pure, depwarn, @propagate_inbounds
 using OffsetArrays: IdentityUnitRange   # using the one in OffsetArrays makes this work with multiple Julia versions
 using Requires

test/2d.jl

@@ -1,4 +1,4 @@
-using ImageFiltering, ImageCore, OffsetArrays, FFTViews, ColorVectorSpace, ComputationalResources
+using ImageFiltering, ImageCore, OffsetArrays, FFTViews, ComputationalResources
 using LinearAlgebra
 using Test
 using ImageFiltering: IdentityUnitRange

test/compat.jl

@@ -0,0 +1,15 @@
+# patch for ColorVectorSpace 0.9
+# for CVS < 0.9, we can just use the fallback solution in Distances
+if isdefined(ImageCore.ColorVectorSpace, :⊙)
+    # Because how abs2 calculated in color vector space is ambiguious, abs2(::RGB) is un-defined
+    # since ColorVectorSpace 0.9
+    # https://github.com/JuliaGraphics/ColorVectorSpace.jl/pull/131
+    _abs2(c::Colorant) = mapreducec(abs2, +, 0, c)
+    _abs2(x::Number) = abs2(x)
+
+    _abs(c::Colorant) = mapreducec(abs, +, 0, c)
+    _abs(x::Number) = abs(x)
+else
+    _abs2(c::Union{Colorant, Number}) = abs2(c)
+    _abs(x::Number) = abs(x)
+end

test/gradient.jl

@@ -1,4 +1,4 @@
-using ImageFiltering, ImageCore, ColorVectorSpace
+using ImageFiltering, ImageCore
 using Test
 
 @testset "gradient" begin
@@ -15,10 +15,10 @@ using Test
                            Kernel.ando4, Kernel.ando5, Kernel.scharr, Kernel.bickley)
             gy, gx = @inferred(imgradients(img, kernelfunc, Inner()))
             for val in gy
-                @test abs(val - ey) < 1e-4
+                @test _abs(val - ey) < 1e-4
             end
             for val in gx
-                @test abs(val - ex) < 1e-4
+                @test _abs(val - ex) < 1e-4
             end
             gy, gx = imgradients(img, kernelfunc, Pad(:replicate))
             @test axes(gy) == axes(gx) == axes(img)
@@ -39,10 +39,10 @@ using Test
             ky, kx = fk()
             gy, gx = imfilter(img, ky, Inner()), imfilter(img, kx, Inner())
             for val in gy
-                @test abs(val - ey) < 1e-4
+                @test _abs(val - ey) < 1e-4
             end
             for val in gx
-                @test abs(val - ex) < 1e-4
+                @test _abs(val - ex) < 1e-4
             end
         end
     end
@@ -57,13 +57,13 @@ using Test
                            Kernel.scharr, Kernel.bickley)
             gy, gx, gz = @inferred(imgradients(img, kernelfunc, Inner()))
             for val in gy
-                @test abs(val - ey) < 1e-4
+                @test _abs(val - ey) < 1e-4
             end
             for val in gx
-                @test abs(val - ex) < 1e-4
+                @test _abs(val - ex) < 1e-4
             end
             for val in gz
-                @test abs(val - ez) < 1e-4
+                @test _abs(val - ez) < 1e-4
             end
         end
     end

test/runtests.jl

@@ -1,4 +1,5 @@
-using ImageFiltering, Test
+using ImageFiltering, ImageCore
+using Test
 import StaticArrays
 using Random
 
@@ -18,6 +19,7 @@ function typestring(::Type{T}) where T   # from https://github.com/JuliaImages/I
     String(take!(buf))
 end
 
+include("compat.jl")
 include("border.jl")
 include("nd.jl")
 include("2d.jl")

test/triggs.jl

@@ -49,12 +49,13 @@ using Test
         x = -2:2
         y = (-3:3)'
         kernel = KernelFactors.IIRGaussian((σ, σ))
+
         for img in (imgf, imgg, imgc)
             imgcmp = img[3,4] .* exp.(-(x.^2 .+ y.^2)/(2*σ^2))/(σ^2*2*pi)
             border = Fill(zero(eltype(img)))
             img0 = copy(img)
             imgfilt = @inferred(imfilter(img, kernel, border))
-            @test sum(abs2, imgcmp - imgfilt) < 0.2^2*sum(abs2, imgcmp)
+            @test sum(_abs2, imgcmp - imgfilt) < 0.2^2*sum(_abs2, imgcmp)
             @test img == img0
             @test imgfilt != img
         end