Skip to content

Commit

Permalink
Fix reparamterization of CartesianRange on 0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
timholy committed Aug 6, 2017
1 parent ea6ee0a commit 1f4e987
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Colors 0.7.0
ColorVectorSpace 0.2
FixedPointNumbers 0.3
ShowItLikeYouBuildIt
Compat 0.19
Compat 0.29

This comment has been minimized.

Copy link
@tkelman

tkelman Aug 17, 2017

Contributor

This comment has been minimized.

Copy link
@timholy

timholy Aug 17, 2017

Author Member

Seems like it. Since 0.29 is good enough and I am overwhelmed with other responsibilities, I think we can call this good enough unless someone else wants to fix it.

This comment has been minimized.

Copy link
@Evizero

Evizero Aug 17, 2017

Member

I'll take care of it

2 changes: 1 addition & 1 deletion src/autorange.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ immutable CornerIterator{I<:CartesianIndex}
start::I
stop::I
end
CornerIterator{I<:CartesianIndex}(R::CartesianRange{I}) = CornerIterator{I}(first(R), last(R))
CornerIterator(R::CartesianRange) = CornerIterator(first(R), last(R))

eltype{I}(::Type{CornerIterator{I}}) = I
iteratorsize{I}(::Type{CornerIterator{I}}) = Base.HasShape()
Expand Down
2 changes: 1 addition & 1 deletion src/resizing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,6 @@ end
@inline map3(f, a, b, c) = (f(a[1], b[1], c[1]), map3(f, tail(a), tail(b), tail(c))...)
@inline map3(f, ::Tuple{}, ::Tuple{}, ::Tuple{}) = ()

function clampR{N}(I::NTuple{N}, R::CartesianRange{CartesianIndex{N}})
@compat function clampR{N}(I::NTuple{N}, R::CartesianRange{N})
map3(clamp, I, first(R).I, last(R).I)
end

0 comments on commit 1f4e987

Please sign in to comment.