1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2018-07-09 19:31:45 +03:00
148 changed files with 2773 additions and 2038 deletions
+1 -1
View File
@@ -399,7 +399,7 @@ void cv::findNonZero( InputArray _src, OutputArray _idx )
std::vector<Point> idxvec;
int rows = src.rows, cols = src.cols;
AutoBuffer<int> buf_(cols + 1);
int* buf = buf_;
int* buf = buf_.data();
for( int i = 0; i < rows; i++ )
{