From 871fd8609dc04c99003add6f8477a25789e41cc8 Mon Sep 17 00:00:00 2001
From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Wed, 24 Nov 2010 14:06:01 +0000
Subject: [PATCH] GDCM vs GDCM2

---
 .../gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx    | 15 ++++++++++++++-
 packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h |  4 +++-
 .../src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx   |  8 +++++---
 .../src/bbgdcmvtkGetXCoherentInfoGdcmReader.h     | 10 ++++++----
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
index 29b2f76..6940e13 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
@@ -9,6 +9,7 @@
 #endif
 #if defined USE_GDCM2
 	#include <gdcmReader.h>
+//	#include "vtkImageData.h"	
 	#include <gdcmImageHelper.h>
 	#include <vtkGDCMImageReader.h>
 #endif
@@ -137,8 +138,11 @@ void GetInfoGdcmReader::Process()
 
 void GetInfoGdcmReader::bbUserSetDefaultValues()
 {
-   reader=NULL;
+#if defined USE_GDCM2
+   read=NULL;
+#endif   
 #if defined USE_GDCM
+   reader=NULL;
    f=NULL;
 #endif
    bbSetInputIn("");  
@@ -152,12 +156,21 @@ void GetInfoGdcmReader::bbUserInitializeProcessing()
 
 void GetInfoGdcmReader::bbUserFinalizeProcessing()
 {
+#if defined USE_GDCM2
    if( reader )
    {
       reader->Delete();
       reader=NULL;
    }
+#endif
+
 #if defined USE_GDCM	
+   if( reader )
+   {
+      reader->Delete();
+      reader=NULL;
+   }   
+
    if(f)
    {
       f->Delete();
diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
index 9737953..762886d 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
@@ -14,6 +14,8 @@
 #include "vtkGDCMImageReader.h"
 #endif
 
+#include "vtkImageData.h"
+
 namespace bbgdcmvtk
 {
 
@@ -39,7 +41,7 @@ class bbgdcmvtk_EXPORT GetInfoGdcmReader
 	 vtkGdcmReader *reader;
 #endif
 #if defined USE_GDCM2
-	     vtkGDCMImageReader *reader;
+	 vtkGDCMImageReader *reader;
 #endif
 
  
diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index 77929b8..5e927d0 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
@@ -4,9 +4,11 @@
 #include "gdcmFile.h"
 #include "vtkImageData.h"
 #include <vtkIndent.h>
+
 #if defined USE_GDCM
-#include "gdcmFileHelper.h"
+	#include "gdcmFileHelper.h"
 #endif
+
 #if defined USE_GDCM2
 	#include <gdcmReader.h>
 	#include <gdcmImageHelper.h>
@@ -167,7 +169,7 @@ void GetXCoherentInfoGdcmReader::Process()
    {
 	  const std::string &f = *it;
       files->InsertNextValue( f.c_str() );
-    }
+   }
    reader->SetFileNames(files);
    reader->Update();
    reader->GetOutput();
@@ -181,7 +183,7 @@ void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues()
    std::vector<std::string> init;
    init.push_back("");
    bbSetInputIn(init);  
-   reader=NULL;
+   //reader=NULL;   /// \TODO fixme JPR
 }
 
 void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing()
diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
index e509431..d8a09e8 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
@@ -6,6 +6,7 @@
 #include "bbgdcmvtk_EXPORT.h"
 #include "bbtkAtomicBlackBox.h"
 #include "iostream"
+
 #if defined(USE_GDCM)
 #include "vtkGdcmReader.h"
 #endif
@@ -17,6 +18,7 @@
 #include "gdcmFile.h"
 #include "gdcmSerieHelper.h"
 
+#include "vtkImageData.h"
 namespace bbgdcmvtk
 {
 
@@ -40,12 +42,12 @@ class bbgdcmvtk_EXPORT GetXCoherentInfoGdcmReader
   private:
 
 #if defined USE_GDCM
-		  GDCM_NAME_SPACE::File *f;
-		  GDCM_NAME_SPACE::SerieHelper *sh;
-	      vtkGdcmReader *reader;
+		GDCM_NAME_SPACE::File *f;
+		GDCM_NAME_SPACE::SerieHelper *sh;
+		vtkGdcmReader *reader;
 #endif
 #if defined USE_GDCM2
-		  vtkGDCMImageReader *reader;
+		vtkGDCMImageReader *reader;
 #endif
 };
 
-- 
2.45.1