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

Revert "Add a variant of detectMultiScale with an argument 'weights'"

Browse Source 
It was merged by mistake.

This reverts commit ab6be9b7b7.
This commit is contained in:
Roman Donchenko
2013-06-10 17:06:34 +04:00
parent 52e9974431
commit d583a79869
3 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,14 +382,6 @@ public:
Size minSize=Size(),
Size maxSize=Size() );
CV_WRAP virtual void detectMultiScale( const Mat& image,
CV_OUT vector<Rect>& objects,
vector<int>& weights,
double scaleFactor=1.1,
int minNeighbors=3, int flags=0,
Size minSize=Size(),
Size maxSize=Size() );
CV_WRAP virtual void detectMultiScale( const Mat& image,
CV_OUT vector<Rect>& objects,
vector<int>& rejectLevels,
@@ -398,8 +390,7 @@ public:
int minNeighbors=3, int flags=0,
Size minSize=Size(),
Size maxSize=Size(),
bool outputRejectLevels=false,
bool outputWeights=false );
bool outputRejectLevels=false );
bool isOldFormatCascade() const;