Merge pull request #33 from JuliaImages/mdhe1248-jerry/AxisArray_test

Fix scalar CartesianIndex

src/ImageMetadata.jl

@@ -90,11 +90,16 @@ for AType in (ImageMeta, ImageMetaAxis)
 end
 
 @inline function Base.getindex(img::ImageMetaAxis, ax::Axis, I...)
-    copyproperties(img, img.data[ax, I...])
+    result = img.data[ax, I...]
+    maybe_wrap(img, result)
 end
 @inline function Base.getindex(img::ImageMetaAxis, i::Union{Integer,AbstractVector,Colon}, I...)
-    copyproperties(img, img.data[i, I...])
+    result = img.data[i, I...]
+    maybe_wrap(img, result)
 end
+maybe_wrap(img::ImageMeta{T}, result::T) where T = result
+maybe_wrap(img::ImageMeta{T}, result::AbstractArray{T}) where T = copyproperties(img, result)
+
 
 @inline function Base.setindex!(img::ImageMetaAxis, val, ax::Axis, I...)
     setindex!(img.data, val, ax, I...)

test/core.jl

@@ -358,4 +358,13 @@ end
     @inferred cv[1,1,1]
 end
 
+@testset "AxisArray_CartesianIndex" begin
+    M = reshape([1,2,3,4], 2,2)
+    M = AxisArray(M)
+    img = ImageMeta(M)
+    @test 1 == img[1, CartesianIndex(1)] #Int and cartesianindex
+    @test maximum(img,dims=2) == reshape([3,4],2,1)
+    @test mean(img,dims=1) == reshape([1.5,3.5], 1,2)
+end
+
 nothing