Add some compatibility for current releases of ColorTypes

Author: timholy

src/ColorVectorSpace.jl

@@ -31,6 +31,30 @@ export RGBRGB, nan, dotc, dot, ⋅, hadamard, ⊙, tensor, ⊗, norm, varmult
 
 MathTypes{T,C} = Union{AbstractRGB{T},TransparentRGB{C,T},AbstractGray{T},TransparentGray{C,T}}
 
+## Version compatibility with ColorTypes
+
+if !hasmethod(zero, (Type{AGray{N0f8}},))
+    zero(::Type{C}) where {C<:TransparentGray} = C(0,0)
+    zero(::Type{C}) where {C<:AbstractRGB}     = C(0,0,0)
+    zero(::Type{C}) where {C<:TransparentRGB}  = C(0,0,0,0)
+    zero(p::Colorant) = zero(typeof(p))
+end
+
+if !hasmethod(one, (Gray{N0f8},))
+    Base.one(::Type{C}) where {C<:AbstractGray}    = C(1)
+    Base.one(::Type{C}) where {C<:TransparentGray} = C(1,1)
+    Base.one(::Type{C}) where {C<:AbstractRGB}     = C(1,1,1)
+    Base.one(::Type{C}) where {C<:TransparentRGB}  = C(1,1,1,1)
+    Base.one(p::Colorant) = one(typeof(p))
+end
+
+if !hasmethod(oneunit, (Type{AGray{N0f8}},))
+    oneunit(::Type{C}) where {C<:TransparentGray} = C(1,1)
+    oneunit(::Type{C}) where {C<:AbstractRGB}     = C(1,1,1)
+    oneunit(::Type{C}) where {C<:TransparentRGB}  = C(1,1,1,1)
+    oneunit(p::Colorant) = oneunit(typeof(p))
+end
+
 ## Traits and key utilities
 
 # Return types for arithmetic operations
@@ -264,15 +288,15 @@ min(a::AbstractGray, b::Number) = min(promote(a,b)...)
 atan(x::AbstractGray, y::AbstractGray)  = atan(gray(x), gray(y))
 hypot(x::AbstractGray, y::AbstractGray) = hypot(gray(x), gray(y))
 
-if !hasmethod(<, Tuple{AbstractGray,AbstractGray})  # this was moved to ColorTypes 0.11
+if !hasmethod(<, Tuple{AbstractGray,AbstractGray})  # planned for ColorTypes 0.11
     (<)(g1::AbstractGray, g2::AbstractGray) = gray(g1) < gray(g2)
     (<)(c::AbstractGray, r::Real) = gray(c) < r
     (<)(r::Real, c::AbstractGray) = r < gray(c)
 end
 if !hasmethod(isless, Tuple{AbstractGray,AbstractGray})  # this was moved to ColorTypes 0.10
     isless(g1::AbstractGray, g2::AbstractGray) = isless(gray(g1), gray(g2))
 end
-if !hasmethod(isless, Tuple{AbstractGray,Real})  # this was moved to ColorTypes 0.11
+if !hasmethod(isless, Tuple{AbstractGray,Real})  # planned for ColorTypes 0.11
     isless(c::AbstractGray, r::Real) = isless(gray(c), r)
     isless(r::Real, c::AbstractGray) = isless(r, gray(c))
 end

test/runtests.jl

@@ -23,10 +23,11 @@ end
         for x in (0.5, 0.5f0, NaN, NaN32, N0f8(0.5))
             @test @inferred(convert(Gray{typeof(x)}, x))  === @inferred(convert(Gray, x))  === Gray(x)
             @test @inferred(convert(RGB{typeof(x)}, x))   === @inferred(convert(RGB, x))   === RGB(x, x, x)
-            @test @inferred(convert(AGray{typeof(x)}, x)) === @inferred(convert(AGray, x)) === AGray(x, 1)
-            @test @inferred(convert(ARGB{typeof(x)}, x))  === @inferred(convert(ARGB, x))  === ARGB(x, x, x, 1)
-            @test @inferred(convert(GrayA{typeof(x)}, x)) === @inferred(convert(GrayA, x)) === GrayA(x, 1)
-            @test @inferred(convert(RGBA{typeof(x)}, x))  === @inferred(convert(RGBA, x))  === RGBA(x, x, x, 1)
+            # These should be fixed by a future release of ColorTypes
+            @test_broken @inferred(convert(AGray{typeof(x)}, x)) === @inferred(convert(AGray, x)) === AGray(x, 1)
+            @test_broken @inferred(convert(ARGB{typeof(x)}, x))  === @inferred(convert(ARGB, x))  === ARGB(x, x, x, 1)
+            @test_broken @inferred(convert(GrayA{typeof(x)}, x)) === @inferred(convert(GrayA, x)) === GrayA(x, 1)
+            @test_broken @inferred(convert(RGBA{typeof(x)}, x))  === @inferred(convert(RGBA, x))  === RGBA(x, x, x, 1)
         end
     end