From cac62fd30760d9565a5d535df09b514997fe53e1 Mon Sep 17 00:00:00 2001
From: David Mayerich <mayerich@uh.edu>
Date: Tue, 7 Oct 2014 11:03:59 -0500
Subject: [PATCH] modified to work on GCC

---
 envi/bil.h     | 6 +++---
 envi/bsq.h     | 3 ++-
 ui/arguments.h | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/envi/bil.h b/envi/bil.h
index d2a0c88..1c586f4 100644
--- a/envi/bil.h
+++ b/envi/bil.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
+}
diff --git a/envi/bsq.h b/envi/bsq.h
index 82d1345..cf3dea7 100644
--- a/envi/bsq.h
+++ b/envi/bsq.h
@@ -1,5 +1,6 @@
 #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);
diff --git a/ui/arguments.h b/ui/arguments.h
index 99f3975..9b77c6d 100644
--- a/ui/arguments.h
+++ b/ui/arguments.h
@@ -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)
--
libgit2 0.21.4