modified to work on GCC

David Mayerich
1 parent f6169dea
Showing 3 changed files with 8 additions and 7 deletions Show diff stats
envi/bil.h
envi/bsq.h
ui/arguments.h
@@ -350,7 +350,7 @@ public:
 				target.write(reinterpret_cast<const char*>(p), S);   //write a band data into target file	
 		}
  
-		header.interleave = rts::envi::interleaveType::BSQ;  //change the type of file in header file
+		header.interleave = rts::envi::BSQ;  //change the type of file in header file
 		header.save(headername);
  
 		free(p);
@@ -384,7 +384,7 @@ public:
 			target.write(reinterpret_cast<const char*>(q), S);   //write a band data into target file	
 		}
  
-		header.interleave = rts::envi::interleaveType::BIP;  //change the type of file in header file
+		header.interleave = rts::envi::BIP;  //change the type of file in header file
 		header.save(headername);
  
 		free(p);
@@ -400,4 +400,4 @@ public:
 	}
  
 	};
-}
 \ No newline at end of file
+}
 #include "../envi/envi.h"
 #include "../envi/binary.h"
+#include "../envi/bil.h"
 #include <cstring>
 #include <utility>
  
@@ -291,7 +292,7 @@ public:
 			}					
 			target.write(reinterpret_cast<const char*>(p), L);   //write XZ slice data into target file	
 		}
-		header.interleave = rts::envi::interleaveType::BIL;  //change the type of file in header file
+		header.interleave = rts::envi::BIL;  //change the type of file in header file
 		header.save(headername);
  
 		free(p);
@@ -313,12 +313,12 @@ namespace stim{
  
         int index(std::string _name)
         {
-        	int i = find(args.begin(), args.end(), _name) - args.begin();
+        	unsigned int i = find(args.begin(), args.end(), _name) - args.begin();
  
             if(i >= args.size())
-                i = -1;
+                return -1;
  
-            return i;
+            return (int)i;
         }
  
         void set(std::string _name, std::string _value)