X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvBlendImageActor.h;h=a0e954915927355831c715212654b0b598e64833;hb=6edda2a8b31b7345623e363dc27efd202aa59c9f;hp=8df964a567776deec30e4f43bebfa65d6930baf8;hpb=26c6b8e9d0333a9e0be98c3fb9d57f133477d97d;p=clitk.git

diff --git a/vv/vvBlendImageActor.h b/vv/vvBlendImageActor.h
old mode 100755
new mode 100644
index 8df964a..a0e9549
--- a/vv/vvBlendImageActor.h
+++ b/vv/vvBlendImageActor.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,20 +14,27 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 #ifndef VVBLENDIMAGEACTOR_H
 #define VVBLENDIMAGEACTOR_H
 
 #include <vtkActor.h>
 #include <vtkSmartPointer.h>
+
+#if VTK_MAJOR_VERSION >= 6 || (VTK_MAJOR_VERSION >= 5 && VTK_MINOR_VERSION >= 10)
+#define VTK_IMAGE_ACTOR vtkImageActor
+#include <vtkImageActor.h>
+#else
+#define VTK_IMAGE_ACTOR vtkOpenGLImageActor
 #include <vtkOpenGLImageActor.h>
+#endif
 
-class vvBlendImageActor : public vtkOpenGLImageActor
+class vvBlendImageActor : public VTK_IMAGE_ACTOR
 {
 public:
   static vvBlendImageActor *New();
-  vtkTypeMacro(vvBlendImageActor, vtkOpenGLImageActor);
+  vtkTypeMacro(vvBlendImageActor, VTK_IMAGE_ACTOR);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description: