fixed errors in computing metrics.

David Mayerich
1 parent 517876d6
Showing 7 changed files with 24 additions and 13 deletions Show diff stats
envi/bil.h
envi/binary.h
envi/bip.h
envi/bsq.h
envi/envi.h
envi/envi_header.h
visualization/colormap.h
@@ -29,8 +29,6 @@ public:
  
 		return open(filename, vec<unsigned int>(X, Y, B), header_offset);
  
-		return false;
-		
 	}
  
 	//save one band of the file into the memory, and return the pointer
@@ -56,6 +54,10 @@ public:
  
 	bool band( T * p, double wavelength){
  
+		//if there are no wavelengths in the BSQ file
+		if(w.size() == 0)
+			return band_index(p, (unsigned int)wavelength);
+
 		unsigned int XY = R[0] * R[1];	//calculate the number of pixels in a band
 		unsigned int S = XY * sizeof(T);		//calculate the number of bytes of a band
  
@@ -22,10 +22,13 @@ protected:
 	unsigned int header;	//header size (in bytes)
  
  
+
+
 	//basic initialization
 	void init(){
 		memset(R, 0, sizeof(unsigned int) * D);		//initialize the resolution to zero
 		header = 0;									//initialize the header size to zero
+
 	}
  
 	//returns the file size
@@ -34,8 +34,6 @@ public:
 		offset = header_offset;
  
 		return open(filename, vec<unsigned int>(X, Y, B), header_offset);
-
-		return false;
  
 	}
  
@@ -60,6 +58,10 @@ public:
  
 	bool band( T * p, double wavelength){
  
+		//if there are no wavelengths in the BSQ file
+		if(w.size() == 0)
+			return band_index(p, (unsigned int)wavelength);
+
 		unsigned int XY = R[0] * R[1];	//calculate the number of pixels in a band
  
 		unsigned page=0;                      //bands around the wavelength
@@ -37,8 +37,6 @@ public:
 		offset = header_offset;
  
 		return open(filename, vec<unsigned int>(X, Y, B), header_offset);
-
-		return false;
  
 	}
  
@@ -61,8 +59,11 @@ public:
 	//retrieve one band (specified by the wavelength)
 	bool band( T * p, double wavelength){
  
-		unsigned int XY = R[0] * R[1];	//calculate the number of pixels in a band
+		//if there are no wavelengths in the BSQ file
+		if(w.size() == 0)
+			return band_index(p, (unsigned int)wavelength);
  
+		unsigned int XY = R[0] * R[1];	//calculate the number of pixels in a band
 		unsigned page=0;                      //bands around the wavelength
  
  
@@ -506,6 +506,7 @@ public:
 				return ((bsq<float>*)file)->band((float*)ptr, wavelength);
  
 		}
+		return false;
  
 	}
  
@@ -305,7 +305,7 @@ struct envi_header
  
 		//make sure the number of bands matches the number of wavelengths
 		unsigned int wavelengths = wavelength.size();
-		if(bands != wavelengths)
+		if(wavelengths && bands != wavelengths)
 		{
             std::cout<<"ENVI Header Error -- Number of wavelengths doesn't match the number of bands.  Bands = "<<bands<<", Wavelengths = "<<wavelength.size()<<std::endl;
             exit(1);
@@ -365,10 +365,13 @@ struct envi_header
 			}
 			outfile<<"}"<<std::endl;
 		}
-		outfile<<"wavelength = {"<<std::endl;
-			for(unsigned int i=0; i<wavelength.size()-1; i++)
-				outfile<<wavelength[i]<<", ";
-			outfile<<wavelength.back()<<"}"<<std::endl;
+		//if there is a list of wavelengths, output it
+		if(wavelength.size()){
+			outfile<<"wavelength = {"<<std::endl;
+				for(unsigned int i=0; i<wavelength.size()-1; i++)
+					outfile<<wavelength[i]<<", ";
+				outfile<<wavelength.back()<<"}"<<std::endl;
+		}
  
 		outfile.close();
 	}
@@ -216,7 +216,6 @@ static void cpuApplyBrewer(T* cpuSource, unsigned char* cpuDest, unsigned int N,
     for(int i=0; i<N; i++)
     {
         //compute the normalized value on [minVal maxVal]
-        T v = cpuSource[i];
         float a = (cpuSource[i] - minVal) / (maxVal - minVal);
         if(a < 0) a = 0;
         if(a > 1) a = 1;