diff --git a/stim/envi/bsq.h b/stim/envi/bsq.h index 0e71748..5bc20c9 100644 --- a/stim/envi/bsq.h +++ b/stim/envi/bsq.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::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; } diff --git a/stim/parser/arguments.h b/stim/parser/arguments.h index c3811c1..79c4a22 100644 --- a/stim/parser/arguments.h +++ b/stim/parser/arguments.h @@ -357,9 +357,9 @@ namespace stim{ if(si != -1 && a == sections[si].index) { if(ansi) - ss< get_list(){ #ifdef _WIN32 //get a list of files matching the current template - std::vector 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 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."<