fixed copilation

diff --git a/modules/viz/src/cloud_widgets.cpp b/modules/viz/src/cloud_widgets.cpp
index fdbaf27..18be023 100644 (file)
--- a/modules/viz/src/cloud_widgets.cpp
+++ b/modules/viz/src/cloud_widgets.cpp
@@ -329,7 +329,7 @@ struct cv::viz::MeshWidget::CopyImpl
     {
         CV_Assert(DataDepth<_Tp>::value == source.depth() && source.size() == nan_mask.size());
         CV_Assert(nan_mask.channels() == 3 || nan_mask.channels() == 4);
-        CV_DbgAssert(DataDepth<_Msk>::value == nan_mask.depth());
+        CV_DbgAssert(DataDepth<_Tp>::value == nan_mask.depth());
 
         int s_chs = source.channels();
         int m_chs = nan_mask.channels();
@@ -469,4 +469,4 @@ template<> CV_EXPORTS cv::viz::MeshWidget cv::viz::Widget::cast<cv::viz::MeshWid
 {
     Widget3D widget = this->cast<Widget3D>();
     return static_cast<MeshWidget&>(widget);
-}
\ No newline at end of file
+}

diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp
index 3e98182..df3a970 100644 (file)
--- a/modules/viz/src/precomp.hpp
+++ b/modules/viz/src/precomp.hpp
@@ -155,4 +155,5 @@
 #include "viz3d_impl.hpp"
 #include <opencv2/core.hpp>
 #include <opencv2/viz.hpp>
+#include <opencv2/viz/types.hpp>
 #include "opencv2/viz/widget_accessor.hpp"

diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp
index e13355c..311ad9d 100644 (file)
--- a/modules/viz/src/types.cpp
+++ b/modules/viz/src/types.cpp
@@ -1,4 +1,4 @@
-#include <opencv2/viz/types.hpp>
+#include "precomp.hpp"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 /// cv::viz::Color
@@ -78,7 +78,7 @@ struct cv::viz::Mesh3d::loadMeshImpl
         
         vtkSmartPointer<vtkPoints> mesh_points = poly_data->GetPoints ();
         vtkIdType nr_points = mesh_points->GetNumberOfPoints ();
-        vtkIdType nr_polygons = poly_data->GetNumberOfPolys ();
+        //vtkIdType nr_polygons = poly_data->GetNumberOfPolys ();
 
         mesh->cloud.create(1, nr_points, CV_32FC3);
 
@@ -123,7 +123,6 @@ struct cv::viz::Mesh3d::loadMeshImpl
         vtkIdType nr_cell_points;
         vtkCellArray * mesh_polygons = poly_data->GetPolys ();
         mesh_polygons->InitTraversal ();
-        int id_poly = 0;
         
         mesh->polygons.create(1, mesh_polygons->GetSize(), CV_32SC1);