generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move cv::Rect_

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-26 20:43:27 +04:00
parent addf0309ec
commit 62adc01980
13 changed files with 72 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/objdetect/src/haar.cpp
View File

@@ -1574,9 +1574,9 @@ cvHaarDetectObjectsForROC( const CvArr* _img,
CvSize sz(cvRound( img->cols/factor ), cvRound( img->rows/factor ));
CvSize sz1(sz.width - winSize0.width + 1, sz.height - winSize0.height + 1);
CvRect equRect = { icv_object_win_border, icv_object_win_border,
CvRect equRect(icv_object_win_border, icv_object_win_border,
winSize0.width - icv_object_win_border*2,
winSize0.height - icv_object_win_border*2 };
winSize0.height - icv_object_win_border*2);
CvMat img1, sum1, sqsum1, norm1, tilted1, mask1;
CvMat* _tilted = 0;
@@ -1658,7 +1658,7 @@ cvHaarDetectObjectsForROC( const CvArr* _img,
const double ystep = std::max( 2., factor );
CvSize winSize(cvRound( cascade->orig_window_size.width * factor ),
cvRound( cascade->orig_window_size.height * factor ));
CvRect equRect = { 0, 0, 0, 0 };
CvRect equRect;
int *p[4] = {0,0,0,0};
int *pq[4] = {0,0,0,0};
int startX = 0, startY = 0;
@@ -1775,7 +1775,7 @@ cvHaarDetectObjectsForROC( const CvArr* _img,
if( findBiggestObject && rectList.size() )
{
CvAvgComp result_comp = {{0,0,0,0},0};
CvAvgComp result_comp = {CvRect(),0};
for( size_t i = 0; i < rectList.size(); i++ )
{