minor

modules/viz/src/precomp.hpp

@@ -94,7 +94,6 @@
 #include <vtkInteractorStyleTrackballCamera.h>
 #include <vtkProperty.h>
 #include <vtkCamera.h>
-#include <vtkObjectFactory.h>
 #include <vtkPlanes.h>
 #include <vtkImageFlip.h>
 #include <vtkRenderWindow.h>
@@ -111,6 +110,12 @@
 #include <vtkPolyDataNormals.h>
 #include <vtkAlgorithmOutput.h>
 #include <vtkImageMapper.h>
+#include <vtkPoints.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyDataAlgorithm.h>
+#include <vtkMergeFilter.h>
 
 #include <opencv2/core.hpp>
 #include <opencv2/viz.hpp>

modules/viz/src/viz3d_impl.cpp

@@ -48,9 +48,9 @@
 
 #include "precomp.hpp"
 
-vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew();
 
-#if 1 || !defined __APPLE__
+#if (1 || !defined __APPLE__) && !defined _MSC_VER
+vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew();
 vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew()
 {
   return vtkRenderWindowInteractor::New();
@@ -79,7 +79,11 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name)
     style_->UseTimersOn();
 
     /////////////////////////////////////////////////
+#if (1 || !defined __APPLE__) && !defined _MSC_VER
     interactor_ = vtkSmartPointer<vtkRenderWindowInteractor>::Take(vtkRenderWindowInteractorFixNew());
+#else
+    interactor_ = vtkSmartPointer<vtkRenderWindowInteractor>::New();
+#endif
 
     window_->AlphaBitPlanesOff();
     window_->PointSmoothingOff();