GDCM vs GDCM2

[bbtk.git] / packages / gdcmvtk / src / bbgdcmvtkGetInfoGdcmReader.cxx

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();