diff --git a/REQUIRE b/REQUIRE index fa4619f..c16574a 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,5 @@ julia 0.2 +Dates Cairo Color 0.2.9 IniFile diff --git a/src/Winston.jl b/src/Winston.jl index c207fb5..d61ddc2 100644 --- a/src/Winston.jl +++ b/src/Winston.jl @@ -9,7 +9,9 @@ else end using IniFile using Compat -using Dates +if VERSION.minor < 4 + using Dates +end isdefined(Base, :Libc) && (strftime = Libc.strftime) isdefined(Base, :Dates) && (datetime2unix = Dates.datetime2unix) diff --git a/src/geom.jl b/src/geom.jl index fec7cac..78ddb63 100644 --- a/src/geom.jl +++ b/src/geom.jl @@ -54,6 +54,7 @@ function shift(r::Rectangle, dx::Real, dy::Real) end # scale width & height, keeping center fixed +import Base.* function (*)(r::Rectangle, s::Real) dw = 0.5*(s - 1.)*(r.x1 - r.x0) dh = 0.5*(s - 1.)*(r.y1 - r.y0)