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

A little fix in haar cascade

Browse Source
This commit is contained in:
Alexey Kazakov 2011-04-22 11:21:40 +00:00
parent 5c1fafdd6f
commit fb0b25692e
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
View File

@ -125,13 +125,14 @@ CVAPI(void) cvReleaseHaarClassifierCascade( CvHaarClassifierCascade** cascade );
#define CV_HAAR_FIND_BIGGEST_OBJECT 4 #define CV_HAAR_FIND_BIGGEST_OBJECT 4
#define CV_HAAR_DO_ROUGH_SEARCH 8 #define CV_HAAR_DO_ROUGH_SEARCH 8
CVAPI(CvSeq*) cvHaarDetectObjectsForROC( const CvArr* image, //CVAPI(CvSeq*) cvHaarDetectObjectsForROC( const CvArr* image,
CvHaarClassifierCascade* cascade, CvMemStorage* storage, // CvHaarClassifierCascade* cascade, CvMemStorage* storage,
std::vector<int>& rejectLevels, std::vector<double>& levelWeightds, // CvSeq** rejectLevels, CvSeq** levelWeightds,
double scale_factor CV_DEFAULT(1.1), // double scale_factor CV_DEFAULT(1.1),
int min_neighbors CV_DEFAULT(3), int flags CV_DEFAULT(0), // int min_neighbors CV_DEFAULT(3), int flags CV_DEFAULT(0),
CvSize min_size CV_DEFAULT(cvSize(0,0)), CvSize max_size CV_DEFAULT(cvSize(0,0)), // CvSize min_size CV_DEFAULT(cvSize(0,0)), CvSize max_size CV_DEFAULT(cvSize(0,0)),
bool outputRejectLevels = false ); // bool outputRejectLevels = false );
CVAPI(CvSeq*) cvHaarDetectObjects( const CvArr* image, CVAPI(CvSeq*) cvHaarDetectObjects( const CvArr* image,
CvHaarClassifierCascade* cascade, CvMemStorage* storage, CvHaarClassifierCascade* cascade, CvMemStorage* storage,
@ -276,6 +277,14 @@ CVAPI(CvSeq*) cvLatentSvmDetectObjects(IplImage* image,
#ifdef __cplusplus #ifdef __cplusplus
} }
CV_EXPORTS CvSeq* cvHaarDetectObjectsForROC( const CvArr* image,
CvHaarClassifierCascade* cascade, CvMemStorage* storage,
std::vector<int>& rejectLevels, std::vector<double>& levelWeightds,
double scale_factor CV_DEFAULT(1.1),
int min_neighbors CV_DEFAULT(3), int flags CV_DEFAULT(0),
CvSize min_size CV_DEFAULT(cvSize(0,0)), CvSize max_size CV_DEFAULT(cvSize(0,0)),
bool outputRejectLevels = false );
namespace cv namespace cv
{ {

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

@ -1011,7 +1011,7 @@ struct HaarDetectObjects_ScaleCascade_Invoker
} }
CV_IMPL CvSeq* CvSeq*
cvHaarDetectObjectsForROC( const CvArr* _img, cvHaarDetectObjectsForROC( const CvArr* _img,
CvHaarClassifierCascade* cascade, CvMemStorage* storage, CvHaarClassifierCascade* cascade, CvMemStorage* storage,
std::vector<int>& rejectLevels, std::vector<double>& levelWeights, std::vector<int>& rejectLevels, std::vector<double>& levelWeights,