resolve showcoloranttype issue. closes #13

NEWS.md

@@ -1,3 +1,10 @@
+# v0.3.1
+
+Small fixes:
+
+- Update some internals to comply with upstream changes to
+  ImageCore (v0.5.0) and ColorTypes (v0.6.6).
+
 # v0.3.0
 
 New functionality:

REQUIRE

@@ -1,6 +1,6 @@
 julia 0.6
 MappedArrays 0.0.3
-ImageCore 0.1.2
+ImageCore 0.5.0
 ImageTransformations 0.3.0
 ImageFiltering 0.1.4
 CoordinateTransformations 0.4.0
@@ -9,7 +9,7 @@ Rotations
 StaticArrays
 OffsetArrays
 IdentityRanges
-ColorTypes 0.4
+ColorTypes 0.6.6
 MLDataPattern 0.1.2
 ComputationalResources 0.0.2
 ShowItLikeYouBuildIt

src/operations/cache.jl

@@ -95,7 +95,7 @@ end
 function showconstruction(io::IO, op::CacheImageInto)
     print(io, "CacheImage(") # shows exported API
     print(io, "Array{")
-    ColorTypes.showcoloranttype(io, eltype(op.buffer))
+    _showcolor(io, eltype(op.buffer))
     print(io, "}(")
     print(io, join(map(i->string(length(i)), indices(op.buffer)), ", "))
     print(io, "))")

src/operations/channels.jl

@@ -145,14 +145,14 @@ end
 
 function showconstruction(io::IO, op::CombineChannels)
     print(io, typeof(op).name.name, '(')
-    ColorTypes.showcoloranttype(io, op.colortype)
+    _showcolor(io, op.colortype)
     print(io, ')')
 end
 
 function Base.show(io::IO, op::CombineChannels)
     if get(io, :compact, false)
         print(io, "Combine color channels into colorant ")
-        ColorTypes.showcoloranttype(io, op.colortype)
+        _showcolor(io, op.colortype)
     else
         print(io, "Augmentor.")
         showconstruction(io, op)

src/operations/convert.jl

@@ -65,14 +65,14 @@ end
 
 function showconstruction(io::IO, op::ConvertEltype)
     print(io, typeof(op).name.name, '(')
-    ColorTypes.showcoloranttype(io, op.eltype)
+    _showcolor(io, op.eltype)
     print(io, ')')
 end
 
 function Base.show(io::IO, op::ConvertEltype)
     if get(io, :compact, false)
         print(io, "Convert eltype to ")
-        ColorTypes.showcoloranttype(io, op.eltype)
+        _showcolor(io, op.eltype)
     else
         print(io, "Augmentor.")
         showconstruction(io, op)

src/utils.jl

@@ -124,6 +124,9 @@ function unionrange(i1::AbstractUnitRange, i2::AbstractUnitRange)
     map(min, first(i1), first(i2)):map(max, last(i1), last(i2))
 end
 
+@inline _showcolor(io::IO, T::Type{<:Number}) = print(io, T)
+@inline _showcolor(io::IO, T) = ColorTypes.colorant_string_with_eltype(io, T)
+
 # --------------------------------------------------------------------
 
 function _2dborder!(A::AbstractArray{T,3}, val::T) where T

test/operations/tst_cache.jl

@@ -47,7 +47,7 @@ end
     op = @inferred CacheImage(buf)
     @test Augmentor.CacheImageInto(buf) === op
     @test str_show(op) == "Augmentor.CacheImageInto(::Array{Gray{N0f8},2})"
-    @test_broken str_showconst(op) == "CacheImage(Array{Gray{N0f8}}(2, 3))"
+    @test str_showconst(op) == "CacheImage(Array{Gray{N0f8}}(2, 3))"
     op2 = @inferred CacheImage(Array{Gray{N0f8}}(2, 3))
     @test typeof(op) == typeof(op2)
     @test typeof(op.buffer) == typeof(op2.buffer)

test/operations/tst_channels.jl

@@ -71,10 +71,10 @@ end
         @test_throws MethodError CombineChannels(Float64)
         @test typeof(@inferred(CombineChannels(RGB))) <: CombineChannels <: Augmentor.Operation
         @test typeof(@inferred(CombineChannels(RGB{N0f8}))) <: CombineChannels <: Augmentor.Operation
-        @test_broken str_show(CombineChannels(RGB)) == "Augmentor.CombineChannels(RGB{Any})"
-        @test_broken str_show(CombineChannels(Gray{N0f8})) == "Augmentor.CombineChannels(Gray{N0f8})"
-        @test_broken str_showconst(CombineChannels(RGB{N0f8})) == "CombineChannels(RGB{N0f8})"
-        @test_broken str_showcompact(CombineChannels(Gray)) == "Combine color channels into colorant Gray{Any}"
+        @test str_show(CombineChannels(RGB)) == "Augmentor.CombineChannels(RGB{Any})"
+        @test str_show(CombineChannels(Gray{N0f8})) == "Augmentor.CombineChannels(Gray{N0f8})"
+        @test str_showconst(CombineChannels(RGB{N0f8})) == "CombineChannels(RGB{N0f8})"
+        @test str_showcompact(CombineChannels(Gray)) == "Combine color channels into colorant Gray{Any}"
     end
     @testset "eager" begin
         @test Augmentor.supports_eager(CombineChannels) === false

test/operations/tst_convert.jl

@@ -9,12 +9,12 @@
         @test typeof(@inferred(ConvertEltype(RGB))) <: ConvertEltype <: Augmentor.Operation
         @test typeof(@inferred(ConvertEltype(RGB{N0f8}))) <: ConvertEltype <: Augmentor.Operation
         @test str_show(ConvertEltype(Float64)) == "Augmentor.ConvertEltype(Float64)"
-        @test_broken str_show(ConvertEltype(RGB)) == "Augmentor.ConvertEltype(RGB{Any})"
-        @test_broken str_show(ConvertEltype(Gray{N0f8})) == "Augmentor.ConvertEltype(Gray{N0f8})"
+        @test str_show(ConvertEltype(RGB)) == "Augmentor.ConvertEltype(RGB{Any})"
+        @test str_show(ConvertEltype(Gray{N0f8})) == "Augmentor.ConvertEltype(Gray{N0f8})"
         @test str_showconst(ConvertEltype(Float64)) == "ConvertEltype(Float64)"
-        @test_broken str_showconst(ConvertEltype(RGB{N0f8})) == "ConvertEltype(RGB{N0f8})"
+        @test str_showconst(ConvertEltype(RGB{N0f8})) == "ConvertEltype(RGB{N0f8})"
         @test str_showcompact(ConvertEltype(Float64)) == "Convert eltype to Float64"
-        @test_broken str_showcompact(ConvertEltype(Gray)) == "Convert eltype to Gray{Any}"
+        @test str_showcompact(ConvertEltype(Gray)) == "Convert eltype to Gray{Any}"
     end
     @testset "eager" begin
         @test Augmentor.supports_eager(ConvertEltype) === true