Skip to content

Commit faeb505

Browse files
authored
Replace vec(Float64.(collect(val))) by Float64[val...] (#1911)
* Replace vec(Float64.(collect(val))) by Float64[val...] This avoids an intermediate step involving a (ffffck) Any creation. * This one too
1 parent 3d57b03 commit faeb505

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/common_options.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ function build_opt_R(val, symb::Symbol=Symbol())::String # Generic function tha
292292
R::String = ""
293293
if ((isvector(val) || isa(val, Tuple)) && (length(val) == 4 || length(val) == 6))
294294
if (symb (:region_llur, :limits_llur, :limits_diag, :region_diag))
295-
_val::Vector{Float64} = vec(Float64.(collect(val)))
295+
_val::Vector{Float64} = Float64[val...]
296296
R = " -R" * @sprintf("%.15g/%.15g/%.15g/%.15g+r", _val[1], _val[3], _val[2], _val[4])::String
297297
else
298298
R = " -R" * arg2str(val)
@@ -316,7 +316,7 @@ function build_opt_R(arg::NamedTuple, symb::Symbol=Symbol())::String
316316
d = nt2dict(arg) # Convert to Dict
317317
if ((val = find_in_dict(d, [:limits :region])[1]) !== nothing)
318318
if ((isa(val, VecOrMat{<:Real}) || isa(val, Tuple)) && (length(val) == 4 || length(val) == 6))
319-
vval::Vector{Float64} = vec(Float64.(collect(val)))
319+
vval::Vector{Float64} = Float64[val...]
320320
if (haskey(d, :diag) || haskey(d, :diagonal)) # The diagonal case
321321
BB = @sprintf("%.15g/%.15g/%.15g/%.15g+r", vval[1], vval[3], vval[2], vval[4])
322322
else

src/utils_project.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ A grid or an image and optionally the coastlines.
185185
plotgrid!(G, show=true)
186186
"""
187187
function leepacific(fname::String; region=(90.0, 300.0, -90.0, 75.0), latlims=nothing, lonlims=nothing, coast=true)
188-
reg = Float64.(collect(region))
188+
reg = Float64[region...]
189189
lonlims !== nothing && (reg[1] = lonlims[1]; reg[2] = lonlims[2]) # Use the lonlims if given
190190
latlims !== nothing && (reg[3] = latlims[1]; reg[4] = latlims[2]) # Use the lonlims if given
191191
while(reg[1] < 0) reg[1] += 180.0; reg[2] += 180.0 end

0 commit comments

Comments
 (0)