Feature #1774

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

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
index 2c50c94c051b97e501d8e1083aaa8d15340e54d2..9ef547f624a250136985b9f2d42d74d09e2a5554 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx
@@ -1,3 +1,28 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la SantÈ)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "bbgdcmvtkGetInfoGdcmReader.h"
 #include "bbgdcmvtkPackage.h"
 
@@ -9,6 +34,7 @@
 #endif
 #if defined USE_GDCM2
        #include <gdcmReader.h>
+//     #include "vtkImageData.h"       
        #include <gdcmImageHelper.h>
        #include <vtkGDCMImageReader.h>
 #endif
@@ -133,29 +159,43 @@ void GetInfoGdcmReader::Process()
    bbSetOutputOut( reader->GetOutput() );
 }
 #endif
+
+
 void GetInfoGdcmReader::bbUserSetDefaultValues()
 {
-   reader=NULL;
+#if defined USE_GDCM2
+   read=NULL;
+#endif   
 #if defined USE_GDCM
+   reader=NULL;
    f=NULL;
 #endif
    bbSetInputIn("");  
 }
 
+
 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();