use OffsetArrays.centered (#214)

Author: johnnychen94

Project.toml

@@ -12,7 +12,7 @@ FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
 ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
-Requires = "ae029012-a4dd-5104-9daa-d747884805df"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
@@ -25,9 +25,8 @@ DataStructures = "0.17.7, 0.18"
 FFTViews = "0.3"
 FFTW = "0.3, 1"
 ImageCore = "0.9"
-ImageMetadata = "0.9"
-OffsetArrays = "1.1"
-Requires = "0.5, 1.0"
+OffsetArrays = "1.9"
+Reexport = "1.1"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
 TiledIteration = "0.2, 0.3"
 julia = "1"

src/ImageFiltering.jl

@@ -8,8 +8,10 @@ using ImageCore.MappedArrays
 using Statistics, LinearAlgebra
 using Base: Indices, tail, fill_to_length, @pure, depwarn, @propagate_inbounds
 using OffsetArrays: IdentityUnitRange   # using the one in OffsetArrays makes this work with multiple Julia versions
-using Requires
 using SparseArrays   # only needed to fix an ambiguity in borderarray
+using Reexport
+
+@reexport using OffsetArrays: centered # this method once lived here
 
 export Kernel, KernelFactors,
     Pad, Fill, Inner, NA, NoPad,
@@ -97,13 +99,6 @@ function __init__()
     #     @eval using DummyAF
     # end
     pop!(LOAD_PATH)
-    @require AxisArrays="39de3d68-74b9-583c-8d2d-e117c070f3a9" begin
-        centered(ax::AxisArrays.Axis{name}) where name = AxisArrays.Axis{name}(centered(ax.val))
-        centered(a::AxisArrays.AxisArray) = AxisArrays.AxisArray(centered(a.data), centered.(AxisArrays.axes(a)))
-    end
-    @require ImageMetadata="bc367c6b-8a6b-528e-b4bd-a4b897500b49" begin
-        centered(a::ImageMetadata.ImageMeta) = ImageMetadata.ImageMeta(centered(ImageMetadata.arraydata(a)), ImageMetadata.properties(a))
-    end
 end
 
 if Base.VERSION >= v"1.4.2"

src/utils.jl

@@ -1,21 +1,3 @@
-"""
-    shiftedkernel = centered(kernel)
-
-Shift the origin-of-coordinates to the center of `kernel`.
-The center-element of `kernel` will be accessed by `shiftedkernel[0, 0, ...]`.
-
-This function makes it easy to supply kernels using regular Arrays,
-and provides compatibility with other languages that do not support
-arbitrary axes.
-
-See also: [`imfilter`](@ref).
-"""
-function centered(A::AbstractArray)
-    offsetted = first.(axes(A)) .- 1
-    total_offsets = .-((size(A) .+ 1 ) .÷ 2)
-    OffsetArray(A, total_offsets .- offsetted)
-end
-
 """
     kernfft = freqkernel([T::Type], kern, sz=size(kern); rfft=false)