diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt index 05388d745d..5de29bbc65 100644 --- a/modules/viz/CMakeLists.txt +++ b/modules/viz/CMakeLists.txt @@ -49,4 +49,3 @@ if(BUILD_opencv_viz) target_link_libraries(opencv_viz "-framework Cocoa") endif() endif() - diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp index 69d20a5351..9dafeecc8f 100644 --- a/modules/viz/src/precomp.hpp +++ b/modules/viz/src/precomp.hpp @@ -15,34 +15,19 @@ #include #include -#include -#include -#include -#include -#include #include -#include -#include #include -#include -#include -#include #include -#include #include #include -#include -#include #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -57,18 +42,12 @@ #include #include #include -#include #include -#include #include #include #include -#include #include -#include -#include #include -#include #include #include #include @@ -76,78 +55,22 @@ #include #include #include -#include -#include -#include #include -#include #include -#include #include -#include -#include -#include -#include #include -#include #include #include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include - #include -#include -#include -#include -#include -#include -#include -#include -#include #include - - #if defined __GNUC__ && defined __DEPRECATED_DISABLED__ #define __DEPRECATED #undef __DEPRECATED_DISABLED__ diff --git a/modules/viz/src/viz3d_impl.cpp b/modules/viz/src/viz3d_impl.cpp index f0157331ec..d04bb5426e 100644 --- a/modules/viz/src/viz3d_impl.cpp +++ b/modules/viz/src/viz3d_impl.cpp @@ -582,16 +582,6 @@ void cv::viz::Viz3d::VizImpl::updateCells (vtkSmartPointer &cell } } -////////////////////////////////////////////////////////////////////////////////////////////// -void cv::viz::Viz3d::VizImpl::allocVtkPolyData (vtkSmartPointer &polydata) -{polydata = vtkSmartPointer::New (); } - -void cv::viz::Viz3d::VizImpl::allocVtkPolyData (vtkSmartPointer &polydata) -{ polydata = vtkSmartPointer::New (); } - -void cv::viz::Viz3d::VizImpl::allocVtkUnstructuredGrid (vtkSmartPointer &polydata) -{ polydata = vtkSmartPointer::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]); } diff --git a/modules/viz/src/viz3d_impl.hpp b/modules/viz/src/viz3d_impl.hpp index 4d24fb86e6..61948f912d 100644 --- a/modules/viz/src/viz3d_impl.hpp +++ b/modules/viz/src/viz3d_impl.hpp @@ -178,10 +178,6 @@ private: * generate */ void updateCells (vtkSmartPointer &cells, vtkSmartPointer &initcells, vtkIdType nr_points); - - void allocVtkPolyData (vtkSmartPointer &polydata); - void allocVtkPolyData (vtkSmartPointer &polydata); - void allocVtkUnstructuredGrid (vtkSmartPointer &polydata); };