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-09-07 12:40:27 +03:00
141 changed files with 3074 additions and 4777 deletions
+1 -1
View File
@@ -530,7 +530,7 @@ cvGoodFeaturesToTrack( const void* _image, void*, void*,
size_t i, ncorners = corners.size();
for( i = 0; i < ncorners; i++ )
_corners[i] = corners[i];
_corners[i] = cvPoint2D32f(corners[i]);
*_corner_count = (int)ncorners;
}