Skip to content

Commit fef7f90

Browse files
authored
Shelter the read_data funs (#1943)
1 parent 72ba40c commit fef7f90

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/common_options.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2773,7 +2773,7 @@ function add_opt_fill(@nospecialize(val), cmd::String="", opt::String="")::Stri
27732773
end
27742774

27752775
# ---------------------------------------------------------------------------------------------------
2776-
function get_cpt_set_R(d::Dict{Symbol,Any}, cmd0::String, cmd::String, opt_R::String, got_fname::Int, arg1, arg2=nothing, arg3=nothing, prog::String="")
2776+
function get_cpt_set_R(d::Dict{Symbol,Any}, cmd0::String, cmd::String, opt_R::String, got_fname::Int, @nospecialize(arg1), @nospecialize(arg2)=nothing, @nospecialize(arg3)=nothing, prog::String="")
27772777
# Get CPT either from keyword input of from CURRENT_CPT.
27782778
# Also puts -R in cmd when accessing grids from grdimage|view|contour, etc... (due to a GMT bug that doesn't do it)
27792779
# Use CMD0 = "" to use this function from within non-grd modules
@@ -3680,7 +3680,7 @@ function fname_out(d::Dict{Symbol,Any}, del::Bool=false)
36803680
end
36813681

36823682
# ---------------------------------------------------------------------------------------------------
3683-
function read_data(d::Dict{Symbol,Any}, fname::String, cmd::String, arg, opt_R::String="", is3D::Bool=false, get_info::Bool=false)
3683+
function read_data(d::Dict{Symbol,Any}, fname::String, cmd::String, @nospecialize(arg), opt_R::String="", is3D::Bool=false, get_info::Bool=false)
36843684
# Use 'get_info=true' to force reading the file when fname != ""
36853685

36863686
if (isa(arg, GMTfv) || isa(arg, Vector{GMTfv})) # A quick and dirty way to parse the GMTfv type
@@ -3747,7 +3747,7 @@ function read_data_barr_1(d, arg_is_nothing::Bool)
37473747
return arg
37483748
end
37493749

3750-
function _read_data(d::Dict{Symbol,Any}, cmd::String, arg, opt_R::String="", is3D::Bool=false, get_info::Bool=false,
3750+
function _read_data(d::Dict{Symbol,Any}, cmd::String, @nospecialize(arg), opt_R::String="", is3D::Bool=false, get_info::Bool=false,
37513751
opt_i::String="", opt_di::String="", opt_yx::String="")#::Tuple{String, Union{Nothing, GDtype}, String, Matrix{Float64}, String}
37523752
# In case DATA holds a file name, read that data and put it in ARG
37533753
# Also compute a tight -R if this was not provided. This forces reading a the `fname` file if provided.

0 commit comments

Comments
 (0)