remove unused includes and libraries from linking

modules/viz/CMakeLists.txt

@@ -49,4 +49,3 @@ if(BUILD_opencv_viz)
       target_link_libraries(opencv_viz "-framework Cocoa")
   endif()
 endif()
-

modules/viz/src/precomp.hpp

@@ -15,34 +15,19 @@
 
 #include <vtkAppendPolyData.h>
 #include <vtkAssemblyPath.h>
-#include <vtkAxesActor.h>
-#include <vtkActor.h>
-#include <vtkBoxRepresentation.h>
-#include <vtkBoxWidget.h>
-#include <vtkBoxWidget2.h>
 #include <vtkCellData.h>
-#include <vtkMath.h>
-#include <vtkLoopSubdivisionFilter.h>
 #include <vtkLineSource.h>
-#include <vtkLegendScaleActor.h>
-#include <vtkLightKit.h>
-#include <vtkPlatonicSolidSource.h>
 #include <vtkPropPicker.h>
-#include <vtkGeneralTransform.h>
 #include <vtkSmartPointer.h>
 #include <vtkDataSet.h>
-#include <vtkDataSetSurfaceFilter.h>
-#include <vtkExecutive.h>
 #include <vtkPolygon.h>
 #include <vtkPointPicker.h>
 #include <vtkUnstructuredGrid.h>
-#include <vtkConeSource.h>
 #include <vtkDiskSource.h>
 #include <vtkPlaneSource.h>
 #include <vtkSphereSource.h>
 #include <vtkArrowSource.h>
 #include <vtkOutlineSource.h>
-#include <vtkIdentityTransform.h>
 #include <vtkTransform.h>
 #include <vtkTransformPolyDataFilter.h>
 #include <vtkTubeFilter.h>
@@ -57,18 +42,12 @@
 #include <vtkDataSetMapper.h>
 #include <vtkCellArray.h>
 #include <vtkCommand.h>
-#include <vtkCellLocator.h>
 #include <vtkPLYReader.h>
-#include <vtkTransformFilter.h>
 #include <vtkPolyLine.h>
 #include <vtkVectorText.h>
 #include <vtkFollower.h>
-#include <vtkCallbackCommand.h>
 #include <vtkInteractorStyle.h>
-#include <vtkInformationVector.h>
-#include <vtkDataArray.h>
 #include <vtkUnsignedCharArray.h>
-#include <vtkPoints.h>
 #include <vtkRendererCollection.h>
 #include <vtkPNGWriter.h>
 #include <vtkWindowToImageFilter.h>
@@ -76,78 +55,22 @@
 #include <vtkProperty.h>
 #include <vtkCamera.h>
 #include <vtkObjectFactory.h>
-#include <vtkScalarBarActor.h>
-#include <vtkScalarsToColors.h>
-#include <vtkClipPolyData.h>
 #include <vtkPlanes.h>
-#include <vtkImageImport.h>
 #include <vtkImageViewer.h>
-#include <vtkInteractorStyleImage.h>
 #include <vtkImageFlip.h>
-#include <vtkTIFFWriter.h>
-#include <vtkBMPWriter.h>
-#include <vtkJPEGWriter.h>
-#include <vtkImageViewer2.h>
 #include <vtkRenderWindow.h>
-#include <vtkXYPlotActor.h>
 #include <vtkTextProperty.h>
 #include <vtkProperty2D.h>
-#include <vtkFieldData.h>
-#include <vtkDoubleArray.h>
 #include <vtkLODActor.h>
-#include <vtkPolyDataWriter.h>
 #include <vtkTextActor.h>
-#include <vtkCleanPolyData.h>
-#include <vtkRenderer.h>
-#include <vtkObject.h>
-#include <vtkOrientationMarkerWidget.h>
-#include <vtkImageReslice.h>
-#include <vtkImageChangeInformation.h>
-#include <vtkImageCanvasSource2D.h>
-#include <vtkImageBlend.h>
-#include <vtkImageStencilData.h>
-#include <vtkImageActor.h>
-
 #include <vtkRenderWindowInteractor.h>
-#include <vtkChartXY.h>
-#include <vtkPlot.h>
-#include <vtkTable.h>
-#include <vtkContextView.h>
-#include <vtkContextScene.h>
-#include <vtkColorSeries.h>
-#include <vtkAxis.h>
-#include <vtkSelection.h>
-#include <vtkHardwareSelector.h>
-#include <vtkTriangle.h>
-#include <vtkWorldPointPicker.h>
-#include <vtkInteractorStyleRubberBandPick.h>
-#include <vtkInteractorStyleTrackballActor.h>
-#include <vtkAreaPicker.h>
-#include <vtkExtractGeometry.h>
-#include <vtkExtractPolyDataGeometry.h>
-#include <vtkVertexGlyphFilter.h>
-#include <vtkIdFilter.h>
-#include <vtkIdTypeArray.h>
-#include <vtkImageReader2Factory.h>
-#include <vtkImageReader2.h>
-#include <vtkImageData.h>
+#include <vtkMath.h>
 #include <vtkExtractEdges.h>
 #include <vtkFrustumSource.h>
 #include <vtkTextureMapToPlane.h>
-
 #include <vtkPolyDataNormals.h>
-#include <vtkMapper.h>
-#include <vtkSelectionNode.h>
-#include <vtkAbstractPicker.h>
-#include <vtkAbstractPropPicker.h>
-#include <vtkMatrix4x4.h>
-#include <vtkInteractorObserver.h>
-#include <vtkMapper2D.h>
-#include <vtkLeaderActor2D.h>
 #include <vtkAlgorithmOutput.h>
 
-
-
 #if defined __GNUC__ && defined __DEPRECATED_DISABLED__
 #define __DEPRECATED
 #undef __DEPRECATED_DISABLED__

modules/viz/src/viz3d_impl.cpp

@@ -582,16 +582,6 @@ void cv::viz::Viz3d::VizImpl::updateCells (vtkSmartPointer<vtkIdTypeArray> &cell
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////////
-void cv::viz::Viz3d::VizImpl::allocVtkPolyData (vtkSmartPointer<vtkAppendPolyData> &polydata)
-{polydata = vtkSmartPointer<vtkAppendPolyData>::New (); }
-
-void cv::viz::Viz3d::VizImpl::allocVtkPolyData (vtkSmartPointer<vtkPolyData> &polydata)
-{ polydata = vtkSmartPointer<vtkPolyData>::New (); }
-
-void cv::viz::Viz3d::VizImpl::allocVtkUnstructuredGrid (vtkSmartPointer<vtkUnstructuredGrid> &polydata)
-{ polydata = vtkSmartPointer<vtkUnstructuredGrid>::New (); }
-
 //////////////////////////////////////////////////////////////////////////////////////////////
 void cv::viz::Viz3d::VizImpl::setFullScreen (bool mode)
 {
@@ -599,6 +589,7 @@ void cv::viz::Viz3d::VizImpl::setFullScreen (bool mode)
         window_->SetFullScreen (mode);
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////////
 void cv::viz::Viz3d::VizImpl::setWindowName (const std::string &name)
 {
     if (window_)
@@ -610,6 +601,7 @@ cv::String cv::viz::Viz3d::VizImpl::getWindowName() const
     return (window_ ? window_->GetWindowName() : "");
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////////
 void cv::viz::Viz3d::VizImpl::setWindowPosition (int x, int y) { window_->SetPosition (x, y); }
 void cv::viz::Viz3d::VizImpl::setWindowSize (int xw, int yw) { window_->SetSize (xw, yw); }
 cv::Size cv::viz::Viz3d::VizImpl::getWindowSize() const { return Size(window_->GetSize()[0], window_->GetSize()[1]); }

modules/viz/src/viz3d_impl.hpp

@@ -178,10 +178,6 @@ private:
           * generate
           */
     void updateCells (vtkSmartPointer<vtkIdTypeArray> &cells, vtkSmartPointer<vtkIdTypeArray> &initcells, vtkIdType nr_points);
-
-    void allocVtkPolyData (vtkSmartPointer<vtkAppendPolyData> &polydata);
-    void allocVtkPolyData (vtkSmartPointer<vtkPolyData> &polydata);
-    void allocVtkUnstructuredGrid (vtkSmartPointer<vtkUnstructuredGrid> &polydata);
 };