Integrate patch from G.David (for VTK 5.2)

diff --git a/src/VTKViewer/VTKViewer_Trihedron.cxx b/src/VTKViewer/VTKViewer_Trihedron.cxx
index 722d8ab585d3a9c088e8cf2e52a1851766fb6a3f..b0a608231a80a0751c5dec945762b71b7bb9f45a 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Trihedron.cxx
+++ b/src/VTKViewer/VTKViewer_Trihedron.cxx
@@ -46,10 +46,6 @@
 // QT includes
 #include <QtGlobal>
 
-#if !defined(VTK_XVERSION)
-#define VTK_XVERSION (VTK_MAJOR_VERSION<<16)+(VTK_MINOR_VERSION<<8)+(VTK_BUILD_VERSION)
-#endif
-
 vtkStandardNewMacro(VTKViewer_UnScaledActor);
 
 /*!Constructor*/
@@ -171,11 +167,7 @@ VTKViewer_Axis::VTKViewer_Axis()
   myTextMapper = vtkTextMapper::New();
   
   myLabelActor = vtkTextActor::New();
-#if (VTK_XVERSION > 0x050000)
-  myLabelActor->SetMapper(vtkPolyDataMapper2D::SafeDownCast(myTextMapper));
-#else
   myLabelActor->SetMapper(myTextMapper);
-#endif
   myLabelActor->ScaledTextOff();
   myLabelActor->PickableOff();
   

diff --git a/src/VTKViewer/VTKViewer_Trihedron.h b/src/VTKViewer/VTKViewer_Trihedron.h
index 501222956c82ed6cd831006a70e15966f8e85000..efb510b178bac62c4ee459caac1fb4e7629037c5 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Trihedron.h
+++ b/src/VTKViewer/VTKViewer_Trihedron.h
@@ -40,10 +40,16 @@ class vtkTextMapper;
 
 class VTKViewer_Axis;
 
+#if !defined(VTK_XVERSION)
+#define VTK_XVERSION (VTK_MAJOR_VERSION<<16)+(VTK_MINOR_VERSION<<8)+(VTK_BUILD_VERSION)
+#endif
+
 // VTKViewer_UnScaledActor is temporarily replaced with simple vtkTextActor
 // This workaround caused by the bug with disappeared labels of the trihedron
 // reproduced after migration from qt-4.4.3 to qt-4.5.2
+#if (VTK_XVERSION <= 0x050000)
 #define IPAL21440
+#endif
 
 /*! \class vtkFollower
  * See <a href="http://www.vtk.org/">vtk documentation</a>