Skip to content

Commit 5ebdae8

Browse files
committed
WIP: replace Images with specific packages
Currently the bottleneck is `gaussian_pyramid` which is still in Images.jl
1 parent 2153078 commit 5ebdae8

File tree

16 files changed

+30
-24
lines changed

16 files changed

+30
-24
lines changed

Project.toml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,24 @@ version = "0.5.0"
44

55
[deps]
66
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
7-
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
7+
ImageBase = "c817782e-172a-44cc-b673-b171935fbb9e"
8+
ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
9+
ImageCorners = "89d5987c-236e-4e32-acd0-25bd6bd87b70"
10+
ImageFiltering = "6a3955dd-da59-5b1f-98d4-e7296123deb5"
11+
ImageTransformations = "02fcd773-0e25-5acc-982a-7f6622650795"
812
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
913
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1014

1115
[compat]
1216
Distributions = "0.16, 0.17, 0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25"
13-
Images = "0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25"
17+
ImageCore = "0.10"
1418
julia = "1.6"
1519

1620
[extras]
17-
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
21+
ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
1822
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1923
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2024
TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
2125

2226
[targets]
23-
test = ["ImageMagick", "LinearAlgebra", "Test", "TestImages"]
27+
test = ["ImageIO", "LinearAlgebra", "Test", "TestImages"]

docs/Project.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298"
33
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
44
ImageDraw = "4381153b-2b60-58ae-a1ba-fd683676385f"
55
ImageFeatures = "92ff4b2b-8094-53d3-b29d-97f740f06cef"
6-
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
7-
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
86
Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc"
97
TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
108

src/ImageFeatures.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
module ImageFeatures
22

33
# package code goes here
4-
using Images, Distributions
4+
using ImageCore
5+
using ImageCore: NumberLike
6+
using ImageBase
7+
using ImageTransformations # imresize
8+
using ImageCorners
9+
using ImageFiltering
10+
using Distributions
511
using SparseArrays
612
import Random.seed!
713
using Images.ImageTransformations.Interpolations

src/hog.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function HOG(; orientations::Int = 9, cell_size::Int = 8, block_size::Int = 2, b
2424
HOG(orientations, cell_size, block_size, block_stride, norm_method)
2525
end
2626

27-
function create_descriptor(img::AbstractArray{CT, 2}, params::HOG) where CT<:Images.NumberLike
27+
function create_descriptor(img::AbstractArray{CT, 2}, params::HOG) where CT<:NumberLike
2828
#compute gradient
2929
gx = imfilter(img, centered([-1 0 1]))
3030
gy = imfilter(img, centered([-1 0 1]'))
@@ -34,7 +34,7 @@ function create_descriptor(img::AbstractArray{CT, 2}, params::HOG) where CT<:Ima
3434
create_hog_descriptor(mag, phase, params)
3535
end
3636

37-
function create_descriptor(img::AbstractArray{CT, 2}, params::HOG) where CT<:Images.Color{T, N} where T where N
37+
function create_descriptor(img::AbstractArray{CT, 2}, params::HOG) where CT<:Color{T, N} where T where N
3838
#for color images, compute seperate gradient for each color channel and take one with largest norm as pixel's gradient vector
3939
rows, cols = size(img)
4040
gx = channelview(imfilter(img, centered([-1 0 1])))
@@ -56,7 +56,7 @@ function create_descriptor(img::AbstractArray{CT, 2}, params::HOG) where CT<:Ima
5656
create_hog_descriptor(max_mag, max_phase, params)
5757
end
5858

59-
function create_hog_descriptor(mag::AbstractArray{T, 2}, phase::AbstractArray{T, 2}, params::HOG) where T<:Images.NumberLike
59+
function create_hog_descriptor(mag::AbstractArray{T, 2}, phase::AbstractArray{T, 2}, params::HOG) where T<:NumberLike
6060
orientations = params.orientations
6161
cell_size = params.cell_size
6262
block_size = params.block_size

src/houghtransform.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Images
2-
31
"""
42
```
53
lines = hough_transform_standard(

src/lbp.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,6 @@ function create_descriptor(img::AbstractArray{Gray{T}, 2}, yblocks::Integer = 4,
144144
y_padded = ceil(Int, h / (yblocks)) * yblocks
145145
x_padded = ceil(Int, w / (xblocks)) * xblocks
146146

147-
img_padded = Images.imresize(img, (y_padded, x_padded))
147+
img_padded = imresize(img, (y_padded, x_padded))
148148
_create_descriptor(img_padded, yblocks, xblocks, lbp_type, args...)
149149
end

test/brief.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Test, ImageFeatures, Images, TestImages, Distributions
1+
using Test, ImageFeatures, ImageCore, TestImages, Distributions
22

33
@testset "Generating brief params" begin
44
brief_params = BRIEF(size = 8, window = 3, seed = 123)

test/brisk.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Test, ImageFeatures, Images, TestImages, Distributions
1+
using Test, ImageFeatures, ImageCore, TestImages, Distributions
22

33
@testset "Testing brisk params" begin
44
brisk_params = BRISK(pattern_scale = 2.0)

test/core.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Test, ImageFeatures, Images
1+
using Test, ImageFeatures, ImageCore
22

33
@testset "Types" begin
44
img = zeros(10, 10)

test/corner.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Test, ImageFeatures, Images
1+
using Test, ImageFeatures, ImageCore
22

33
@testset "Orientations" begin
44
img = zeros(20, 20)

0 commit comments

Comments
 (0)