Second batch of changes after JETLS advices (and a bug fix) (#1968)

joa-quim · web-flow · commit 2a907a5eaaeb · 2026-03-15T12:45:10.000Z
diff --git a/ci/config-gmt-unix.sh b/ci/config-gmt-unix.sh
@@ -11,7 +11,7 @@ set (DCW_ROOT "$ENV{COASTLINEDIR}/dcw")
 
 set (GMT_USE_THREADS TRUE)
 set (GMT_ENABLE_OPENMP TRUE)
-set (GMT_DATA_SERVER https://www.star.nesdis.noaa.gov/data/socd3/lsa/gmtdata/)
+set (GMT_DATA_SERVER china)
 
 # recommended even for release build
 set (CMAKE_C_FLAGS "-Wall -Wdeclaration-after-statement ${CMAKE_C_FLAGS}")
diff --git a/src/GMT.jl b/src/GMT.jl
@@ -408,6 +408,7 @@ using .Laszip
 	grd2xyz(Glix)
 	viz(Glix, show=false)
 	viz(I, show=false)
+	viz(rand(UInt8, 16, 16), show=false)
 	histogram(randn(100), T=0.1, center=true, Z=:counts)
 	histogram(I)
 	grdlandmask(R="-10/4/37/45", res=:c, inc=0.1)
diff --git a/src/PrettyTables.jl b/src/PrettyTables.jl
@@ -1388,7 +1388,7 @@ function _text_fill_string_matrix!(
 	vcrop_mode::Symbol
 )
 	num_rows, ~ = _size(ptable)
-	num_header_rows, ~ = _header_size(ptable)
+	num_header_rows, _ = _header_size(ptable)
 	num_rendered_rows, num_rendered_columns = size(table_str)
 
 	# This variable stores the predicted table width. If the user wants horizontal cropping,
@@ -1826,7 +1826,7 @@ end
 
 # Compute the number of omitted columns.
 function _compute_omitted_columns(ptable::ProcessedTable, display::Display, columns_width::Vector{Int}, vlines::Union{Symbol, Vector{Int}},)
-	~, num_columns         = _size(ptable)
+	_, num_columns         = _size(ptable)
 	num_additional_columns = _num_additional_columns(ptable)
 	num_rendered_columns   = length(columns_width)
 
@@ -1871,7 +1871,7 @@ end
 # Compute the number of omitted rows.
 function _compute_omitted_rows(ptable::ProcessedTable, display::Display, continuation_row_line::Int, num_lines_in_row::Vector{Int},
 	body_hlines::Vector{Int}, hlines::Union{Symbol, Vector{Int}}, need_omitted_cell_summary::Bool, Δdisplay_lines::Int)
-	num_rows, ~       = _size(ptable)
+	num_rows, _       = _size(ptable)
 	num_header_rows   = _header_size(ptable)[1]
 	num_rendered_rows = length(num_lines_in_row)
 
@@ -2491,7 +2491,8 @@ function _text_print_table!(display::Display, ptable::ProcessedTable, table_str:
 							_p!(display, " " * cell_processed_str * " ", false, actual_columns_width[j] + 2) && break
 						else
 							# If we have a custom cell, we need a custom printing function.
-							_print_custom_text_cell!(display, cell_data, cell_processed_str, l, highlighters) && break
+							#_print_custom_text_cell!(display, cell_data, cell_processed_str, l, highlighters) && break
+							@warn "CustomTextCell is not supported in the current version of Custom PrettyTables.jl."
 						end
 					end
 				end
@@ -2518,8 +2519,9 @@ end
 # Print the custom rext cell to the display.
 #
 # NOTE: `cell_str` must contain the printable text cell always.
+#=
 function _print_custom_text_cell!(display::Display, cell_data::CustomTextCell, cell_processed_str::String,
-	l::Int, @nospecialize(highlighters::Ref{Any}),)
+                                  l::Int, @nospecialize(highlighters::Ref{Any}),)
 	cell_printable_textwidth = printable_textwidth(cell_processed_str)
 
 	# Print the padding character before the cell.
@@ -2544,6 +2546,7 @@ function _print_custom_text_cell!(display::Display, cell_data::CustomTextCell, c
 	# Print the padding character after the cell and return if the display has reached end-of-line.
 	return _p!(display, " ", false, 1)
 end
+=#
 
 # Print the summary of the omitted rows and columns.
 function _print_omitted_cell_summary(display::Display, num_omitted_cols::Int, num_omitted_rows::Int,
diff --git a/src/choropleth_utils.jl b/src/choropleth_utils.jl
@@ -142,7 +142,6 @@ usable in cpt2dcw() to create a colormap to use in `plot()` and make a country c
 """
 function mk_codes_values(codes::Vector{<:AbstractString}, vals; region::StrSymb="world")
 	isempty(codes) && error("The country codes 'codes' input argument is empty.")
-	code_len = length(codes[1])
 	(length(codes[1]) != 3) && error("The country codes in this function must follow the 3 char ISO codes. This does not.")
 
 	_reg = lowercase(string(region))
diff --git a/src/circfit.jl b/src/circfit.jl
@@ -55,7 +55,7 @@ function  circfit_tau(X, Y)
 	Zmean = mean(Z)
 	Z0 = (Z .- Zmean) / (2*sqrt(Zmean))
 	ZXY = [Z0 X Y]
-	U,S,V = svd(ZXY)
+	_, _, V = svd(ZXY)		# U,S,V = svd(ZXY)
 	A = V[:,3]
 	A[1] = A[1]/(2*sqrt(Zmean))
 	A = [A; -Zmean*A[1]]
diff --git a/src/common_options.jl b/src/common_options.jl
@@ -369,7 +369,7 @@ function opt_R2num(opt_R::String)::Vector{Float64}
 	(endswith(opt_R, "Rg")) && return [0.0, 360., -90., 90.]
 	(endswith(opt_R, "Rd")) && return [-180.0, 180., -90., 90.]
 	if (findfirst("/", opt_R) !== nothing && !contains(opt_R, ":"))
-		isdiag = false
+		#isdiag = false
 		if ((ind = findfirst("+r", opt_R)) !== nothing)		# Diagonal mode
 			opt_R = opt_R[1:ind[1]-1];	isdiag = true		# Strip the "+r"
 		end
diff --git a/src/extras/montage.jl b/src/extras/montage.jl
@@ -49,7 +49,7 @@ function _montage_adjust_margins!(d::Dict, titles, colorbar, cbar, margins::Stri
 end
 
 """Compute panels_size string from images or explicit value. Returns the string to use."""
-function _montage_panels_size!(d::Dict, images, panels_size::String, ncols::Int)::String
+function _montage_panels_size!(images, panels_size::String, ncols::Int)::String
 	if panels_size == ""
 		_imgs = isa(images, AbstractVector) ? images : [images]
 		widths, heights = subplot_panel_sizes(_imgs, ncols=ncols)
@@ -125,7 +125,7 @@ function _montage_images(images, d::Dict)
 
 	# Build panels_size string
 	if ps_val == "" || ps_val === nothing
-		ps_str = _montage_panels_size!(d, images, "", ncols)
+		ps_str = _montage_panels_size!(images, "", ncols)
 	elseif isa(ps_val, Tuple)
 		ps_str = string(ps_val[1], "/", ps_val[2])
 	else
diff --git a/src/extras/okada.jl b/src/extras/okada.jl
@@ -391,36 +391,35 @@ chinnery(f::Function, x, p, L, W, q, sin_dip, cos_dip, nu) =
 #---------------------------------------------------------------------------------------------------
 # Displacements
 function okd_ux(U1, U2, U3, x, p, q, L, W, sin_dip, cos_dip, nu)
-	ux = (-U1 * chinnery(ux_ss,x,p,L,W,q,sin_dip, cos_dip,nu)		# strike-slip
-	      -U2 * chinnery(ux_ds,x,p,L,W,q,sin_dip, cos_dip,nu)		# dip-slip
-	      +U3 * chinnery(ux_tf,x,p,L,W,q,sin_dip, cos_dip,nu))		# tensile fault
+	(-U1 * chinnery(ux_ss,x,p,L,W,q,sin_dip, cos_dip,nu)		# strike-slip
+	 -U2 * chinnery(ux_ds,x,p,L,W,q,sin_dip, cos_dip,nu)		# dip-slip
+	 +U3 * chinnery(ux_tf,x,p,L,W,q,sin_dip, cos_dip,nu))		# tensile fault
 end
 function okd_ux(U1, U2, x, p, q, L, W, sin_dip, cos_dip, nu)
 	(-U1 * chinnery(ux_ss,x,p,L,W,q,sin_dip, cos_dip,nu)			# strike-slip
 	 -U2 * chinnery(ux_ds,x,p,L,W,q,sin_dip, cos_dip,nu))			# dip-slip
 end
 
 function okd_uy(U1, U2, U3, x, p, q, L, W, sin_dip, cos_dip, nu)
-	uy = (-U1 * chinnery(uy_ss,x,p,L,W,q,sin_dip, cos_dip,nu)		# strike-slip
-	      -U2 * chinnery(uy_ds,x,p,L,W,q,sin_dip, cos_dip,nu)		# dip-slip
-	      +U3 * chinnery(uy_tf,x,p,L,W,q,sin_dip, cos_dip,nu))		# tensile fault
+	(-U1 * chinnery(uy_ss,x,p,L,W,q,sin_dip, cos_dip,nu)		# strike-slip
+	 -U2 * chinnery(uy_ds,x,p,L,W,q,sin_dip, cos_dip,nu)		# dip-slip
+	 +U3 * chinnery(uy_tf,x,p,L,W,q,sin_dip, cos_dip,nu))		# tensile fault
 end
 function okd_uy(U1, U2, x, p, q, L, W, sin_dip, cos_dip, nu)
 	(-U1 * chinnery(uy_ss,x,p,L,W,q,sin_dip, cos_dip,nu)			# strike-slip
 	 -U2 * chinnery(uy_ds,x,p,L,W,q,sin_dip, cos_dip,nu))			# dip-slip
 end
 
 function okd_uz(U1, U2, U3, x, p, q, L, W, sin_dip, cos_dip, nu)
-	uz = (-U1 * chinnery(uz_ss,x,p,L,W,q,sin_dip, cos_dip,nu)		# strike-slip
-	      -U2 * chinnery(uz_ds,x,p,L,W,q,sin_dip, cos_dip,nu)		# dip-slip
-	      +U3 * chinnery(uz_tf,x,p,L,W,q,sin_dip, cos_dip,nu))		# tensile fault
+	(-U1 * chinnery(uz_ss,x,p,L,W,q,sin_dip, cos_dip,nu)		# strike-slip
+	 -U2 * chinnery(uz_ds,x,p,L,W,q,sin_dip, cos_dip,nu)		# dip-slip
+	 +U3 * chinnery(uz_tf,x,p,L,W,q,sin_dip, cos_dip,nu))		# tensile fault
 end
 function okd_uz(U1, U2, x, p, q, L, W, sin_dip, cos_dip, nu)
 	(-U1 * chinnery(uz_ss,x,p,L,W,q,sin_dip, cos_dip,nu)			# strike-slip
 	 -U2 * chinnery(uz_ds,x,p,L,W,q,sin_dip, cos_dip,nu))			# dip-slip
 end
 
-
 #= ---------------------------------------------------------------------------------------------------
 # Tilt
 function okd_uzx(U1, U2, U3, x, p, q, L, W, sin_dip, cos_dip, nu)
diff --git a/src/gadm.jl b/src/gadm.jl
@@ -89,7 +89,7 @@ function gadm(country, subregions...; children::Bool=false, names::Bool=false, c
 		error("Asked data for a level ($(plevel+1)) that is lower than lowest data level ($(_nlayers))")
 	end
 
-	function _get_attrib(feature)
+	function _get_attrib(feature)		# Core.boxed
 		n = Gdal.nfield(feature)
 		attrib = DictSvS()
 		[attrib[Gdal.getname(Gdal.getfielddefn(feature, i))] = string(Gdal.getfield(feature, i)) for i = 0:n-1]
diff --git a/src/gdal_utils.jl b/src/gdal_utils.jl
@@ -601,7 +601,7 @@ function seek_wkt_in_gdalinfo(info::String)
 	# expose them with gdalinfo.
 	((ind = findfirst("SRS=GEO", info)) === nothing) && return ""
 	ind2 = findfirst('\n', view(info, ind[5]:length(info)))		# Find next EOL
-	proj4 = toPROJ4(importWKT(info[ind[5] : ind[5]+ind2[1]-2]))
+	toPROJ4(importWKT(info[ind[5] : ind[5]+ind2[1]-2]))
 end
 
 # ---------------------------------------------------------------------------------------------------
diff --git a/src/gmt_main.jl b/src/gmt_main.jl
@@ -535,7 +535,7 @@ function get_image(API::Ptr{Nothing}, object)::GMTimage
 end
 
 # ---------------------------------------------------------------------------------------------------
-function get_palette(API::Ptr{Nothing}, object::Ptr{Nothing})::GMTcpt
+function get_palette(object::Ptr{Nothing})::GMTcpt
 # Given a GMT CPT C, build a Julia type and assign values.
 # Each segment will have 10 items:
 # colormap:	Nx3 array of colors usable in Matlab' colormap
@@ -599,7 +599,7 @@ function get_palette(API::Ptr{Nothing}, object::Ptr{Nothing})::GMTcpt
 end
 
 # ---------------------------------------------------------------------------------------------------
-function get_PS(API::Ptr{Nothing}, object::Ptr{Nothing})::GMTps
+function get_PS(object::Ptr{Nothing})::GMTps
 # Given a GMT Postscript structure P, build a Julia PS type
 # Each segment will have 4 items:
 # postscript:	Text string with the entire PostScript plot
@@ -610,7 +610,7 @@ function get_PS(API::Ptr{Nothing}, object::Ptr{Nothing})::GMTps
 
 	P::GMT_POSTSCRIPT = unsafe_load(convert(Ptr{GMT_POSTSCRIPT}, object))
 	P.data == C_NULL && return GMTps()		# A bug in pstext.c causes coming here when pstext -L is used
-	out = GMTps(unsafe_string(P.data), Int(P.n_bytes), Int(P.mode), String[])	# NEED TO FILL THE COMMENT
+	GMTps(unsafe_string(P.data), Int(P.n_bytes), Int(P.mode), String[])	# NEED TO FILL THE COMMENT
 end
 
 # ---------------------------------------------------------------------------------------------------
@@ -801,11 +801,11 @@ function GMTJL_Get_Object(API::Ptr{Nothing}, X::GMT_RESOURCE)
 	elseif (X.family == GMT_IS_DATASET)		# A GMT table; make it a matrix and the pos'th output item
 		ptr = get_dataset(X.object)
 	elseif (X.family == GMT_IS_PALETTE)		# A GMT CPT; make it a colormap and the pos'th output item
-		ptr = get_palette(API, X.object)
+		ptr = get_palette(X.object)
 	elseif (X.family == GMT_IS_IMAGE)		# A GMT Image; make it the pos'th output item
 		ptr = get_image(API, X.object)
 	elseif (X.family == GMT_IS_POSTSCRIPT)	# A GMT PostScript string; make it the pos'th output item
-		ptr = get_PS(API, X.object)
+		ptr = get_PS(X.object)
 #		status = GMT_Call_Module(API, "psconvert", GMT_MODULE_CMD, "# -A -Tg")
 #		status = GMT_Call_Module(API, "psconvert", GMT_MODULE_CMD, name_PS * " -A -Tf")
 	else
diff --git a/src/gmtlogo.jl b/src/gmtlogo.jl
@@ -1,5 +1,5 @@
 """
-    logo(cmd0::String=""; kwargs...)
+    logo(; kwargs...)
 
 Plots the GMT logo on a map. By default, the GMT logo is 5 cm wide and 2.5 cm high and will be
 positioned relative to the current plot origin. Use various options to change this and to place
@@ -34,12 +34,12 @@ Parameters
 
 - Example, make a GMT Julia logo with circles of 1 cm: logo(GMTjulia=1, show=true)
 """
-logo!(cmd0::String=""; first=false, kw...) = logo(cmd0; first=first, kw...)
-function logo(cmd0::String=""; first=true, kw...)
+logo!(; first=false, kw...) = logo(; first=first, kw...)
+function logo(; first=true, kw...)
 	d, K, O = init_module(first, kw...)		# Also checks if the user wants ONLY the HELP mode
-	logo(cmd0, O, K, d)
+	logo(O, K, d)
 end
-function logo(cmd0::String, O::Bool, K::Bool, d::Dict{Symbol, Any})
+function logo(O::Bool, K::Bool, d::Dict{Symbol, Any})
 
 	cmd, = parse_R(d, "", O=O)
 	cmd, = parse_J(d, cmd, default=" -Jx1", map=true, O=O)
diff --git a/src/grd2kml.jl b/src/grd2kml.jl
@@ -65,7 +65,7 @@ function grd2kml_helper(cmd0::String, arg1, d::Dict{Symbol, Any})
                                      [:L :tilesize :tile_size], [:N :prefix], [:Q :nan_t :nan_alpha], [:S :extra_layers :extralayers], [:T :title], [:W :contours]])
 
 	cmd, got_fname, arg1 = find_data(d, cmd0, cmd, arg1)		# Find how data was transmitted
-	cmd, N_used, arg1, arg2, = get_cpt_set_R(d, cmd0, cmd, " ", got_fname, arg1, arg2)
+	cmd, _, arg1, arg2, = get_cpt_set_R(d, cmd0, cmd, " ", got_fname, arg1, arg2)
 	cmd, arg1, arg2, arg3 = common_shade(d, cmd, arg1, arg2, arg3, nothing, "grd2kml")
 	common_grd(d, "grd2kml " * cmd, arg1, arg2, arg3)		# Finish build cmd and run it
 end
diff --git a/src/grdlandmask.jl b/src/grdlandmask.jl
@@ -49,7 +49,7 @@ end
 
 # ---------------------------------------------------------------------------------------------------
 function grdlandmask_helper(w::wrapGrids, d::Dict{Symbol, Any})
-	cmd0, arg1 = unwrapGrids(w)
+	_, arg1 = unwrapGrids(w)
 
     cmd::String, prj::String = "", ""
 	if (arg1 !== nothing)
diff --git a/src/imshow.jl b/src/imshow.jl
@@ -26,10 +26,10 @@ julia> imshow(G, shade="+a45", contour=true)
 julia> imshow(rand(128,128))
 
 # Display a web downloaded jpeg image wrapped into a sinusoidal projection
-julia> imshow(gmtread()"http://larryfire.files.wordpress.com/2009/07/untooned_jessicarabbit.jpg"), region=:global, frame="g", proj=:sinu)
+julia> imshow(gmtread("http://larryfire.files.wordpress.com/2009/07/untooned_jessicarabbit.jpg"), region=:global, frame="g", proj=:sinu)
 
 # Plot images in the walls of the cube for the 3D view cases. Replace file names with those that exist for you.
-julia> viz(G, zsize=6, facades=(TESTSDIR*"assets/cenora_base.jpg", TESTSDIR*"bunny_cenora.webp", TESTSDIR*"burro_cenora.webp"))
+julia> viz(G, zsize=6, facades=(tests("cenora_base.jpg"), tests("bunny_cenora.webp"), tests("burro_cenora.webp")))
 ```
 See also: [`grdimage`](@ref), [`grdview`](@ref)
 """
@@ -127,16 +127,16 @@ end
 # - `T, no_interp, tiles`: -T option for grdview
 # - `facades, cubeplot`: Call cubeplot.
 function imshow(arg1::GItype; kw...)
-	_imshow_GI(arg1, KW(kw))
+	d = KW(kw)
+	see::Bool = (!haskey(d, :show)) ? true : (d[:show] != 0)	# No explicit 'show' keyword means show=true
+	d[:show] = see
+	(isa(arg1, GMTimage) && (size(arg1, 3) <= 3 || arg1.layout[4] == 'A')) &&	# Rest of the work is done in grdimage
+		return grdimage_helper(wrapGrids("", arg1), nothing, nothing, true, false, d)
+	_imshow_GI(arg1, d)
 end
 function _imshow_GI(arg1::GItype, d::Dict{Symbol,Any})
 	see::Bool = (!haskey(d, :show)) ? true : (d[:show] != 0)	# No explicit 'show' keyword means show=true
 
-	if (isa(arg1, GMTimage) && (size(arg1, 3) <= 3 || arg1.layout[4] == 'A'))	# Rest of the work is done in grdimage
-		d[:show] = see
-		return grdimage_helper(wrapGrids("", arg1), nothing, nothing, true, false, d)
-	end
-
 	if ((cont_opts = find_in_dict(d, [:contour])[1]) !== nothing)
 		new_see = see
 		see = false				# because here we know that 'see' has to wait till last command
@@ -212,7 +212,9 @@ function _imshow_GI(arg1::GItype, d::Dict{Symbol,Any})
 			subplot(see ? :show : :end)
 			R = nothing
 		else
-			R = grdimage("", arg1; show=see, d...)
+			d[:show] = see
+			R = grdimage_helper(wrapGrids("", arg1), nothing, nothing, true, false, d)
+			#R = grdimage("", arg1; show=see, d...)
 		end
 	else
 		zsize = ((val = find_in_dict(d, [:JZ :Jz :zscale :zsize])[1]) !== nothing) ? val : 8
diff --git a/src/marker_name.jl b/src/marker_name.jl
@@ -157,7 +157,7 @@ function seek_custom_symb(marca::AbstractString, with_k::Bool=false)::String
 	(with_k && marca[1] != 'k') && return marca		# Not a custom symbol, return what we got.
 
 	function find_this_file(pato, symbname)
-		for (root, dirs, files) in walkdir(pato)
+		for (root, _, files) in walkdir(pato)
 			ind = findfirst(startswith.(files, symbname))
 			if (ind !== nothing)  return joinpath(root, files[ind])  end
 		end
diff --git a/src/movie.jl b/src/movie.jl
@@ -165,11 +165,12 @@ function jl_sc_2_shell_sc(name, name2::String)
 	else
 		name()			# Run the function, which must be defined ...
 	end
-	fname = write_script(name2)
+	write_script(name2)
 end
 
 # -----------------------------------------------------------------------------------------------
 function write_script(fname)
+	global cmds_history
 	if (cmds_history[1] != "")
 		if (Sys.iswindows())  fname *= ".bat";	b = "%";	e = "%"
 		else                  fname *= ".sh";	b = "\${";	e = "}"
diff --git a/src/pshistogram.jl b/src/pshistogram.jl
@@ -123,7 +123,6 @@ function histogram_helper(cmd0::String, arg1, O::Bool, K::Bool, d::Dict{Symbol,A
 	cmd = add_opt_fill(cmd, d, [:G :fill], "G")
 	cmd = add_opt(d, cmd, "D", [:D :annot :annotate :counts], (beneath = "_+b", font = "+f", offset = "+o", vertical = "_+r"))
 	cmd = parse_INW_coast(d, [[:N :distribution :normal]], cmd, "N")
-	(SHOW_KWARGS[]) && print_kwarg_opts(symbs, "NamedTuple | Tuple | Dict | String")
 
 	cmd = add_opt(d, cmd, "E", [:E :width], (width = "", off = "+o", offset = "+o"))
 	
diff --git a/src/psxy.jl b/src/psxy.jl
@@ -563,7 +563,7 @@ end
 # ---------------------------------------------------------------------------------------------------
 function check_ribbon(d::Dict{Symbol, Any}, arg1::GMTdataset, cmd::String, opt_W::String)
 	((val = find_in_dict(d, [:ribbon :band])[1]) === nothing) && return arg1, cmd
-	ec1, ec2, add_2 = helper_check_ribbon(val)		# Function barrier agains Anys
+	ec1, ec2, add_2 = helper_check_ribbon(val, size(arg1,1)::Int)		# Function barrier agains Anys
 	(add_2) ? add2ds!(arg1, ec2; names=["Zbnd1","Zbnd2"]) : add2ds!(arg1, ec1; name="Zbnd")
 	d[:L] = (add_2) ? "+D" : "+d"
 	(!occursin(cmd, "-W") && opt_W == "") && (cmd *= " -W0.5p")		# Do not leave without a line specification
@@ -572,7 +572,7 @@ end
 
 function check_ribbon(d::Dict{Symbol, Any}, arg1::Vector{<:GMTdataset}, cmd::String, opt_W::String)
 	((val = find_in_dict(d, [:ribbon :band])[1]) === nothing) && return arg1, cmd
-	ec1, ec2, add_2 = helper_check_ribbon(val)		# Function barrier agains Anys
+	ec1, ec2, add_2 = helper_check_ribbon(val, size(arg1[1],1)::Int)		# Function barrier agains Anys
 	if (add_2)
 		for k = 1:numel(arg1)  add2ds!(arg1[k], ec2; names=["Zbnd1","Zbnd2"])  end
 	else
@@ -583,15 +583,15 @@ function check_ribbon(d::Dict{Symbol, Any}, arg1::Vector{<:GMTdataset}, cmd::Str
 	return arg1, cmd
 end
 
-function helper_check_ribbon(val)::Tuple{Vector{Float64}, Matrix{Float64}, Bool}
+function helper_check_ribbon(val, nc::Int)::Tuple{Vector{Float64}, Matrix{Float64}, Bool}
 	# Isolate here the fact that 'val' is a Any
 	add_2 = true
 	ec1, ec2 = Float64[], Matrix{Float64}[]
 	if isa(val, Real)
-		ec1 = repeat([float(val)::Float64], size(arg1,1)::Int)
+		ec1 = repeat([float(val)::Float64], nc)
 		add_2 = false
 	elseif (isa(val, VecOrMat{<:Real}) || isa(val, Tuple{<:Real, <:Real}))
-		(length(val)::Int == 2) ? (ec2 = repeat([float(val[1])::Float64 float(val[2])::Float64], size(arg1,1)::Int)) :
+		(length(val)::Int == 2) ? (ec2 = repeat([float(val[1])::Float64 float(val[2])::Float64], nc)) :
 		                           ec2 = [Float64.(vec(val)) Float64.(vec(val))]
 	elseif isa(val, Tuple{Vector{<:Real}, Vector{<:Real}})
 		ec2 = [Float64.(val[1]) Float64.(val[2])]
@@ -898,7 +898,7 @@ function parse_opt_S(d::Dict, @nospecialize(arg1), is3D::Bool=false)
 			_arg[_arg .< mi_val] .= mi_sz
 			_arg[_arg .> ma_val] .= ma_sz
 		end
-		((sc_local = _scale(isInt)) != 1.0) && (_arg .*= sc_local)
+		isInt && (_arg .*= 2.54/72)
 	end
 
 	if (opt_S == "" || (have_custom && custom_no_size))		# OK, no symbol given via the -S option. So fish in aliases
diff --git a/src/segy/segy.jl b/src/segy/segy.jl
@@ -61,7 +61,7 @@ function segyz_helper(cmd0::String, O::Bool, K::Bool, d::Dict{Symbol, Any})
 	cmd = ((IamModern[]) ? "segyz "  : "pssegyz ") * cmd0
 	cmd = parse_BJR(d, "", "", O, "")[1]
 	cmd = parse_common_opts(d, cmd, [:V_params :UVXY :p :t :params], first=!O)[1]
-	cmd, opt_JZ = parse_JZ(d, cmd, O=O, is3D=true)
+	cmd = parse_JZ(d, cmd, O=O, is3D=true)[1]
 	cmd = segy_common(d, cmd)
 
 	# -S trace location header (segyz: header_x/header_y)
diff --git a/src/segy/segy2grd.jl b/src/segy/segy2grd.jl
diff --git a/src/utils.jl b/src/utils.jl
