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

fix for negative confidence

Browse Source
This commit is contained in:
marina.kolpakova 2012-11-13 23:08:19 +04:00
parent bd9ca48fab
commit 1edab12068
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/objdetect/src/softcascade.cpp
View File

@ -232,7 +232,7 @@ struct cv::SCascade::Fields
float detectionScore = 0.f; float detectionScore = 0.f;
const Octave& octave = *(level.octave); const Octave& octave = *(level.octave);
int stBegin = octave.index * octave.stages, stEnd = stBegin + 1024;//octave.stages; int stBegin = octave.index * octave.stages, stEnd = stBegin + octave.stages;
int st = stBegin; int st = stBegin;
for(; st < stEnd; ++st) for(; st < stEnd; ++st)
@ -270,7 +270,8 @@ struct cv::SCascade::Fields
if (detectionScore <= stage.threshold) return; if (detectionScore <= stage.threshold) return;
} }
level.addDetection(dx, dy, detectionScore, detections); if (detectionScore > 0)
level.addDetection(dx, dy, detectionScore, detections);
} }
octIt_t fitOctave(const float& logFactor) octIt_t fitOctave(const float& logFactor)

8
modules/objdetect/test/test_softcascade.cpp
View File

@ -66,7 +66,7 @@ TEST(SCascade, detect)
std::vector<Detection> objects; std::vector<Detection> objects;
cascade.detect(colored, cv::noArray(), objects); cascade.detect(colored, cv::noArray(), objects);
ASSERT_EQ((int)objects.size(), 3498); ASSERT_EQ(1459, (int)objects.size());
} }
TEST(SCascade, detectSeparate) TEST(SCascade, detectSeparate)
@ -83,7 +83,7 @@ TEST(SCascade, detectSeparate)
cv::Mat rects, confs; cv::Mat rects, confs;
cascade.detect(colored, cv::noArray(), rects, confs); cascade.detect(colored, cv::noArray(), rects, confs);
ASSERT_EQ(confs.cols, 3498); ASSERT_EQ(1459, confs.cols);
} }
TEST(SCascade, detectRoi) TEST(SCascade, detectRoi)
@ -102,7 +102,7 @@ TEST(SCascade, detectRoi)
rois.push_back(cv::Rect(0, 0, 640, 480)); rois.push_back(cv::Rect(0, 0, 640, 480));
cascade.detect(colored, rois, objects); cascade.detect(colored, rois, objects);
ASSERT_EQ((int)objects.size(), 3498); ASSERT_EQ(1459, (int)objects.size());
} }
TEST(SCascade, detectNoRoi) TEST(SCascade, detectNoRoi)
@ -121,5 +121,5 @@ TEST(SCascade, detectNoRoi)
cascade.detect(colored, rois, objects); cascade.detect(colored, rois, objects);
ASSERT_EQ((int)objects.size(), 0); ASSERT_EQ(0, (int)objects.size());
} }