X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvBlendImageActor.cxx;h=77ae059723db66360a7cfcdd65d22b096aa68d3d;hb=HEAD;hp=0e65d1c68be63cde949a0d487043f374e73f34cb;hpb=765020625fbc092d283e221e36c83e60a1844cb7;p=clitk.git

diff --git a/vv/vvBlendImageActor.cxx b/vv/vvBlendImageActor.cxx
old mode 100755
new mode 100644
index 0e65d1c..77ae059
--- a/vv/vvBlendImageActor.cxx
+++ b/vv/vvBlendImageActor.cxx
@@ -17,12 +17,15 @@ It is distributed under dual licence
 ===========================================================================**/
 
 #include "vvBlendImageActor.h"
-
+#ifdef VTK_OPENGL2
+  #include <vtk_glew.h>
+#else
+  #include <vtkgl.h>
+  #include <vtkOpenGLExtensionManager.h>
+#endif
 #include <vtkOpenGLRenderWindow.h>
-#include <vtkOpenGLExtensionManager.h>
 #include <vtkOpenGLRenderer.h>
 #include <vtkOpenGL.h>
-#include <vtkgl.h>
 #include <vtkObjectFactory.h>
 
 vtkStandardNewMacro(vvBlendImageActor);
@@ -40,6 +43,13 @@ void vvBlendImageActor::Render(vtkRenderer *ren)
 {
   //Change blending to maximum per component instead of weighted sum
   vtkOpenGLRenderWindow *renwin = dynamic_cast<vtkOpenGLRenderWindow*>(ren->GetRenderWindow());
+#ifdef VTK_OPENGL2
+  const char *extensions = renwin->ReportCapabilities();
+
+  //Call normal render
+  VTK_IMAGE_ACTOR::Render(ren);
+
+#else
   vtkOpenGLExtensionManager *extensions = renwin->GetExtensionManager();
   if (extensions->ExtensionSupported("GL_EXT_blend_minmax")) {
     extensions->LoadExtension("GL_EXT_blend_minmax");
@@ -47,12 +57,13 @@ void vvBlendImageActor::Render(vtkRenderer *ren)
   }
 
   //Call normal render
-  vtkOpenGLImageActor::Render(ren);
+  VTK_IMAGE_ACTOR::Render(ren);
 
   //Move back blending to weighted sum
   if (vtkgl::BlendEquationEXT!=0) {
     vtkgl::BlendEquationEXT( vtkgl::FUNC_ADD );
   }
+#endif
 }
 
 void vvBlendImageActor::PrintSelf(ostream& os, vtkIndent indent)