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

Merge pull request #1739 from pengx17:2.4_ocl_overload_haar

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-11-06 13:31:11 +04:00
committed by OpenCV Buildbot
parent 5c44afa427 53d1873776
commit 95767676b7
5 changed files with 32 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/ocl/src/haar.cpp
View File

@@ -1186,6 +1186,28 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
return result_seq;
}
struct getRect
{
Rect operator()(const CvAvgComp &e) const
{
return e.rect;
}
};
void cv::ocl::OclCascadeClassifier::detectMultiScale(oclMat &gimg, CV_OUT std::vector<cv::Rect>& faces,
double scaleFactor, int minNeighbors, int flags,
Size minSize, Size maxSize)
{
CvSeq* _objects;
MemStorage storage(cvCreateMemStorage(0));
_objects = oclHaarDetectObjects(gimg, storage, scaleFactor, minNeighbors, flags, minSize, maxSize);
vector<CvAvgComp> vecAvgComp;
Seq<CvAvgComp>(_objects).copyTo(vecAvgComp);
faces.resize(vecAvgComp.size());
std::transform(vecAvgComp.begin(), vecAvgComp.end(), faces.begin(), getRect());
}
struct OclBuffers
{
cl_mem stagebuffer;
@@ -1197,13 +1219,6 @@ struct OclBuffers
cl_mem newnodebuffer;
};
struct getRect
{
Rect operator()(const CvAvgComp &e) const
{
return e.rect;
}
};
void cv::ocl::OclCascadeClassifierBuf::detectMultiScale(oclMat &gimg, CV_OUT std::vector<cv::Rect>& faces,
double scaleFactor, int minNeighbors, int flags,