From 8d1eb59875798f53b19e5114c92f4acb231d2fef Mon Sep 17 00:00:00 2001
From: heziqi <heziqi36@gmail.com>
Date: Fri, 26 Sep 2014 05:49:45 +0800
Subject: [PATCH] Ziqi added new bsq

---
 envi/bsq.h     | 4 ----
 ui/arguments.h | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/envi/bsq.h b/envi/bsq.h
index 70e2e3d..9720599 100644
--- a/envi/bsq.h
+++ b/envi/bsq.h
@@ -13,10 +13,6 @@ protected:
 	
 	envi header;
 
-	Assistant Professor
-	CPRIT Scholar
-	Scalable Tissue Imaging + Modeling Laboratory
-
 public:
 
 	using binary<T>::open;
diff --git a/ui/arguments.h b/ui/arguments.h
index 5503720..0d105a4 100644
--- a/ui/arguments.h
+++ b/ui/arguments.h
@@ -329,7 +329,7 @@ namespace stim{
             {
                 args[i].set(_value);
                 //adjust the column width if necessary
-                col_width = std::max(col_width, args[i].col_width());
+                col_width = (std::max)(col_width, args[i].col_width());
             }
             else
                 std::cout<<"ERROR - Argument not recognized: "<<_name<<std::endl;
--
libgit2 0.21.4