Merge pull request PointCloudLibrary#1205 from fran6co/patch-12

taketwo · taketwo · commit 99662b0f28f5 · 2015-04-08T10:43:55.000+02:00
Fixes for VTK 6.2.0
diff --git a/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.mm b/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.mm
@@ -41,6 +41,8 @@
 #include <vtkCocoaRenderWindowInteractor.h>
 #include <vtkObjectFactory.h>
 
+#if ((VTK_MAJOR_VERSION < 6) || ((VTK_MAJOR_VERSION == 6) && (VTK_MINOR_VERSION < 2)))
+
 //----------------------------------------------------------------------------
 @interface vtkCocoaServerFix : NSObject
 {
@@ -213,4 +215,10 @@ - (void)windowWillClose:(NSNotification*)aNotification
 {
   return (vtkCocoaRenderWindowInteractorFix::New ());
 }
-
+#else
+//----------------------------------------------------------------------------
+vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew ()
+{
+  return (vtkCocoaRenderWindowInteractor::New ());
+}
+#endif

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@`
`41`	`41`	`#include <vtkCocoaRenderWindowInteractor.h>`
`42`	`42`	`#include <vtkObjectFactory.h>`
`43`	`43`
	`44`	`+#if ((VTK_MAJOR_VERSION < 6) \|\| ((VTK_MAJOR_VERSION == 6) && (VTK_MINOR_VERSION < 2)))`
	`45`	`+`
`44`	`46`	`//----------------------------------------------------------------------------`
`45`	`47`	`@interface vtkCocoaServerFix : NSObject`
`46`	`48`	`{`
`@@ -213,4 +215,10 @@ - (void)windowWillClose:(NSNotification*)aNotification`
`213`	`215`	`{`
`214`	`216`	`return (vtkCocoaRenderWindowInteractorFix::New ());`
`215`	`217`	`}`
`216`		`-`
	`218`	`+#else`
	`219`	`+//----------------------------------------------------------------------------`
	`220`	`+vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew ()`
	`221`	`+{`
	`222`	`+ return (vtkCocoaRenderWindowInteractor::New ());`
	`223`	`+}`
	`224`	`+#endif`