From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Wed, 24 Nov 2010 15:11:14 +0000 (+0000)
Subject: change default GDCM to GDCM2
X-Git-Tag: Creatools2-0-3.creaImageIO0-2-5.17Feb2011~12
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaImageIO.git;a=commitdiff_plain;h=e79fb3b2d29dd690c3f78057105b61227c9b0297

change default GDCM to GDCM2
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45c9c98..d5f611f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,8 +54,8 @@ IF(QT4_FOUND)
  ENDIF(WIN32)
 ENDIF(QT4_FOUND)
 		 
-OPTION(USE_GDCM "Use gdcm 1.3" ON)
-OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" OFF)
+OPTION(USE_GDCM "Use gdcm 1.3" OFF)
+OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" ON)
  MESSAGE(STATUS "GDCM LIB ....= ${GDCM_LIBRARIES}")
 IF(USE_GDCM2)
 	OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp
index 3e1224b..6d03b9e 100644
--- a/src/creaImageIOGimmickView.cpp
+++ b/src/creaImageIOGimmickView.cpp
@@ -28,20 +28,20 @@ namespace creaImageIO
   public:
     ImageExtent(const std::string& x, const std::string& y, const std::string& z, const std::string& t)
 	{
-		 sscanf(x.c_str(),"%d",&mExtent[0]);
-		 sscanf(y.c_str(),"%d",&mExtent[1]);
-		 sscanf(z.c_str(),"%d",&mExtent[2]);
-		 sscanf(t.c_str(),"%d",&mExtent[3]);
-		 if(x==""){mExtent[0]=1;}
-	     if(y==""){mExtent[1]=1;}
-	     if(z==""){mExtent[2]=1;}
-		 if(t==""){mExtent[3]=1;}
-
-		 if (mExtent[3]>1) mDim=4;
-		 else if (mExtent[2]>1) mDim=3;
-	     else if (mExtent[1]>1) mDim=2;
-	     else if (mExtent[0]>1) mDim=1;
-		 else mDim=0;
+		sscanf(x.c_str(),"%d",&mExtent[0]);
+		sscanf(y.c_str(),"%d",&mExtent[1]);
+		sscanf(z.c_str(),"%d",&mExtent[2]);
+		sscanf(t.c_str(),"%d",&mExtent[3]);
+		if(x==""){mExtent[0]=1;}
+		if(y==""){mExtent[1]=1;}
+		if(z==""){mExtent[2]=1;}
+		if(t==""){mExtent[3]=1;}
+
+		if (mExtent[3]>1) mDim=4;
+		else if (mExtent[2]>1) mDim=3;
+		else if (mExtent[1]>1) mDim=2;
+		else if (mExtent[0]>1) mDim=1;
+		else mDim=0;
 	}