X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkVolumeRenderer.h;h=90c25b23a575752e2c03a41de089458ee32a2393;hb=dfcd0b84f01eb96e43c2180a35d626cc123a7231;hp=d18b8aa25154f8bcdea8130181073a66bd41df98;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h
index d18b8aa..90c25b2 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.h
+++ b/packages/vtk/src/bbvtkVolumeRenderer.h
@@ -60,12 +60,18 @@
 
 #include "bbtkAtomicBlackBox.h"
 
+#include "vtkVersion.h"
 #include "vtkImageData.h"
 //#include <vtkImageShiftScale.h>
 //#include <vtkVolumeRayCastMIPFunction.h>
 #include "vtkVolumeProperty.h"
-#include "vtkVolumeRayCastCompositeFunction.h"
-#include "vtkVolumeRayCastMapper.h"
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
+	#include "vtkVolumeRayCastCompositeFunction.h"
+	#include "vtkVolumeRayCastMapper.h"
+#else 
+	#include <vtkFixedPointVolumeRayCastMapper.h>
+#endif
 #include "vtkProp3D.h"
 #include "vtkVolume.h"
 
@@ -95,8 +101,13 @@ namespace bbvtk
 
   private:
     vtkVolumeProperty                 *mVolumeProperty;
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
     vtkVolumeRayCastCompositeFunction *mRayCastFunction;
     vtkVolumeRayCastMapper            *mMapper;
+#else 
+    vtkFixedPointVolumeRayCastMapper  *mMapper;
+#endif
     vtkVolume                         *mVolume;
     vtkVolumeProperty                 *_volumeProperty;
   };