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

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

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-07 12:40:27 +03:00
parent 4a73b4859f f3fae0dae0
commit 73bfe68821
141 changed files with 3074 additions and 4777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/video/src/compat_video.cpp
+3 -3
View File
@@ -56,7 +56,7 @@ cvMeanShift( const void* imgProb, CvRect windowIn,
if( comp )
{
comp->rect = window;
comp->rect = cvRect(window);
comp->area = cvRound(cv::sum(img(window))[0]);
}
@@ -76,13 +76,13 @@ cvCamShift( const void* imgProb, CvRect windowIn,
if( comp )
{
comp->rect = window;
comp->rect = cvRect(window);
cv::Rect roi = rr.boundingRect() & cv::Rect(0, 0, img.cols, img.rows);
comp->area = cvRound(cv::sum(img(roi))[0]);
}
if( box )
*box = rr;
*box = cvBox2D(rr);
return rr.size.width*rr.size.height > 0.f ? 1 : -1;
}