fixed the in-memory sifting functions for stim::envi to take NULL masks

David Mayerich
1 parent d0ef98e3
Showing 5 changed files with 9 additions and 6 deletions Show diff stats
stim/envi/bil.h
stim/envi/bip.h
stim/envi/bsq.h
stim/envi/envi.h
stim/parser/table.h
@@ -884,7 +884,7 @@ public:
 	///		using the following indexing: i = p*B + b
 	/// @param matrix is the destination for the pixel data
 	/// @param mask is the mask
-	bool sift(T* matrix, unsigned char* mask){
+	bool sift(T* matrix, unsigned char* mask = NULL){
 		size_t Lbytes = sizeof(T) * X();
 		T* line = (T*) malloc( Lbytes );					//allocate space for a line
  
@@ -897,7 +897,7 @@ public:
 				pl = 0;										//initialize the pixel offset for the current line to zero (0)
 				file.read( (char*)line, Lbytes );			//read the current line
 				for(size_t x = 0; x < X(); x++){
-					if(mask[y * X() + x]){					//if the current pixel is masked
+					if(mask == NULL || mask[y * X() + x]){					//if the current pixel is masked
 						size_t i = (p + pl) * Z() + b;		//calculate the index in the sifted matrix
 						matrix[i] = line[x];				//store the current value in the line at the correct matrix location
 						pl++;								//increment the pixel pointer
@@ -817,7 +817,7 @@ public:
 	///		using the following indexing: i = p*B + b
 	/// @param matrix is the destination for the pixel data
 	/// @param mask is the mask
-	bool sift(T* matrix, unsigned char* mask){
+	bool sift(T* matrix, unsigned char* mask = NULL){
 		size_t Bbytes = sizeof(T) * Z();
 		size_t XY = X() * Y();
 		T* band = (T*) malloc( Bbytes );					//allocate space for a line
@@ -826,7 +826,7 @@ public:
  
 		size_t p = 0;										//create counter variables
 		for(size_t xy = 0; xy < XY; xy++){					//for each pixel
-			if(mask[xy]){									//if the current pixel is masked
+			if(mask == NULL || mask[xy]){									//if the current pixel is masked
 				file.read( (char*)band, Bbytes );			//read the current line
 				for(size_t b = 0; b < Z(); b++){			//copy each band value to the sifted matrix
 					size_t i = p * Z() + b;					//calculate the index in the sifted matrix
@@ -809,7 +809,7 @@ public:
 	///		using the following indexing: i = p*B + b
 	/// @param matrix is the destination for the pixel data
 	/// @param mask is the mask
-	bool sift(T* matrix, unsigned char* mask){
+	bool sift(T* matrix, unsigned char* mask = NULL){
 		unsigned long long XY = X() * Y(); 					//Number of XY pixels
 		unsigned long long L = XY * sizeof(T); 				//size of XY plane (in bytes)
  
@@ -665,7 +665,7 @@ public:
 	///		using the following indexing: i = b*P + p
 	/// @param matrix is the destination for the pixel data
 	/// @param p is the mask
-	bool sift(void* matrix, unsigned char* p){
+	bool sift(void* matrix, unsigned char* p = NULL){
  
 		if (header.interleave == envi_header::BSQ){		//if the infile is bsq file
 			if (header.data_type == envi_header::float32)
@@ -1181,6 +1181,7 @@ public:
 		else if (header.interleave == envi_header::BIP){
 			if (header.data_type == envi_header::float32){
 				((bip<float>*)file)->spectrum((float*)temp, n, PROGRESS);
+				float test = ((float*)temp)[0];
 				cast<T, float>(ptr, (float*)temp, header.bands);
 			}
 			else if (header.data_type == envi_header::float64){
@@ -34,6 +34,8 @@ namespace stim{
 		template<typename T>
 		T operator<<(T i){
 			std::stringstream ss;
+			if(std::is_fundamental<T>())						//if the data type is numeric
+				ss<<std::setprecision(std::numeric_limits<T>::digits10 + 3);	//set the precision to account for all digits
 			ss<<i;
 			TABLE[y].push_back(ss.str());
 			x++;