Skip to content

Commit

Permalink
Merge pull request #290 from ktisha/pull-request/b4c9a865
Browse files Browse the repository at this point in the history
Fixed ERROR: imresize_julia! not defined
  • Loading branch information
timholy committed Apr 26, 2015
2 parents 2a24ab7 + b4c9a86 commit 4ba5163
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/algorithms.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ function imresize!(resized, original)
resized
end

imresize(original, new_size) = imresize_julia!(similar(original, new_size), original)
imresize(original, new_size) = imresize!(similar(original, new_size), original)

convertsafely{T<:FloatingPoint}(::Type{T}, val) = convert(T, val)
convertsafely{T<:Integer}(::Type{T}, val::Integer) = convert(T, val)
Expand Down
5 changes: 5 additions & 0 deletions test/algorithms.jl
Original file line number Diff line number Diff line change
Expand Up @@ -322,3 +322,8 @@ P = [ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0;

Q = Images.shepp_logan(8,highContrast=false)
@test norm((P-Q)[:]) < 1e-10

# image resize
img = convert(Images.Image, zeros(10,10))
img2 = Images.imresize(img, (5,5))
@test length(img2) == 25

0 comments on commit 4ba5163

Please sign in to comment.