fixed linux compatibility issues

David Mayerich
1 parent abdb93f5
Showing 3 changed files with 17 additions and 15 deletions Show diff stats
stim/envi/bsq.h
stim/parser/arguments.h
stim/parser/filename.h
@@ -157,7 +157,7 @@ public:
 			return false;
 		}
-		file.seekg(n * sizeof(T) + header, std::ios::beg);           //point to the certain pixel
+		file.seekg(n * sizeof(T) + binary<T>::header, std::ios::beg);           //point to the certain pixel
 		for (unsigned i = 0; i < Z(); i++)
 		{
 			file.read((char *)(p + i), sizeof(T));
@@ -793,7 +793,7 @@ public:
 				if(mask[xy] != 0) P++;
 			}
 		}
-		
+
 		T* band_image = (T*) malloc( XY * sizeof(T));		//allocate space for a single band
 		unsigned long long i;								//pixel index into the sifted array
@@ -808,7 +808,7 @@ public:
 				}
 			}
 		}
-		
+
 		return true;
 	}
@@ -357,9 +357,9 @@ namespace stim{
                 if(si != -1 && a == sections[si].index)
                 {
 					if(ansi)
-						ss<<std::endl<<std::left<<std::setfill('=')<<std::setw(col_width)<<std::string("w(col_width)<<std::string("\033[1;31m") + sections[si].name<<"\033[0m"<<std::endl;33[1;31m") + sections[si].name<<"w(col_width)<<std::string("\033[1;31m") + sections[si].name<<"\033[0m"<<std::endl;33[0m"<<std::endl;
+						ss<<std::endl<<std::left<<std::setw(col_width)<<std::string("w(col_width)<<std::string("\033[1;31m") + sections[si].name<<"\033[0m"<<std::endl;33[1;31m") + sections[si].name<<"w(col_width)<<std::string("\033[1;31m") + sections[si].name<<"\033[0m"<<std::endl;33[0m"<<std::endl;
 					else
-						ss<<std::endl<<std::left<<std::setfill('=')<<std::setw(col_width)<<sections[si].name<<std::endl;
+						ss<<std::endl<<std::left<<std::setw(col_width)<<sections[si].name<<std::endl;
                     si++;
                     if(si == (int)sections.size()) si = -1;
                 }
@@ -69,7 +69,7 @@ protected:
 		loc = unix_div(loc);
 		//determine the drive (if Windows)
-		drive = "";		
+		drive = "";
 		#ifdef _WIN32
 			//if the second character is a colon, the character right before it is the drive
 			if(loc[1] == ':'){
@@ -153,7 +153,7 @@ public:
 	}
 	//*****************************************************************************************************************
-	// output is the directory and the prefix and the extension of the files, which are looking for in that directory. 
+	// output is the directory and the prefix and the extension of the files, which are looking for in that directory.
 	std::string dir_fname(){
 		std::stringstream ss;
@@ -166,7 +166,7 @@ public:
 			ss<<STIM_FILENAME_DIV;
 		}
-		
+
 		for(unsigned int d = 0; d < path.size(); d++)
 			ss<<path[d]<<STIM_FILENAME_DIV;
 		ss<<get_name();
@@ -174,7 +174,7 @@ public:
 		return ss.str();
 	}
-	
+
 	// output is the directory and the name of the file which are found in that given directory
 	std::string f_name(std::string file_name){
 		std::stringstream ss;
@@ -201,10 +201,10 @@ public:
 	}
-	
+	std::vector<stim::filename> get_list(){
 #ifdef _WIN32
 	//get a list of files matching the current template
-	std::vector<stim::filename> get_list(){
+
 		//stim::filename file_path;
 		stim::filename filepath(dir_fname());
@@ -212,12 +212,12 @@ public:
 		HANDLE            hFind = INVALID_HANDLE_VALUE;
 		WIN32_FIND_DATAA   FindFileData;
 		std::vector<stim::filename> file_list;
-		
+
 		hFind = FindFirstFileA((filepath.str().c_str()), &FindFileData);
 		if (hFind == INVALID_HANDLE_VALUE) {
 			printf ("Invalid file handle. Error is %u.\n", GetLastError());
-		} 
+		}
 		else {
 			std::string file_name = FindFileData.cFileName;					//get the file name
 			std::string file_path = dir();
@@ -233,9 +233,11 @@ public:
 			FindClose(hFind);
 		}
 		return file_list;
-	
-	}
+#else
+	std::cout<<"File lists aren't currently supported on Unix/Linux systems."<<std::endl;
+	exit(1);
 #endif
+	}
 	//**************************************************************************************************
 	//gets the current working directory