Merge branch 'refs/heads/bbpCreator'

[bbtk.git] / packages / gdcmvtk / src / bbgdcmvtkGetXCoherentInfoGdcmReader.h

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
index e1697e4227513376ced046171b8bb369a0c7b725..20f8558cf1ebbbb85c200d834877dc299fa7b5f1 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 #ifdef _USE_VTK_
 
 #ifndef __bbgdcmvtkGetXCoherentInfoGdcmReader_h_INCLUDED__
@@ -7,10 +33,18 @@
 #include "bbtkAtomicBlackBox.h"
 #include "iostream"
 
+#if defined(USE_GDCM)
 #include "vtkGdcmReader.h"
+#endif
+
+#if defined(USE_GDCM2)
+#include "vtkGDCMImageReader.h"
+#endif
+
 #include "gdcmFile.h"
 #include "gdcmSerieHelper.h"
 
+#include "vtkImageData.h"
 namespace bbgdcmvtk
 {
 
@@ -32,9 +66,15 @@ class bbgdcmvtk_EXPORT GetXCoherentInfoGdcmReader
   void Process();
   
   private:
-     GDCM_NAME_SPACE::File *f;
-     GDCM_NAME_SPACE::SerieHelper *sh;
-     vtkGdcmReader *reader;
+
+#if defined USE_GDCM
+               GDCM_NAME_SPACE::File *f;
+               GDCM_NAME_SPACE::SerieHelper *sh;
+               vtkGdcmReader *reader;
+#endif
+#if defined USE_GDCM2
+               vtkGDCMImageReader *reader;
+#endif
 };
 
   //=================================================================