Skip to content

Commit 029da07

Browse files
committed
Rename package to ImageFiltering. Closes #1.
1 parent 535a135 commit 029da07

22 files changed

+49
-48
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ notifications:
1111
# uncomment the following lines to override the default test script
1212
#script:
1313
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
14-
# - julia -e 'Pkg.clone(pwd()); Pkg.build("ImagesFiltering"); Pkg.test("ImagesFiltering"; coverage=true)'
14+
# - julia -e 'Pkg.clone(pwd()); Pkg.build("ImageFiltering"); Pkg.test("ImageFiltering"; coverage=true)'
1515
after_success:
1616
# push coverage results to Coveralls
17-
- julia -e 'cd(Pkg.dir("ImagesFiltering")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
17+
- julia -e 'cd(Pkg.dir("ImageFiltering")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
1818
# push coverage results to Codecov
19-
- julia -e 'cd(Pkg.dir("ImagesFiltering")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
19+
- julia -e 'cd(Pkg.dir("ImageFiltering")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The ImagesFiltering.jl package is licensed under the MIT "Expat" License:
1+
The ImageFiltering.jl package is licensed under the MIT "Expat" License:
22

33
> Copyright (c) 2016: Tim Holy.
44
>

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# ImagesFiltering
1+
# ImageFiltering
22

3-
[![Build Status](https://travis-ci.org/JuliaImages/ImagesFiltering.jl.svg?branch=master)](https://travis-ci.org/JuliaImages/ImagesFiltering.jl)
3+
[![Build Status](https://travis-ci.org/JuliaImages/ImageFiltering.jl.svg?branch=master)](https://travis-ci.org/JuliaImages/ImageFiltering.jl)
44

5-
[![Coverage Status](https://coveralls.io/repos/JuliaImages/ImagesFiltering.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/JuliaImages/ImagesFiltering.jl?branch=master)
5+
[![Coverage Status](https://coveralls.io/repos/JuliaImages/ImageFiltering.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/JuliaImages/ImageFiltering.jl?branch=master)
66

7-
[![codecov.io](http://codecov.io/github/JuliaImages/ImagesFiltering.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaImages/ImagesFiltering.jl?branch=master)
7+
[![codecov.io](http://codecov.io/github/JuliaImages/ImageFiltering.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaImages/ImageFiltering.jl?branch=master)

REQUIRE

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
julia 0.5-
22
Colors
33
ColorVectorSpace
4-
ImagesCore
4+
ImageCore
55
OffsetArrays
66
CatIndices
77
StaticArrays
88
MappedArrays
99
FFTViews
1010
ComputationalResources
1111
DataStructures
12+
TiledIteration

appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ build_script:
2828
# Need to convert from shallow to complete for Pkg.clone to work
2929
- IF EXIST .git\shallow (git fetch --unshallow)
3030
- C:\projects\julia\bin\julia -e "versioninfo();
31-
Pkg.clone(pwd(), \"ImagesFiltering\"); Pkg.build(\"ImagesFiltering\")"
31+
Pkg.clone(pwd(), \"ImageFiltering\"); Pkg.build(\"ImageFiltering\")"
3232

3333
test_script:
34-
- C:\projects\julia\bin\julia -e "Pkg.test(\"ImagesFiltering\")"
34+
- C:\projects\julia\bin\julia -e "Pkg.test(\"ImageFiltering\")"

docs/make.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Documenter, ImagesFiltering
1+
using Documenter, ImageFiltering
22

3-
makedocs(modules = [ImagesFiltering, Kernel, KernelFactors],
3+
makedocs(modules = [ImageFiltering, Kernel, KernelFactors],
44
format = Documenter.Formats.HTML,
5-
sitename = "ImagesFiltering",
5+
sitename = "ImageFiltering",
66
pages = ["index.md", "Function reference" => "function_reference.md"])
77

8-
deploydocs(repo = "github.com/JuliaImages/ImagesFiltering.jl.git")
8+
deploydocs(repo = "github.com/JuliaImages/ImageFiltering.jl.git")
99
# deps = Deps.pip("mkdocs", "python-markdown-math"),

docs/src/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ processing. The core function is `imfilter`, and common kernels
1010
Let's start with a simple example of linear filtering:
1111

1212
```julia
13-
julia> using ImagesFiltering, TestImages
13+
julia> using ImageFiltering, TestImages
1414

1515
julia> img = testimage("mandrill");
1616

@@ -29,7 +29,7 @@ The most commonly used function for filtering is [`imfilter`](@ref).
2929

3030
```@meta
3131
DocTestSetup = quote
32-
using Colors, ImagesFiltering, TestImages
32+
using Colors, ImageFiltering, TestImages
3333
img = testimage("mandrill")
3434
end
3535
```
@@ -118,7 +118,7 @@ OffsetArrays.OffsetArray{Float64,1,Array{Float64,1}} with indices -1:1:
118118
0.333333
119119

120120
julia> kernf = kernelfactors((kern1, kern1))
121-
(ImagesFiltering.KernelFactors.ReshapedOneD{Float64,2,0,OffsetArrays.OffsetArray{Float64,1,Array{Float64,1}}}([0.333333,0.333333,0.333333]),ImagesFiltering.KernelFactors.ReshapedOneD{Float64,2,1,OffsetArrays.OffsetArray{Float64,1,Array{Float64,1}}}([0.333333,0.333333,0.333333]))
121+
(ImageFiltering.KernelFactors.ReshapedOneD{Float64,2,0,OffsetArrays.OffsetArray{Float64,1,Array{Float64,1}}}([0.333333,0.333333,0.333333]),ImageFiltering.KernelFactors.ReshapedOneD{Float64,2,1,OffsetArrays.OffsetArray{Float64,1,Array{Float64,1}}}([0.333333,0.333333,0.333333]))
122122

123123
julia> kernp = broadcast(*, kernf...)
124124
OffsetArrays.OffsetArray{Float64,2,Array{Float64,2}} with indices -1:1×-1:1:

src/ImagesFiltering.jl src/ImageFiltering.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
module ImagesFiltering
1+
module ImageFiltering
22

3-
using Colors, FixedPointNumbers, ImagesCore, MappedArrays, FFTViews, OffsetArrays, StaticArrays, ComputationalResources, TiledIteration
3+
using Colors, FixedPointNumbers, ImageCore, MappedArrays, FFTViews, OffsetArrays, StaticArrays, ComputationalResources, TiledIteration
44
using ColorVectorSpace # for filtering RGB arrays
55
using Base: Indices, tail, fill_to_length, @pure, depwarn
66

src/imfilter.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -618,16 +618,16 @@ function filtfft{C<:Colorant}(A::AbstractArray{C}, krn)
618618
colorview(base_colorant_type(C){eltype(Avf)}, Avf)
619619
end
620620
channelview_dims{C<:Colorant,N}(A::AbstractArray{C,N}) = channelview(A), ntuple(d->d+1, Val{N})
621-
if ImagesCore.squeeze1
622-
channelview_dims{C<:ImagesCore.Color1,N}(A::AbstractArray{C,N}) = channelview(A), ntuple(identity, Val{N})
621+
if ImageCore.squeeze1
622+
channelview_dims{C<:ImageCore.Color1,N}(A::AbstractArray{C,N}) = channelview(A), ntuple(identity, Val{N})
623623
end
624624

625625
function kreshape{C<:Colorant}(::Type{C}, krn::FFTView)
626626
kern = parent(krn)
627627
kernrs = FFTView(reshape(kern, 1, size(kern)...))
628628
end
629-
if ImagesCore.squeeze1
630-
kreshape{C<:ImagesCore.Color1}(::Type{C}, krn::FFTView) = krn
629+
if ImageCore.squeeze1
630+
kreshape{C<:ImageCore.Color1}(::Type{C}, krn::FFTView) = krn
631631
end
632632

633633
### Triggs-Sdika (modified Young-van Vliet) recursive filtering

src/kernel.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module Kernel
22

33
using StaticArrays, OffsetArrays
4-
using ..ImagesFiltering: centered, KernelFactors
5-
import ..ImagesFiltering: _reshape
4+
using ..ImageFiltering: centered, KernelFactors
5+
import ..ImageFiltering: _reshape
66

77
function product2d(kf)
88
k1, k2 = kf

src/kernelfactors.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module KernelFactors
22

33
using StaticArrays, OffsetArrays
4-
using ..ImagesFiltering: centered, dummyind
5-
import ..ImagesFiltering: _reshape, _vec, nextendeddims
4+
using ..ImageFiltering: centered, dummyind
5+
import ..ImageFiltering: _reshape, _vec, nextendeddims
66
using Base: tail, Indices, @pure, checkbounds_indices, throw_boundserror
77

88
abstract IIRFilter{T}

test/2d.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, ImagesCore, OffsetArrays, Colors, FFTViews, ColorVectorSpace, ComputationalResources
1+
using ImageFiltering, ImageCore, OffsetArrays, Colors, FFTViews, ColorVectorSpace, ComputationalResources
22
using Base.Test
33

44
@testset "FIR/FFT" begin

test/basic.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using ImagesFiltering, OffsetArrays, Base.Test
1+
using ImageFiltering, OffsetArrays, Base.Test
22

33
@testset "basic" begin
44
@test eltype(KernelFactors.IIRGaussian(3)) == Float64
55
@test eltype(KernelFactors.IIRGaussian(Float32, 3)) == Float32
66
kern = KernelFactors.IIRGaussian([1,2.0f0])
77
@test isa(kern, Tuple{KernelFactors.ReshapedOneD,KernelFactors.ReshapedOneD})
8-
@test isa(ImagesFiltering.filter_algorithm([1],[1],kern), Algorithm.IIR)
9-
@test isa(ImagesFiltering.filter_algorithm([1],[1],(kern...,Kernel.Laplacian())), Algorithm.Mixed)
8+
@test isa(ImageFiltering.filter_algorithm([1],[1],kern), Algorithm.IIR)
9+
@test isa(ImageFiltering.filter_algorithm([1],[1],(kern...,Kernel.Laplacian())), Algorithm.Mixed)
1010

1111
@test KernelFactors.kernelfactors(([0,3], [1,7])) == (reshape([0,3], 1:2, 0:0), reshape([1,7], 0:0, 1:2))
1212
@test KernelFactors.kernelfactors(([0,3], [1,7]')) == (reshape([0,3], 2, 1), reshape([1,7], 1, 2))

test/border.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, OffsetArrays, Colors
1+
using ImageFiltering, OffsetArrays, Colors
22
using Base.Test
33

44
@testset "Border" begin
@@ -149,7 +149,7 @@ using Base.Test
149149

150150
a = reshape(1:15, 3, 5)
151151
targetinds = (OffsetArray([1,1,2,3,3], 0:4), OffsetArray([1:5;], 1:5))
152-
ret = @test_throws ArgumentError ImagesFiltering.padindices(rand(3,5), Pad(:replicate,(1,)))
152+
ret = @test_throws ArgumentError ImageFiltering.padindices(rand(3,5), Pad(:replicate,(1,)))
153153
@test contains(ret.value.msg, "lacks the proper padding sizes")
154154
end
155155

@@ -177,8 +177,8 @@ using Base.Test
177177

178178
@testset "misc" begin
179179
a0 = reshape([1]) # 0-dimensional
180-
@test ImagesFiltering.accumulate_padding((), a0) == ()
181-
@test ImagesFiltering.accumulate_padding((0:1, -1:1), a0) == (0:1, -1:1)
180+
@test ImageFiltering.accumulate_padding((), a0) == ()
181+
@test ImageFiltering.accumulate_padding((0:1, -1:1), a0) == (0:1, -1:1)
182182
end
183183
end
184184

test/cascade.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, ImagesCore, OffsetArrays
1+
using ImageFiltering, ImageCore, OffsetArrays
22
using Base.Test
33

44
@testset "cascade" begin

test/deprecated.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, ImagesCore, Colors, FixedPointNumbers, OffsetArrays, Base.Test
1+
using ImageFiltering, ImageCore, Colors, FixedPointNumbers, OffsetArrays, Base.Test
22

33
isapprox_const(A::AbstractArray, n::Number) = isapprox(A, fill(n, size(A)))
44

test/gradient.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, Colors, ColorVectorSpace
1+
using ImageFiltering, Colors, ColorVectorSpace
22
using Base.Test
33

44
@testset "gradient" begin

test/nd.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, OffsetArrays
1+
using ImageFiltering, OffsetArrays
22
using Base.Test
33

44
@testset "1d" begin
@@ -17,7 +17,7 @@ using Base.Test
1717
@test size(casc) == size(img)
1818
# copy! kernels, presence/order doesn't matter
1919
kc = centered([1])
20-
@test ImagesFiltering.iscopy(kc)
20+
@test ImageFiltering.iscopy(kc)
2121
@test_approx_eq imfilter(img, (k1,)) [1.25,2.0,3.0,4.0,5.0,6.0,7.0,7.75]
2222
@test_approx_eq imfilter(img, (kc, k1)) [1.25,2.0,3.0,4.0,5.0,6.0,7.0,7.75]
2323
@test_approx_eq imfilter(img, (k1, kc)) [1.25,2.0,3.0,4.0,5.0,6.0,7.0,7.75]

test/rank.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, Base.Test
1+
using ImageFiltering, Base.Test
22

33
@testset "extrema_filter" begin
44
function groundtruth(f, A, window::Tuple)

test/runtests.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using ImagesFiltering, Base.Test
1+
using ImageFiltering, Base.Test
22

3-
aif = detect_ambiguities(ImagesFiltering, Kernel, KernelFactors, Base)
3+
aif = detect_ambiguities(ImageFiltering, Kernel, KernelFactors, Base)
44
# Because StaticArrays has ambiguities with Base, we have to "subtract" these
55
asa = detect_ambiguities(StaticArrays, Base)
66
@test isempty(setdiff(aif, asa))

test/specialty.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, ImagesCore, OffsetArrays, Colors
1+
using ImageFiltering, ImageCore, OffsetArrays, Colors
22
using Base.Test
33

44
@testset "specialty" begin
@@ -195,10 +195,10 @@ using Base.Test
195195
imgf2 = imfilter(img, kernel2)
196196
@test cor(vec(imgf1), vec(imgf2)) > 0.8
197197
# Ensure that edge-trimming under successive stages of filtering works correctly
198-
ImagesFiltering.fillbuf_nan[] = true
198+
ImageFiltering.fillbuf_nan[] = true
199199
kernel3 = (Kernel.Laplacian(), KernelFactors.IIRGaussian(σs)...)
200200
@test !any(isnan, imfilter(img, kernel3))
201-
ImagesFiltering.fillbuf_nan[] = false
201+
ImageFiltering.fillbuf_nan[] = false
202202
end
203203
end
204204

test/triggs.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ImagesFiltering, Colors, ComputationalResources
1+
using ImageFiltering, Colors, ComputationalResources
22
using Base.Test
33

44
@testset "TriggsSdika" begin

0 commit comments

Comments
 (0)