Debug RTStruct conversion with empty struc

[clitk.git] / vv / vvBlendImageActor.h

diff --git a/vv/vvBlendImageActor.h b/vv/vvBlendImageActor.h
old mode 100755 (executable)
new mode 100644 (file)
index 5bd2858..a0e9549
--- a/vv/vvBlendImageActor.h
+++ b/vv/vvBlendImageActor.h
@@ -21,13 +21,20 @@
 
 #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: