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

fix python wrapping

Browse Source
This commit is contained in:
marina.kolpakova
2013-01-16 14:04:32 +04:00
parent f9649a029b
commit 53433884ee
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,7 +561,7 @@ public:
virtual void detect(InputArray image, InputArray rois, std::vector<Detection>& objects) const; virtual void detect(InputArray image, InputArray rois, std::vector<Detection>& objects) const;
// Param rects is an output array of bounding rectangles for detected objects. // Param rects is an output array of bounding rectangles for detected objects.
// Param confs is an output array of confidence for detected objects. i-th bounding rectangle corresponds i-th configence. // Param confs is an output array of confidence for detected objects. i-th bounding rectangle corresponds i-th configence.
CV_WRAP virtual void detect(InputArray image, InputArray rois, OutputArray rects, OutputArray confs) const; CV_WRAP virtual void detect(InputArray image, InputArray rois, CV_OUT OutputArray rects, CV_OUT OutputArray confs) const;
private: private:
void detectNoRoi(const Mat& image, std::vector<Detection>& objects) const; void detectNoRoi(const Mat& image, std::vector<Detection>& objects) const;

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

@@ -525,7 +525,7 @@ void cv::SCascade::detect(cv::InputArray _image, cv::InputArray _rois, std::vect
objects.clear(); objects.clear();
if (_rois.kind() == cv::_InputArray::NONE) if (_rois.empty())
return detectNoRoi(image, objects); return detectNoRoi(image, objects);
int shr = fld.shrinkage; int shr = fld.shrinkage;
@@ -577,7 +577,7 @@ void cv::SCascade::detect(InputArray _image, InputArray _rois, OutputArray _rec
_confs.create(1, objects.size(), CV_32F); _confs.create(1, objects.size(), CV_32F);
cv::Mat confs = _confs.getMat(); cv::Mat confs = _confs.getMat();
float* confPtr = rects.ptr<float>(0); float* confPtr = confs.ptr<float>(0);
typedef std::vector<Detection>::const_iterator IDet; typedef std::vector<Detection>::const_iterator IDet;