Yet more CoreBoxes fixes. (#1878)

Author: joa-quim

src/beziers.jl

@@ -114,18 +114,20 @@ function bezier(p::Matrix{<:Real}; t=nothing, np::Int=0, pure=false, firstcurve=
 end
 
 function helper_bezier_cb(o::Matrix{Float64}, p::Matrix{Float64}, t, firstcurve::Bool)::Matrix{Float64}
-	# Made this function barrier to restrict the Core.box. For some incomprehensible reason, 'o' becomes
-	# a Core.box and that happens due to the appending (the 'vcats' below). Both Cthulhu and the debugger
-	# show that 'o' is no longer a Core.box when it lands on the calling function.
 	# This function is not efficient due to the matrix concatenations, but it's not expeced to cat much data.
 	for k = 5:size(p, 1)
 		oo = bezier(p[k-3,:], p[k-2,:], p[k-1,:], p[k,:]; t=t)
+		d = Vector{Float64}(undef, size(oo, 1))
 		if (firstcurve)
 			xn = o[end,1];		yn = o[end,2];		zn = o[end,3]
-			d::Vector{Float64} = [(oo[n,1] - xn)^2 + (oo[n,2] - yn)^2 + (oo[n,3] - zn)^2 for n = 1:size(oo, 1)]
+			@inbounds for n = 1:size(oo, 1)
+				d[n] = (oo[n,1] - xn)^2 + (oo[n,2] - yn)^2 + (oo[n,3] - zn)^2
+			end
 		else
 			xn = oo[1,1];		yn = oo[1,2];		zn = oo[1,3]
-			d = [(o[n,1] - xn)^2 + (o[n,2] - yn)^2 + (o[n,3] - zn)^2 for n = 1:size(oo, 1)]
+			@inbounds for n = 1:size(oo, 1)
+				d[n] = (o[n,1] - xn)^2 + (o[n,2] - yn)^2 + (o[n,3] - zn)^2
+			end
 		end
 		m = argmin(d)
 		o = firstcurve ? vcat(o, oo[m+1:end,:]) : vcat(o[1:m,:], oo)

src/gdal_utils.jl

@@ -157,7 +157,7 @@ function gd2gmt_helper_scalefac(mat::Array{<:Real}, scale_factor, add_offset, go
 		if (eltype(mat) <: Integer)
 			mat = mat .* scale_factor .+ add_offset		# Also promotes (and pay) the array to float32
 		else
-			@inbounds Threads.@threads for k = 1:lastindex(mat)  mat[k] = mat[k] * scale_factor + add_offset  end
+			@inbounds for k = 1:lastindex(mat)  mat[k] = mat[k] * scale_factor + add_offset  end
 		end
 	end
 	(got_fill_val) && (mat[nodata] .= NaN)

src/img_funs.jl

@@ -249,7 +249,7 @@ function helper_rgb2ycbcr(I::GMTimage{UInt8,3}, c1, c2, c3, add)
 		end
 	else
 		i = 0
-		@inbounds Threads.@threads for ij = 1:3:3nxy
+		@inbounds for ij = 1:3:3nxy
 			img[i+=1] = round(UInt8, add + c1 * _Img[ij] + c2 * _Img[ij+1] + c3 * _Img[ij+2])
 		end
 	end

src/plot.jl

@@ -1993,7 +1993,11 @@ function piechart(x::VecOrMat; first::Bool=true, kw...)
 		data[k, 4] = data[k-1, 3]
 	end
 
-	mid_angs = [(data[k, 3] + data[k, 4]) / 2 for k = 1:numel(x)]		# Compute the bissections angles
+	#mid_angs = [(data[k, 3] + data[k, 4]) / 2 for k = 1:numel(x)]		# Compute the bissections angles
+	mid_angs = Vector{Float64}(undef, length(x))
+	@inbounds for k = 1:numel(x)				# Compute the bissections angles
+		mid_angs[k] = (data[k, 3] + data[k, 4]) / 2
+	end
 
 	do_explode = false
 	non_exploded = ones(Bool, length(X))		# Default to no explosion

src/remotegrids.jl

@@ -209,7 +209,7 @@ function remotegrid(name, res_p::String=""; res::String="", reg::String="", info
 	end
 	(info == 1 && n_under > 1) && (@warn("No information for $(name) available when resolution was also specified"); return "")
 
-	function check_reg(name, grdtype, reg, ind)
+	function check_reg(name, grdtype, reg, ind, res)
 		# Check if 'reg' is valid for 'name' and 'grdtype' and set 'name' accordingly
 		_reg = lowercase(reg[1])
 		(_reg != 'p' && _reg != 'g') && error("Bad registration code $(reg). Must be one of 'grid' or 'pixel'")
@@ -225,15 +225,15 @@ function remotegrid(name, res_p::String=""; res::String="", reg::String="", info
 		ind::Int = _ind							# Fck Anys
 		(res != "5m") ? (res = thisgrid_res[ind]) : (res = "05m")	# 5m is an exception because it may be miscatch by 15m
 		name *= "_" * res
-		(reg != "") && (name = check_reg(name, thisgrid, reg, ind))
+		(reg != "") && (name = check_reg(name, thisgrid, reg, ind, res))
 	elseif (n_under == 2 && reg != "")			# name & type & res
 		ind_res::Int = findlast(name, '_')
 		thisgrid = eval(Symbol(name[1:ind_res-1]))
 		res = name[ind_res+1:end]
 		length(res) == 2 && (res = "0" * res)	# To allow both 01d and 1d
 		((_ind = findfirst(contains.(thisgrid_res, res))) === nothing) && error("Bad resolution code $(res). Must be one of $thisgrid_res.")
 		ind = _ind
-		name = check_reg(name, thisgrid, reg, ind)
+		name = check_reg(name, thisgrid, reg, ind, res)
 	end
 
 	return "@" * name

src/solids.jl

@@ -349,7 +349,8 @@ Create a torus mesh with radius `r`.
 - `ny`: the number of vertices in the yy direction.
 """
 function torus(; r=2.0, R=5.0, center=(0.0, 0.0, 0.0), nx=100, ny=50)::GMTfv
-	if (R < r)  R, r = r, R  end
+	_r = (r < R) ? r : R	# Can't simply do this because of CoreBoxes: #if (R < r)  R, r = r, R  end
+	_R = (r < R) ? R : r
 	Θ, ϕ = range(-pi,pi,nx), range(-pi,pi,ny)
 	x = [(R + cos(v)) * cos(u) + center[1] for u in Θ, v in ϕ]
 	y = [(R + cos(v)) * sin(u) + center[2] for u in Θ, v in ϕ]

src/utils.jl

@@ -606,7 +606,7 @@ function isnodata(array::AbstractArray, val=0)
 	else                    indNaN = fill(false, nrows, ncols)
 	end
 	@inbounds Threads.@threads for k = 1:nrows * ncols * nlayers	# 5x faster than: indNaN = (I.image .== 0)
-		(array[k] == val) && (indNaN[k] = true)
+		(array[k] == val) && (indNaN[k] = true)	# With Threads.@threads it insists indNaN is a CoreBox but it's 2x faster
 	end
 	indNaN
 end