Support non-1 indices

REQUIRE

@@ -1,5 +1,5 @@
 julia 0.5
-Compat 0.18.0
+Compat 0.24
 FixedPointNumbers 0.3.0
 ColorTypes 0.2.7
 Images 0.6

src/ImageMagick.jl

@@ -228,8 +228,7 @@ mapIM(x::Normed) = x
 # Make the data contiguous in memory, this is necessary for
 # imagemagick since it doesn't handle stride.
 to_contiguous(A::Array) = A
-to_contiguous(A::AbstractArray) = convert(Array, A)
-to_contiguous(A::SubArray) = copy(A)
+to_contiguous(A::AbstractArray) = Compat.collect(A)
 to_contiguous(A::BitArray) = convert(Array{N0f8}, A)
 to_contiguous(A::ColorView) = to_contiguous(channelview(A))
 

test/constructed_images.jl

@@ -1,4 +1,4 @@
-using ImageMagick, ColorTypes, FixedPointNumbers, IndirectArrays, FileIO
+using ImageMagick, ColorTypes, FixedPointNumbers, IndirectArrays, FileIO, OffsetArrays
 using Images       # for show(io, ::MIME, img) & ImageMeta
 using Compat       # for I/O redirection
 using Base.Test
@@ -99,13 +99,13 @@ type TestType end
         b = RGB(0,0,1)
         w = RGB(1,1,1)
         r = RGB(1,0,0)
-        cmaprgb = Array(RGB{Float64}, 255)
+        cmaprgb = Array{RGB{Float64}}(255)
         f = linspace(0,1,128)
         cmaprgb[1:128] = [(1-x)*b + x*w for x in f]
         cmaprgb[129:end] = [(1-x)*w + x*r for x in f[2:end]]
         img = IndirectArray(dataint, cmaprgb)
         ImageMagick.save(joinpath(workdir,"cmap.jpg"), img)
-        cmaprgb = Array(RGB, 255) # poorly-typed cmap, issue #336
+        cmaprgb = Array{RGB}(255) # poorly-typed cmap, Images issue #336
         cmaprgb[1:128] = [(1-x)*b + x*w for x in f]
         cmaprgb[129:end] = [(1-x)*w + x*r for x in f[2:end]]
         img = IndirectArray(dataint, cmaprgb)
@@ -268,6 +268,14 @@ type TestType end
         imgr = ImageMagick.load(fn)
         @test imgr == img
     end
+
+    @testset "OffsetArrays" begin
+        img = OffsetArray([true false; false true], 0:1, 3:4)
+        fn = joinpath(workdir, "indices.png")
+        ImageMagick.save(fn, img)
+        imgr = ImageMagick.load(fn)
+        @test imgr == parent(img)
+    end
 end
 
 nothing

test/runtests.jl

@@ -4,3 +4,8 @@ info("ImageMagick version ", ImageMagick.libversion)
 
 include("constructed_images.jl")
 include("readremote.jl")
+
+workdir = joinpath(tempdir(), "Images")
+try
+    rm(workdir, recursive=true)
+end