Commit 6fb75c67 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by Alexander Alekhin

viz: update for VTK6.2+

PCL PR 1205
parent 4a759abe
...@@ -50,6 +50,13 @@ ...@@ -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 ...@@ -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 ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment