GDCM vs GDCM2

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
index 29b2f7647ce6f0d842bcc8cbdca416bbe121cdef..6940e13c6335f9459b27559d86f06ea45ed8f0b7 100644 (file)
--- 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 973795375cb81afcaae0ab1dca01a66495205874..762886d748f6a509f40a4cfa147b9790de7da3a2 100644 (file)
--- 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 77929b8207b5e345a353dd84f19ad965177965cb..5e927d075c4ac797505a16f5c0ba35ead05cc871 100644 (file)
--- 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 e509431b32c1de8d1ec6cff918119d0478d0a1c5..d8a09e8d6b2a73e6a246b03d6ef444c18cf05ded 100644 (file)
--- 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
 };