From 31291ced11842efea7f02d35cfae14079c53c8c5 Mon Sep 17 00:00:00 2001 From: abidrahmank Date: Wed, 21 May 2014 08:26:16 +0530 Subject: [PATCH] Issue #2540 : Python bindings for various "detectMultiScale()" --- modules/objdetect/doc/cascade_classification.rst | 6 +++++- modules/objdetect/include/opencv2/objdetect.hpp | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/objdetect/doc/cascade_classification.rst b/modules/objdetect/doc/cascade_classification.rst index 11c9906731..680ac65862 100644 --- a/modules/objdetect/doc/cascade_classification.rst +++ b/modules/objdetect/doc/cascade_classification.rst @@ -86,9 +86,11 @@ Detects objects of different sizes in the input image. The detected objects are .. ocv:function:: void CascadeClassifier::detectMultiScale( InputArray image, vector& objects, double scaleFactor=1.1, int minNeighbors=3, int flags=0, Size minSize=Size(), Size maxSize=Size()) .. ocv:function:: void CascadeClassifier::detectMultiScale( InputArray image, vector& objects, vector& numDetections, double scaleFactor=1.1, int minNeighbors=3, int flags=0, Size minSize=Size(), Size maxSize=Size()) +.. ocv:function:: void CascadeClassifier::detectMultiScale( InputArray image, std::vector& objects, std::vector& rejectLevels, std::vector& levelWeights, double scaleFactor = 1.1, int minNeighbors = 3, int flags = 0, Size minSize = Size(), Size maxSize = Size(), bool outputRejectLevels = false ) .. ocv:pyfunction:: cv2.CascadeClassifier.detectMultiScale(image[, scaleFactor[, minNeighbors[, flags[, minSize[, maxSize]]]]]) -> objects -.. ocv:pyfunction:: cv2.CascadeClassifier.detectMultiScale(image[, scaleFactor[, minNeighbors[, flags[, minSize[, maxSize[, outputRejectLevels]]]]]]) -> objects, rejectLevels, levelWeights +.. ocv:pyfunction:: cv2.CascadeClassifier.detectMultiScale2(image[, scaleFactor[, minNeighbors[, flags[, minSize[, maxSize]]]]]) -> objects, numDetections +.. ocv:pyfunction:: cv2.CascadeClassifier.detectMultiScale3(image[, scaleFactor[, minNeighbors[, flags[, minSize[, maxSize[, outputRejectLevels]]]]]]) -> objects, rejectLevels, levelWeights .. ocv:cfunction:: CvSeq* cvHaarDetectObjects( const CvArr* image, CvHaarClassifierCascade* cascade, CvMemStorage* storage, double scale_factor=1.1, int min_neighbors=3, int flags=0, CvSize min_size=cvSize(0,0), CvSize max_size=cvSize(0,0) ) @@ -110,6 +112,8 @@ Detects objects of different sizes in the input image. The detected objects are :param maxSize: Maximum possible object size. Objects larger than that are ignored. + :param outputRejectLevels: Boolean. If ``True``, it returns the rejectLevels and levelWeights. Default value is ``False``. + The function is parallelized with the TBB library. .. note:: diff --git a/modules/objdetect/include/opencv2/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect.hpp index 5f2a627726..d62e529d4a 100644 --- a/modules/objdetect/include/opencv2/objdetect.hpp +++ b/modules/objdetect/include/opencv2/objdetect.hpp @@ -189,7 +189,7 @@ public: Size minSize = Size(), Size maxSize = Size() ); - CV_WRAP void detectMultiScale( InputArray image, + CV_WRAP_AS(detectMultiScale2) void detectMultiScale( InputArray image, CV_OUT std::vector& objects, CV_OUT std::vector& numDetections, double scaleFactor=1.1, @@ -197,7 +197,7 @@ public: Size minSize=Size(), Size maxSize=Size() ); - CV_WRAP void detectMultiScale( InputArray image, + CV_WRAP_AS(detectMultiScale3) void detectMultiScale( InputArray image, CV_OUT std::vector& objects, CV_OUT std::vector& rejectLevels, CV_OUT std::vector& levelWeights,