mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 22:44:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed warnigns and compiler errors for Ubuntu

Browse Source
This commit is contained in:
Anatoly Baksheev 2014-01-19 00:13:47 +04:00
parent d7ca0bb757
commit 7410593d55
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/viz/src/clouds.cpp
View File

@ -219,7 +219,7 @@ void cv::viz::WCloudCollection::addCloud(InputArray cloud, InputArray colors, co
mapper->ImmediateModeRenderingOff(); mapper->ImmediateModeRenderingOff();
VtkUtils::SetInputData(mapper, polydata); VtkUtils::SetInputData(mapper, polydata);
actor->SetNumberOfCloudPoints(std::max(1, polydata->GetNumberOfPoints()/10)); actor->SetNumberOfCloudPoints(std::max<vtkIdType>(1, polydata->GetNumberOfPoints()/10));
actor->GetProperty()->SetInterpolationToFlat(); actor->GetProperty()->SetInterpolationToFlat();
actor->GetProperty()->BackfaceCullingOn(); actor->GetProperty()->BackfaceCullingOn();
actor->SetMapper(mapper); actor->SetMapper(mapper);
@ -236,7 +236,7 @@ void cv::viz::WCloudCollection::addCloud(InputArray cloud, InputArray colors, co
VtkUtils::SetInputData(mapper, append_filter->GetOutput()); VtkUtils::SetInputData(mapper, append_filter->GetOutput());
actor->SetNumberOfCloudPoints(std::max(1, actor->GetNumberOfCloudPoints() + polydata->GetNumberOfPoints()/10)); actor->SetNumberOfCloudPoints(std::max<vtkIdType>(1, actor->GetNumberOfCloudPoints() + polydata->GetNumberOfPoints()/10));
} }
void cv::viz::WCloudCollection::addCloud(InputArray cloud, const Color &color, const Affine3d &pose) void cv::viz::WCloudCollection::addCloud(InputArray cloud, const Color &color, const Affine3d &pose)

6
modules/viz/src/shapes.cpp
View File

@ -1064,9 +1064,9 @@ cv::viz::WTrajectorySpheres::WTrajectorySpheres(InputArray _path, double line_le
line_source->SetPoint1(curr.val); line_source->SetPoint1(curr.val);
line_source->SetPoint2(lend.val); line_source->SetPoint2(lend.val);
line_source->Update(); line_source->Update();
vtkSmartPointer<vtkPolyData> polydata = line_source->GetOutput(); vtkSmartPointer<vtkPolyData> polydata_ = line_source->GetOutput();
polydata->GetCellData()->SetScalars(VtkUtils::FillScalars(polydata->GetNumberOfCells(), c)); polydata_->GetCellData()->SetScalars(VtkUtils::FillScalars(polydata_->GetNumberOfCells(), c));
VtkUtils::AddInputData(append_filter, polydata); VtkUtils::AddInputData(append_filter, polydata_);
} }
} }
append_filter->Update(); append_filter->Update();

44
modules/viz/src/vtk/vtkCloudMatSource.cpp
View File

@ -116,17 +116,17 @@ int cv::viz::vtkCloudMatSource::SetColorCloudNormals(InputArray _cloud, InputArr
CV_Assert(_normals.channels() == 3 || _normals.channels() == 4); CV_Assert(_normals.channels() == 3 || _normals.channels() == 4);
CV_Assert(_normals.size() == _cloud.size()); CV_Assert(_normals.size() == _cloud.size());
Mat cloud = _cloud.getMat(); Mat c = _cloud.getMat();
Mat normals = _normals.getMat(); Mat n = _normals.getMat();
if (normals.depth() == CV_32F && cloud.depth() == CV_32F) if (n.depth() == CV_32F && c.depth() == CV_32F)
filterNanNormalsCopy<float, float>(normals, cloud, total); filterNanNormalsCopy<float, float>(n, c, total);
else if (normals.depth() == CV_32F && cloud.depth() == CV_64F) else if (n.depth() == CV_32F && c.depth() == CV_64F)
filterNanNormalsCopy<float, double>(normals, cloud, total); filterNanNormalsCopy<float, double>(n, c, total);
else if (normals.depth() == CV_64F && cloud.depth() == CV_32F) else if (n.depth() == CV_64F && c.depth() == CV_32F)
filterNanNormalsCopy<double, float>(normals, cloud, total); filterNanNormalsCopy<double, float>(n, c, total);
else if (normals.depth() == CV_64F && cloud.depth() == CV_64F) else if (n.depth() == CV_64F && c.depth() == CV_64F)
filterNanNormalsCopy<double, double>(normals, cloud, total); filterNanNormalsCopy<double, double>(n, c, total);
else else
CV_Assert(!"Unsupported normals/cloud type"); CV_Assert(!"Unsupported normals/cloud type");
@ -143,17 +143,17 @@ int cv::viz::vtkCloudMatSource::SetColorCloudNormalsTCoords(InputArray _cloud, I
CV_Assert(_tcoords.depth() == CV_32F || _tcoords.depth() == CV_64F); CV_Assert(_tcoords.depth() == CV_32F || _tcoords.depth() == CV_64F);
CV_Assert(_tcoords.channels() == 2 && _tcoords.size() == _cloud.size()); CV_Assert(_tcoords.channels() == 2 && _tcoords.size() == _cloud.size());
Mat cloud = _cloud.getMat(); Mat cl = _cloud.getMat();
Mat tcoords = _tcoords.getMat(); Mat tc = _tcoords.getMat();
if (tcoords.depth() == CV_32F && cloud.depth() == CV_32F) if (tc.depth() == CV_32F && cl.depth() == CV_32F)
filterNanTCoordsCopy<float, float>(tcoords, cloud, total); filterNanTCoordsCopy<float, float>(tc, cl, total);
else if (tcoords.depth() == CV_32F && cloud.depth() == CV_64F) else if (tc.depth() == CV_32F && cl.depth() == CV_64F)
filterNanTCoordsCopy<float, double>(tcoords, cloud, total); filterNanTCoordsCopy<float, double>(tc, cl, total);
else if (tcoords.depth() == CV_64F && cloud.depth() == CV_32F) else if (tc.depth() == CV_64F && cl.depth() == CV_32F)
filterNanTCoordsCopy<double, float>(tcoords, cloud, total); filterNanTCoordsCopy<double, float>(tc, cl, total);
else if (tcoords.depth() == CV_64F && cloud.depth() == CV_64F) else if (tc.depth() == CV_64F && cl.depth() == CV_64F)
filterNanTCoordsCopy<double, double>(tcoords, cloud, total); filterNanTCoordsCopy<double, double>(tc, cl, total);
else else
CV_Assert(!"Unsupported tcoords/cloud type"); CV_Assert(!"Unsupported tcoords/cloud type");
@ -241,7 +241,7 @@ void cv::viz::vtkCloudMatSource::filterNanColorsCopy(const Mat& cloud_colors, co
template<typename _Tn, typename _Msk> template<typename _Tn, typename _Msk>
void cv::viz::vtkCloudMatSource::filterNanNormalsCopy(const Mat& cloud_normals, const Mat& mask, int total) void cv::viz::vtkCloudMatSource::filterNanNormalsCopy(const Mat& cloud_normals, const Mat& mask, int total)
{ {
normals = vtkSmartPointer< VtkDepthTraits<_Tn>::array_type >::New(); normals = vtkSmartPointer< typename VtkDepthTraits<_Tn>::array_type >::New();
normals->SetName("Normals"); normals->SetName("Normals");
normals->SetNumberOfComponents(3); normals->SetNumberOfComponents(3);
normals->SetNumberOfTuples(total); normals->SetNumberOfTuples(total);
@ -267,7 +267,7 @@ template<typename _Tn, typename _Msk>
void cv::viz::vtkCloudMatSource::filterNanTCoordsCopy(const Mat& _tcoords, const Mat& mask, int total) void cv::viz::vtkCloudMatSource::filterNanTCoordsCopy(const Mat& _tcoords, const Mat& mask, int total)
{ {
typedef Vec<_Tn, 2> Vec2; typedef Vec<_Tn, 2> Vec2;
tcoords = vtkSmartPointer< VtkDepthTraits<_Tn>::array_type >::New(); tcoords = vtkSmartPointer< typename VtkDepthTraits<_Tn>::array_type >::New();
tcoords->SetName("TextureCoordinates"); tcoords->SetName("TextureCoordinates");
tcoords->SetNumberOfComponents(2); tcoords->SetNumberOfComponents(2);
tcoords->SetNumberOfTuples(total); tcoords->SetNumberOfTuples(total);

2
modules/viz/src/vtk/vtkImageMatSource.cpp
View File

@ -78,7 +78,7 @@ int cv::viz::vtkImageMatSource::RequestData(vtkInformation*, vtkInformationVecto
void cv::viz::vtkImageMatSource::SetImage(InputArray _image) void cv::viz::vtkImageMatSource::SetImage(InputArray _image)
{ {
CV_Assert(_image.depth() == CV_8U && _image.channels() == 1 || _image.channels() == 3 || _image.channels() == 4); CV_Assert(_image.depth() == CV_8U && (_image.channels() == 1 || _image.channels() == 3 || _image.channels() == 4));
Mat image = _image.getMat(); Mat image = _image.getMat();