mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #718 from anowacki/0.6-scale-fix

Browse Source 
Remove import of Base.scale(!); fixes #687
This commit is contained in:
Michael Krabbe Borregaard 2017-03-11 08:13:24 +01:00 committed by GitHub
commit 1a7bb10a22
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components.jl
View File

@ -174,7 +174,7 @@ function center(shape::Shape)
Cx / 6A, Cy / 6A Cx / 6A, Cy / 6A
end end
function Base.scale!(shape::Shape, x::Real, y::Real = x, c = center(shape)) function scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
sx, sy = coords(shape) sx, sy = coords(shape)
cx, cy = c cx, cy = c
for i=1:length(sx) for i=1:length(sx)
@ -184,7 +184,7 @@ function Base.scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
shape shape
end end
function Base.scale(shape::Shape, x::Real, y::Real = x, c = center(shape)) function scale(shape::Shape, x::Real, y::Real = x, c = center(shape))
shapecopy = deepcopy(shape) shapecopy = deepcopy(shape)
scale!(shapecopy, x, y, c) scale!(shapecopy, x, y, c)
end end