From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Thu, 9 Jun 2011 08:40:26 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v1.0.4~102
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2c07f33bd1f79ad0237d02491a480913a488aa75;p=creaMaracasVisu.git

*** empty log message ***
---

diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h
index 8023728..cfa0c87 100644
--- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h
+++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h
@@ -2,6 +2,7 @@
 #ifndef VolumeRendererManagerData_H_
 #define VolumeRendererManagerData_H_
 
+#include "vtkCommand.h"
 #include <vtkVolumeRayCastCompositeFunction.h>
 #include <vtkPlanes.h>
 #include <vtkVolumeRayCastMapper.h>
@@ -13,11 +14,18 @@
 #include <vtkProp3D.h>
 #include <vtkRenderer.h>
 #include <vtkVolumeRayCastMIPFunction.h>
+
 #include <vtkLookupTable.h>
-#include <vector>
+
 #include <vtkBoxWidget.h>
-#include <vtkGPUVolumeRayCastMapper.h>
-#include "vtkCommand.h"
+#include <vtkAbstractMapper.h>
+
+#if (VTK_MAYOR_VERSION>=5 && VTK_MINOR_VERSION>=6)
+  #include <vtkGPUVolumeRayCastMapper.h>
+#endif
+
+#include <vector>
+
 
 // Callback for moving the planes from the box widget to the mapper
 class vtkBoxWidgetCallback : public vtkCommand
@@ -36,7 +44,7 @@ public:
         planes->Delete();
         }
     }
-  void SetMapper(vtkGPUVolumeRayCastMapper* m)
+  void SetMapper(vtkAbstractMapper* m)
     { this->Mapper = m; }
 
 protected:
@@ -44,7 +52,7 @@ protected:
     { this->Mapper = 0; }
 
   //vtkVolumeRayCastMapper *Mapper;
-  vtkGPUVolumeRayCastMapper *Mapper;
+  vtkAbstractMapper *Mapper;
 };
 
 
@@ -143,7 +151,7 @@ private:
         vtkVolumeRayCastCompositeFunction	*_compositeFunction;
         vtkPlanes							*_volumePlanes;
         vtkVolumeRayCastMapper				*_volumeMapper;
-        vtkGPUVolumeRayCastMapper                               *_volumeMappergpu;
+        vtkGPUVolumeRayCastMapper           *_volumeMappergpu;
         vtkVolumeProperty					*_volumeProperty;
         vtkVolume							*_newvol;
         vtkPiecewiseFunction* _tfun;