Fix mapwindow for offset arrays

JuliaImages · May 25, 2020 · 77cb511 · 77cb511
1 parent 8c9f173
commit 77cb511
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/mapwindow.jl b/src/mapwindow.jl
@@ -210,9 +210,6 @@ function _indices_of_interiour_range(
     idx1 = _intersectionindices(fullimgr, kmin .+ imgr)
     idx2 = _intersectionindices(fullimgr, kmax .+ imgr)
     idx = intersect(idx1, idx2)
-    @assert imgr[idx] .+ kmin ⊆ fullimgr
-    @assert imgr[idx] .+ kmax ⊆ fullimgr
-    idx
 end
 
 function _indices_of_interiour_indices(fullimginds, imginds, kerinds)
@@ -375,7 +372,7 @@ extrema_filter(A::AbstractArray, window) = error("`window` must have the same nu
 
 extrema_filter(A::AbstractArray{T,N}, window::Integer) where {T,N} = extrema_filter(A, ntuple(d->window, Val{N}))
 
-function _extrema_filter!(A::Array, w1, w...)
+function _extrema_filter!(A::AbstractArray, w1, w...)
     if w1 > 1
         a = first(A)
         if w1 <= 20
@@ -396,7 +393,7 @@ function _extrema_filter!(A::Array, w1, w...)
         return A
     end
 end
-_extrema_filter!(A::Array) = A
+_extrema_filter!(A::AbstractArray) = A
 
 # Extrema-filtering along "columns" (dimension 1). This implements Lemire
 # Algorithm 1, with the following modifications:

diff --git a/test/mapwindow.jl b/test/mapwindow.jl
@@ -1,5 +1,6 @@
 using ImageFiltering, Statistics, Test
 using ImageFiltering: IdentityUnitRange
+using OffsetArrays
 
 @testset "mapwindow" begin
     function groundtruth(f, A, window::Tuple)
@@ -71,6 +72,19 @@ using ImageFiltering: IdentityUnitRange
         Amin = groundtruth(min, A, w)
         @test minval == Amin
     end
+    # offsets
+    @testset "offsets" begin
+        arrays = [rand(5), rand(5,5), rand(5,5,5)]
+        @testset "offsets ($f, $offset, $window, $dim)" for f in (extrema,maximum,minimum),
+                                                            offset in -5:5,
+                                                            window in [1:2:9; [0:2,-2:0]],
+                                                            (dim,a) in enumerate(arrays)
+            offsets = ntuple(_->offset,dim)
+            windows = ntuple(_->window,dim)
+            @test OffsetArray(mapwindow(f,a,windows),offsets) == mapwindow(f,OffsetArray(a,offsets),windows)
+        end
+    end
+
 
     # median
     for f in (median, median!)