X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.cpp;h=29d22e3c9b8393e2f6d523fd54cddafd3ad91a99;hb=c15dd7f9013f1c5bb6b4f5cac3cd1c92f57333f1;hp=6df7fc0132413e211c5a4c9d9b326a009654dba2;hpb=b22b0ce7e3e8746029ab1203274914c20e749484;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index 6df7fc0..29d22e3 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -1,9 +1,18 @@
 #include <creaImageIOGimmickView.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem.hpp"
+
+#if defined(USE_GDCM)
 #include <gdcmGlobal.h>
 #include <gdcmSerieHelper.h>
 #include <vtkGdcmReader.h>
+#endif
+
+#if defined(USE_GDCM2)
+#include <vtkGDCMImageReader.h>
+#endif
+
+
 namespace fs = boost::filesystem;
 namespace creaImageIO
 {
@@ -363,7 +372,9 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 			double spc[3];
 			first->GetSpacing(spc);
 			spc[2]=OrderTheFileNameVector(im);	
+
 			out->SetSpacing(spc);
+
 			int slice = 0;
 			std::vector<std::string>::iterator it;
 
@@ -382,8 +393,8 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 }
   //======================================================================
 
-
-double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
+#if defined(USE_GDCM)
+	double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
 {
 	double spacing=1;
 	typedef std::vector<GDCM_NAME_SPACE::File* > FileList;
@@ -429,6 +440,15 @@ double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
 }
 
 
+#endif
+
+#if defined(USE_GDCM2)
+	// TO DO
+	double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
+	{
+		return 1;
+	}
+#endif
 //======================================================================