convert long int to long long int

heziqi
1 parent c9fd97f0
Showing 2 changed files with 6 additions and 12 deletions Show diff stats
envi/binary.h
envi/envi.h
@@ -34,10 +34,9 @@ protected:
  
 	//returns the file size
 	//	reads the file size from disk and returns it (in bytes)
-	unsigned int get_file_size(){
-
-		struct stat results;
-		if(stat(name.c_str(), &results) == 0)
+	long long int get_file_size(){
+		struct _stat64 results;
+		if(_stat64(name.c_str(), &results) == 0)
 			return results.st_size;
 		else return 0;
 	}
@@ -45,10 +44,10 @@ protected:
 	//make sure that the specified file size matches the file size on disk
 	//	returns true/false
 	bool test_file_size(){
-		unsigned int npts = 1;				//initialize the number of data points to 1
+		long long int npts = 1;				//initialize the number of data points to 1
 		for(unsigned int i = 0; i<D; i++)	//iterate over each dimension
 			npts *= R[i];					//compute the total number of data points in the file
-		unsigned int datasize = npts * sizeof(T);//multiply the sum by the size of the template parameter
+		long long int datasize = npts * sizeof(T);//multiply the sum by the size of the template parameter
  
 		if(datasize + header == get_file_size()) return true;	//if the byte size matches the file size, we're golden
 		else return false;					//otherwise return an error
@@ -618,12 +618,6 @@ public:
  
 			pi++;
 		}
-		//at this point, pi is an index to the mi'th valid pixel
-
-		//load the next N valid pixels
-		//for(unsigned i = 0; i < N; i++){
-
-		//}
  
 		for(unsigned i = pi; i < pixels; i++){
 			if(mask[i] != 0){
@@ -644,6 +638,7 @@ public:
 			std::cout << "number of valid pixels in the mask : " << count <<"is less than N: "<< N;
 			exit(1);
 		}
+		free(p);
 		return true;
 	}