X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMIPCreator.h;h=124abe89cb4e980a139d1019716717b32533ede2;hb=8d810382e1add6998943d488c3c2aa42f43e9eb5;hp=123d9ab9d6993b03da366b490956b3f3393ab5bb;hpb=e85546c7218522af75cec623b9419781c7c4208f;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMIPCreator.h b/packages/vtk/src/bbvtkMIPCreator.h
index 123d9ab..124abe8 100644
--- a/packages/vtk/src/bbvtkMIPCreator.h
+++ b/packages/vtk/src/bbvtkMIPCreator.h
@@ -1,33 +1,38 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkMIPCreator.h,v $
   Language:  C++
-  Date:      $Date: 2011/03/23 15:26:55 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */
-
 /**
  * \brief Short description in one line
  *
@@ -52,8 +57,16 @@
 
 #include "vtkImageData.h"
 #include <vtkImageShiftScale.h>
-#include <vtkVolumeRayCastMIPFunction.h>
-#include <vtkVolumeRayCastMapper.h>
+
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
+	#include <vtkVolumeRayCastMIPFunction.h>
+	#include <vtkVolumeRayCastMapper.h>
+#else 
+	#include <vtkFixedPointVolumeRayCastMapper.h>
+#endif
+
+
 #include "vtkProp3D.h"
 #include "vtkVolume.h"
 
@@ -80,8 +93,18 @@ namespace bbvtk
     std::vector<double> DensityPoints;
     std::vector<double> OpacityValues;
     vtkImageShiftScale			*mCast;
-    vtkVolumeRayCastMIPFunction		*mMIP;
-    vtkVolumeRayCastMapper		*mMapper;
+
+
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
+    vtkVolumeRayCastMIPFunction			*mMIP;
+    vtkVolumeRayCastMapper				*mMapper;
+#else 
+    vtkFixedPointVolumeRayCastMapper	*mMapper;
+#endif
+
+
+
     vtkVolume				*mVolume;
     vtkPiecewiseFunction *opacityTransferFunction;
     vtkPiecewiseFunction *grayTransferFunction;