mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-23 12:11:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

viz: update for VTK6.2+

Browse Source 
PCL PR 1205
This commit is contained in:
Alexander Alekhin 2016-10-21 18:19:15 +03:00 committed by Alexander Alekhin
parent 4a759abe39
commit 6fb75c677b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/viz/src/vtk/vtkCocoaInteractorFix.mm
View File

@ -50,6 +50,13 @@
#include <vtkObjectFactory.h> #include <vtkObjectFactory.h>
#include <vtkSmartPointer.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 @interface vtkCocoaServerFix : NSObject
{ {
@ -175,8 +182,6 @@ namespace cv { namespace viz
}; };
vtkStandardNewMacro (vtkCocoaRenderWindowInteractorFix) vtkStandardNewMacro (vtkCocoaRenderWindowInteractorFix)
vtkSmartPointer<vtkRenderWindowInteractor> vtkCocoaRenderWindowInteractorNew();
}} }}
void cv::viz::vtkCocoaRenderWindowInteractorFix::Start () void cv::viz::vtkCocoaRenderWindowInteractorFix::Start ()
@ -209,3 +214,13 @@ vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteract
{ {
return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New(); return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New();
} }
#else
vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteractorNew()
{
return vtkSmartPointer<vtkCocoaRenderWindowInteractor>::New();
}
#endif