Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
6fb75c67
Commit
6fb75c67
authored
8 years ago
by
Alexander Alekhin
Committed by
Alexander Alekhin
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
viz: update for VTK6.2+
PCL PR 1205
parent
4a759abe
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
2 deletions
+17
-2
vtkCocoaInteractorFix.mm
modules/viz/src/vtk/vtkCocoaInteractorFix.mm
+17
-2
No files found.
modules/viz/src/vtk/vtkCocoaInteractorFix.mm
View file @
6fb75c67
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment