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

Merge pull request #891 from NCBee:2.4

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-07-31 16:38:14 +04:00
committed by OpenCV Buildbot
parent 4c35449b7d e2d6a3abe5
commit 9b5d1596dc
3 changed files with 115 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,24 +114,6 @@ struct Logger
namespace cv
{
// class for grouping object candidates, detected by Cascade Classifier, HOG etc.
// instance of the class is to be passed to cv::partition (see cxoperations.hpp)
class CV_EXPORTS SimilarRects
{
public:
SimilarRects(double _eps) : eps(_eps) {}
inline bool operator()(const Rect& r1, const Rect& r2) const
{
double delta = eps*(std::min(r1.width, r2.width) + std::min(r1.height, r2.height))*0.5;
return std::abs(r1.x - r2.x) <= delta &&
std::abs(r1.y - r2.y) <= delta &&
std::abs(r1.x + r1.width - r2.x - r2.width) <= delta &&
std::abs(r1.y + r1.height - r2.y - r2.height) <= delta;
}
double eps;
};
void groupRectangles(vector<Rect>& rectList, int groupThreshold, double eps, vector<int>* weights, vector<double>* levelWeights)
{
if( groupThreshold <= 0 || rectList.empty() )