Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Streamline API for warp and WarpedView #24

Merged
merged 18 commits into from
May 4, 2017
Merged

Streamline API for warp and WarpedView #24

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1957490
refactor warp to be consistent with WarpedView
Evizero Apr 21, 2017
fccebb1
clean up WarpedView API and add warpedview
Evizero Apr 21, 2017
1015bfd
refactor warp and WarpedView to proper backward mode
Evizero Apr 21, 2017
c257622
add ImageInTerminal style visual tests
Evizero Apr 21, 2017
38bcb40
enable color on travis
Evizero Apr 22, 2017
6a2d808
try to enable color on appveyor
Evizero Apr 22, 2017
e5e6ccb
add tests for warp helper functions
Evizero Apr 23, 2017
28aa3f7
improve warp helper functions
Evizero Apr 25, 2017
2bdbce4
prototype deprecation strategy
Evizero Apr 26, 2017
106f2d0
work in a round of reviews
Evizero Apr 27, 2017
a2aa627
work in a round of reviews
Evizero Apr 27, 2017
b79619d
reintroduce WarpedView
Evizero Apr 29, 2017
a805cc3
add warp support for OneTo inds
Evizero Apr 30, 2017
fcf939c
finish warpedview tests
Evizero Apr 30, 2017
5ca0028
add docstring for warpedview
Evizero May 2, 2017
86d0afb
add docstring for invwarpedview
Evizero May 3, 2017
ad5cb02
fix 0.6 ambiguities
Evizero May 3, 2017
1ae4634
work in a round of reviews
Evizero May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/warp.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,13 @@ julia> indices(imgr)
```
"""
function warp_new{T}(img::AbstractExtrapolation{T}, tform, inds::Tuple = autorange(img, inv(tform)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someday this will have to become tform::InvertibleTransformation or similar.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Presumably invertibility is more of a trait? I can't see it fitting neatly into the type hierarchy.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, yes, agreed.

out = OffsetArray(Array{T}(map(length, inds)), inds)
out = _allocate_array(T, inds)
warp!(out, img, tform)
end

_allocate_array{T,N}(::Type{T}, inds::NTuple{N,Base.OneTo}) = Array{T}(map(length, inds))
_allocate_array{T,N}(::Type{T}, inds::NTuple{N,AbstractUnitRange}) = OffsetArray(Array{T}(map(length, inds)), inds)
Copy link
Member Author

@Evizero Evizero Apr 30, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unsure if this change could be considered controversial, but I did it because now behaviour should be consistent between warp(...) and collect(warpedview(...)). It does not negatively affect type inference

julia> summary(warp(img_camera, tfm, indices(img_camera)))
"512×512 Array{Gray{N0f8},2}"

julia> summary(collect(warpedview(img_camera, tfm, indices(img_camera))))
"512×512 Array{Gray{N0f8},2}"

and

julia> summary(warp(img_camera, tfm))
"-78:591×-78:591 OffsetArray{Gray{N0f8},2}"

julia> summary(collect(warpedview(img_camera, tfm)))
"-78:591×-78:591 OffsetArray{Gray{N0f8},2}"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of collect is changing in 0.6, see JuliaLang/julia#21257. In particular we decided that collect was the right way to spell "throw away the custom indices and return an Array with the same values." (See JuliaArrays/IdentityRanges.jl#1.)

Nevertheless I like this change overall. I would write the second, however, as similar(Array{T}, inds). That way the indices are in charge of the output type. When inds are UnitRanges, then it will allocate an OffsetArray.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, yeah. that is a lot nicer. thanks


# this function was never exported, so no need to deprecate
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed.

function warp!(out, img::AbstractExtrapolation, tform)
@inbounds for I in CartesianRange(indices(out))
Expand Down
17 changes: 17 additions & 0 deletions test/reference/warp_cameraman_rotate_r22deg_crop.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
Loading