potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7854 from alalek:backports_2016

Browse Source 
(2.4) Backports from master branch (#7854)
This commit is contained in:
Alexander Alekhin
2016-12-15 18:09:44 +02:00
committed by GitHub
parent 49e6bb2993
commit cc09f5a7de
61 changed files with 1546 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/viz/src/precomp.hpp
+1 -1
View File
@@ -280,7 +280,7 @@ namespace cv
scalars->SetName("Colors");
scalars->SetNumberOfComponents(3);
scalars->SetNumberOfTuples((vtkIdType)size);
scalars->SetArray(color_data->val, (vtkIdType)(size * 3), 0);
scalars->SetArray(color_data->val, (vtkIdType)(size * 3), 0, vtkUnsignedCharArray::VTK_DATA_ARRAY_DELETE);
return scalars;
}
modules/viz/src/vtk/vtkCloudMatSource.cpp
+1 -1
View File
@@ -235,7 +235,7 @@ void cv::viz::vtkCloudMatSource::filterNanColorsCopy(const Mat& cloud_colors, co
scalars->SetName("Colors");
scalars->SetNumberOfComponents(3);
scalars->SetNumberOfTuples(total);
scalars->SetArray(array->val, total * 3, 0);
scalars->SetArray(array->val, total * 3, 0, vtkUnsignedCharArray::VTK_DATA_ARRAY_DELETE);
}
template<typename _Tn, typename _Msk>