X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkVolumeRenderer.cxx;h=3c5b371acb3201e38410c32f21f3ef05548c167a;hb=d8d037869b31569b3343b085c25d27d8069e58eb;hp=a3b39a5a2d17611513f6b40418fe53348e033ad2;hpb=ce796ef8e6c470b95b8f00cad76c25a9e4a88df1;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index a3b39a5..3c5b371 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.cxx
+++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx
@@ -59,7 +59,12 @@ namespace bbvtk
 
    void VolumeRenderer::bbUserSetDefaultValues() 
    { 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	   mRayCastFunction = NULL;
+#else
+	//
+#endif
 	   mMapper			= NULL;
 	   mVolume			= NULL;
 	   bbSetInputColorFunction(0);
@@ -78,11 +83,16 @@ namespace bbvtk
     //    mMIP = vtkVolumeRayCastMIPFunction::New();
     //    mMIP->SetMaximizeMethodToScalarValue();
 
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
     mRayCastFunction = vtkVolumeRayCastCompositeFunction::New();
     mMapper = vtkVolumeRayCastMapper::New();
 	   mMapper->SetVolumeRayCastFunction(mRayCastFunction);
 	   mMapper->AutoAdjustSampleDistancesOn();
-
+#else 
+	  mMapper = vtkFixedPointVolumeRayCastMapper::New();
+#endif
+		   
 	   _volumeProperty = vtkVolumeProperty::New();	
 	_volumeProperty->SetInterpolationTypeToLinear();
 	_volumeProperty->ShadeOn();
@@ -102,11 +112,16 @@ namespace bbvtk
 	//---------------------------------------------------------------------
    void VolumeRenderer::bbUserFinalizeProcessing() 
    { 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	   if (mRayCastFunction!=NULL)
 	   {
 		   mRayCastFunction->Delete();
 		   mRayCastFunction=NULL;
 	   }	  
+#else
+	//
+#endif
 	   if (mMapper!=NULL)
 	   {
 		   mMapper->Delete();