From 0196c9ed45748100c33a77cc1a8c23174d61f7d4 Mon Sep 17 00:00:00 2001
From: David Mayerich <mayerich@uh.edu>
Date: Wed, 1 Jun 2016 18:05:15 -0500
Subject: [PATCH] temporarily removed support for different data types in image.h

---
 stim/image/image.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/stim/image/image.h b/stim/image/image.h
index df373f5..09a1aba 100644
--- a/stim/image/image.h
+++ b/stim/image/image.h
@@ -61,7 +61,7 @@ class image{
 
 
 	int cv_type(){
-		if(std::is_same<T, unsigned char>::value)	return CV_MAKETYPE(CV_8U, (int)C());
+		/*if(std::is_same<T, unsigned char>::value)	return CV_MAKETYPE(CV_8U, (int)C());
 		if(std::is_same<T, char>::value)			return CV_MAKETYPE(CV_8S, (int)C());
 		if(std::is_same<T, unsigned short>::value)	return CV_MAKETYPE(CV_16U, (int)C());
 		if(std::is_same<T, short>::value)			return CV_MAKETYPE(CV_16S, (int)C());
@@ -70,12 +70,13 @@ class image{
 		if(std::is_same<T, double>::value)			return CV_MAKETYPE(CV_64F, (int)C());
 
 		std::cout<<"ERROR in stim::image::cv_type - no valid data type found"<<std::endl;
-		exit(1);
+		exit(1);*/
+		return CV_MAKETYPE(CV_8U, (int)C());
 	}
 
 	/// Returns the value for "white" based on the dynamic range (assumes white is 1.0 for floating point images)
 	T white(){
-		if(std::is_same<T, unsigned char>::value)		return UCHAR_MAX;
+		/*if(std::is_same<T, unsigned char>::value)		return UCHAR_MAX;
 		if(std::is_same<T, unsigned short>::value)		return SHRT_MAX;
 		if(std::is_same<T, unsigned>::value)			return UINT_MAX;
 		if(std::is_same<T, unsigned long>::value)		return ULONG_MAX;
@@ -84,7 +85,8 @@ class image{
 		if(std::is_same<T, double>::value)				return 1.0;
 
 		std::cout<<"ERROR in stim::image::white - no white value known for this data type"<<std::endl;
-
+		*/
+		return UCHAR_MAX;
 	}
 
 
--
libgit2 0.21.4