Skip to content

Commit

Permalink
Merge pull request #86 from natj/master
Browse files Browse the repository at this point in the history
changed deprecated min & max to minimum & maximum
  • Loading branch information
nolta committed Oct 21, 2013
2 parents 3487426 + b4fdc6d commit 620148c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/Winston.jl
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ upperleft(bb::BoundingBox) = Point(bb.xmin, bb.ymax)
lowerright(bb::BoundingBox) = Point(bb.xmax, bb.ymin)
upperright(bb::BoundingBox) = Point(bb.xmax, bb.ymax)

maxfinite(A) = max(A)
maxfinite(A) = maximum(A)
maxfinite(x, y) = max(x, y)
function maxfinite{T<:FloatingPoint}(A::AbstractArray{T})
ret = nan(T)
Expand All @@ -90,7 +90,7 @@ end
maxfinite(x::FloatingPoint, y) = isfinite(x) ? max(x, y) : y
maxfinite(x, y::FloatingPoint) = isfinite(y) ? max(x, y) : x

minfinite(A) = min(A)
minfinite(A) = minimum(A)
minfinite(x, y) = min(x, y)
function minfinite{T<:FloatingPoint}(A::AbstractArray{T})
ret = nan(T)
Expand Down Expand Up @@ -845,7 +845,7 @@ function _ticklabels(self::HalfAxis, context, ticks)
if !isequal(ticklabels,nothing)
return ticklabels
end
r = max(ticks) - min(ticks)
r = maximum(ticks) - minimum(ticks)
[ _format_ticklabel(x,r) for x=ticks ]
end

Expand Down Expand Up @@ -2353,8 +2353,8 @@ type Image <: ImageComponent
h

function Image(xrange, yrange, img, args...; kvs...)
x = min(xrange)
y = min(yrange)
x = minimum(xrange)
y = minimum(yrange)
w = abs(xrange[2] - xrange[1])
h = abs(yrange[2] - yrange[1])
self = new(Dict(), img, x, y, w, h)
Expand Down

0 comments on commit 620148c

Please sign in to comment.