Fix the rescale function that was still testing against nothing instead of isnan() (#1959)

Author: joa-quim

src/utils.jl

@@ -775,7 +775,7 @@ function rescale(A::AbstractArray; low=0.0, up=1.0, inputmin=NaN, inputmax=NaN,
 		sc  *= _tmax
 		low *= _tmax
 		if (have_nans)
-			if (inputmin === nothing && inputmax === nothing)	# Faster case. No IFs in loop
+			if (isnan(inputmin) && isnan(inputmax))
 				if (type == UInt8)
 					@inbounds for k = 1:numel(A)  isnan(A[k]) && (o[k] = 0; continue); o[k] = round(UInt8,  low + (A[k] -_inmin) * sc)  end
 				else
@@ -789,7 +789,7 @@ function rescale(A::AbstractArray; low=0.0, up=1.0, inputmin=NaN, inputmax=NaN,
 				end
 			end
 		else
-			if (inputmin === nothing && inputmax === nothing)	# Faster case. No IFs in loop
+			if (isnan(inputmin) && isnan(inputmax))
 				if (type == UInt8)
 					@inbounds for k = 1:numel(A)  o[k] = round(UInt8,  low + (A[k] -_inmin) * sc)  end
 				else
@@ -807,7 +807,7 @@ function rescale(A::AbstractArray; low=0.0, up=1.0, inputmin=NaN, inputmax=NaN,
 		oType = (eltype(A) <: AbstractFloat) ? eltype(A) : Float64
 		o = Array{oType}(undef, size(A))
 		if (oType <: Integer && have_nans)						# Shitty case
-			if (inputmin === nothing && inputmax === nothing)	# Faster case. No IFs in loop
+			if (isnan(inputmin) && isnan(inputmax))				# Faster case.
 				@inbounds for k = 1:numel(A)  isnan(A[k]) && (o[k] = 0; continue); o[k] = low + (A[k] -_inmin) * sc  end
 			else
 				@inbounds for k = 1:numel(A)
@@ -816,7 +816,7 @@ function rescale(A::AbstractArray; low=0.0, up=1.0, inputmin=NaN, inputmax=NaN,
 				end
 			end
 		else
-			if (inputmin === nothing && inputmax === nothing)	# Faster case. No IFs in loop
+			if (isnan(inputmin) && isnan(inputmax))				# Faster case. No IFs in loop
 				@inbounds for k = 1:numel(A)  o[k] = low + (A[k] -_inmin) * sc  end
 			else
 				@inbounds for k = 1:numel(A)

test/test_common_opts.jl

@@ -242,7 +242,7 @@
 	img16 = rand(UInt16, 16, 16, 3);
 	I = GMT.mat2img(img16);
 	img16 = rand(UInt16, 8, 8, 3);
-	I = GMT.GMTimage("", "", 0, -1, [1.,4,1,4,0,255], [1., 1], 1, NaN32, "", String[], String[], collect(1.:4),collect(1.:4),zeros(3),img16, vec(zeros(Int32,1,3)), String[], 0, Array{UInt8,2}(undef,1,1), "TCBa", 0)
+	I = GMT.GMTimage("", "", 0, -1, [1.,4,1,4,minimum(img16),maximum(img16)], [1., 1], 1, NaN32, "", String[], String[], collect(1.:4),collect(1.:4),zeros(3),img16, vec(zeros(Int32,1,3)), String[], 0, Array{UInt8,2}(undef,1,1), "TCBa", 0)
 	imagesc(I);
 	GMT.mat2img(I);
 	GMT.mat2img(img16, histo_bounds=8440);