3205 BBTK Feature New Normal branch vtk7itk4wx3-mxecc

[bbtk.git] / packages / vtk / src / bbvtkVolumeRenderer.h

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h
index d18b8aa25154f8bcdea8130181073a66bd41df98..fc500f17181b33f508ca847d68db5e2ad3810797 100644 (file)
--- a/packages/vtk/src/bbvtkVolumeRenderer.h
+++ b/packages/vtk/src/bbvtkVolumeRenderer.h
@@ -64,8 +64,13 @@
 //#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 +100,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;
   };