mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-18 11:28:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #942 from achalddave:patch-1

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-21 16:06:27 +04:00 committed by OpenCV Buildbot
commit 893e8b4371
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/objdetect/src/cascadedetect.cpp
View File

@ -178,8 +178,11 @@ void groupRectangles(std::vector<Rect>& rectList, int groupThreshold, double eps
for( i = 0; i < nclasses; i++ ) for( i = 0; i < nclasses; i++ )
{ {
Rect r1 = rrects[i]; Rect r1 = rrects[i];
int n1 = levelWeights ? rejectLevels[i] : rweights[i]; int n1 = rweights[i];
double w1 = rejectWeights[i]; double w1 = rejectWeights[i];
int l1 = rejectLevels[i];
// filter out rectangles which don't have enough similar rectangles
if( n1 <= groupThreshold ) if( n1 <= groupThreshold )
continue; continue;
// filter out small face rectangles inside large rectangles // filter out small face rectangles inside large rectangles
@ -207,7 +210,7 @@ void groupRectangles(std::vector<Rect>& rectList, int groupThreshold, double eps
{ {
rectList.push_back(r1); rectList.push_back(r1);
if( weights ) if( weights )
weights->push_back(n1); weights->push_back(l1);
if( levelWeights ) if( levelWeights )
levelWeights->push_back(w1); levelWeights->push_back(w1);
} }
@ -970,7 +973,7 @@ public:
{ {
if( result == 1 ) if( result == 1 )
result = -(int)classifier->data.stages.size(); result = -(int)classifier->data.stages.size();
if( classifier->data.stages.size() + result < 4 ) if( classifier->data.stages.size() + result == 0 )
{ {
mtx->lock(); mtx->lock();
rectangles->push_back(Rect(cvRound(x*scalingFactor), cvRound(y*scalingFactor), winSize.width, winSize.height)); rectangles->push_back(Rect(cvRound(x*scalingFactor), cvRound(y*scalingFactor), winSize.width, winSize.height));