fixed colormap.h CUDA dependence, fixed warning in envi_header

David Mayerich
1 parent 6abbfbdc
Showing 3 changed files with 4 additions and 4 deletions Show diff stats
stim/envi/bip.h
stim/envi/envi_header.h
stim/visualization/colormap.h
@@ -1089,7 +1089,7 @@ public:
 	}
-	#ifdef CUDA_FOUND
+#ifdef CUDA_FOUND
 	/// Calculate the covariance matrix of Noise for masked pixels using cuBLAS
 	/// Note that cuBLAS only supports integer-sized arrays, so there may be issues with large spectra
 	bool coNoise_matrix_cublas(double* coN, double* avg, unsigned char *mask, bool PROGRESS = false){
@@ -446,8 +446,8 @@ struct envi_header
 		if(wavelength.size() == 0){										//if a wavelength vector doesn't exist, assume the passed value is a band
 			if(w < 0 || w > bands-1) return idx;						//if the band is outside the given band range, return an empty vector
 			size_t low, high;											//allocate space for the floor and ceiling
-			low = std::floor(w);										//calculate the floor
-			high = std::ceil(w);										//calculate the ceiling
+			low = (size_t)std::floor(w);										//calculate the floor
+			high = (size_t)std::ceil(w);										//calculate the ceiling
 			if(low == high)												//if the floor and ceiling are the same
 				idx.push_back(low);										//return a vector with one element (the given w matches a band exactly)
 			else{
@@ -4,13 +4,13 @@
 #include <string>
 #include <stdlib.h>
 #include <cmath>
-#include "cublas_v2.h"
 #ifdef _WIN32
 	#include <float.h>
 #endif
 #ifdef __CUDACC__
+#include "cublas_v2.h"
 #include <stim/cuda/cudatools/error.h>
 #endif