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

11
modules/ocl/test/test_objdetect.cpp
View File

@@ -218,14 +218,9 @@ PARAM_TEST_CASE(Haar, int, CascadeName)
OCL_TEST_P(Haar, FaceDetect)
{
MemStorage storage(cvCreateMemStorage(0));
CvSeq *_objects;
_objects = cascade.oclHaarDetectObjects(d_img, storage, 1.1, 3,
flags, Size(30, 30), Size(0, 0));
vector<CvAvgComp> vecAvgComp;
Seq<CvAvgComp>(_objects).copyTo(vecAvgComp);
oclfaces.resize(vecAvgComp.size());
std::transform(vecAvgComp.begin(), vecAvgComp.end(), oclfaces.begin(), getRect());
cascade.detectMultiScale(d_img, oclfaces, 1.1, 3,
flags,
Size(30, 30), Size(0, 0));
cpucascade.detectMultiScale(img, faces, 1.1, 3,
flags,