[opencv] 43/89: viz: update for VTK6.2+

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit 6fb75c677b9ed1c1e2907c418224c9fdfa06a94d
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Fri Oct 21 18:19:15 2016 +0300

    viz: update for VTK6.2+
    
    PCL PR 1205
---
 modules/viz/src/vtk/vtkCocoaInteractorFix.mm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/viz/src/vtk/vtkCocoaInteractorFix.mm b/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
index dad41b0..99e3c0d 100644
--- a/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
+++ b/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
@@ -50,6 +50,13 @@
 #include <vtkObjectFactory.h>
 #include <vtkSmartPointer.h>
 
+namespace cv { namespace viz {
+    vtkSmartPointer<vtkRenderWindowInteractor> vtkCocoaRenderWindowInteractorNew();
+}} // namespace
+
+#if ((VTK_MAJOR_VERSION < 6) || ((VTK_MAJOR_VERSION == 6) && (VTK_MINOR_VERSION < 2)))
+
+
 //----------------------------------------------------------------------------
 @interface vtkCocoaServerFix : NSObject
 {
@@ -175,8 +182,6 @@ namespace cv { namespace viz
     };
 
     vtkStandardNewMacro (vtkCocoaRenderWindowInteractorFix)
-
-    vtkSmartPointer<vtkRenderWindowInteractor> vtkCocoaRenderWindowInteractorNew();
 }}
 
 void cv::viz::vtkCocoaRenderWindowInteractorFix::Start ()
@@ -209,3 +214,13 @@ vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteract
 {
     return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New();
 }
+
+
+#else
+
+vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteractorNew()
+{
+    return vtkSmartPointer<vtkCocoaRenderWindowInteractor>::New();
+}
+
+#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git