generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed copilation

Browse Source
This commit is contained in:
Anatoly Baksheev 2013-07-15 16:30:04 +04:00
parent 2d36a8f7da
commit 4c228c07f1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/viz/src/cloud_widgets.cpp
View File

@ -329,7 +329,7 @@ struct cv::viz::MeshWidget::CopyImpl
{ {
CV_Assert(DataDepth<_Tp>::value == source.depth() && source.size() == nan_mask.size()); CV_Assert(DataDepth<_Tp>::value == source.depth() && source.size() == nan_mask.size());
CV_Assert(nan_mask.channels() == 3 || nan_mask.channels() == 4); 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 s_chs = source.channels();
int m_chs = nan_mask.channels(); int m_chs = nan_mask.channels();

1
modules/viz/src/precomp.hpp
View File

@ -155,4 +155,5 @@
#include "viz3d_impl.hpp" #include "viz3d_impl.hpp"
#include <opencv2/core.hpp> #include <opencv2/core.hpp>
#include <opencv2/viz.hpp> #include <opencv2/viz.hpp>
#include <opencv2/viz/types.hpp>
#include "opencv2/viz/widget_accessor.hpp" #include "opencv2/viz/widget_accessor.hpp"

5
modules/viz/src/types.cpp
View File

@ -1,4 +1,4 @@
#include <opencv2/viz/types.hpp> #include "precomp.hpp"
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
/// cv::viz::Color /// cv::viz::Color
@ -78,7 +78,7 @@ struct cv::viz::Mesh3d::loadMeshImpl
vtkSmartPointer<vtkPoints> mesh_points = poly_data->GetPoints (); vtkSmartPointer<vtkPoints> mesh_points = poly_data->GetPoints ();
vtkIdType nr_points = mesh_points->GetNumberOfPoints (); 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); mesh->cloud.create(1, nr_points, CV_32FC3);
@ -123,7 +123,6 @@ struct cv::viz::Mesh3d::loadMeshImpl
vtkIdType nr_cell_points; vtkIdType nr_cell_points;
vtkCellArray * mesh_polygons = poly_data->GetPolys (); vtkCellArray * mesh_polygons = poly_data->GetPolys ();
mesh_polygons->InitTraversal (); mesh_polygons->InitTraversal ();
int id_poly = 0;
mesh->polygons.create(1, mesh_polygons->GetSize(), CV_32SC1); mesh->polygons.create(1, mesh_polygons->GetSize(), CV_32SC1);