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

Merge pull request #2126 from yinghau76:master

Browse Source
This commit is contained in:
Roman Donchenko 2014-01-09 14:00:52 +04:00 committed by OpenCV Buildbot
commit b45bb60c8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1212,7 +1212,7 @@ bool CascadeClassifierImpl::ocl_detectSingleScale( InputArray _image, Size proce
ocl::KernelArg::PtrWriteOnly(ufacepos), // positions ocl::KernelArg::PtrWriteOnly(ufacepos), // positions
processingRectSize, processingRectSize,
yStep, (float)factor, yStep, (float)factor,
normrect, data.origWinSize, MAX_FACES); normrect, data.origWinSize, (int)MAX_FACES);
ok = haarKernel.run(2, globalsize, 0, true); ok = haarKernel.run(2, globalsize, 0, true);
} }
else if( featureType == FeatureEvaluator::LBP ) else if( featureType == FeatureEvaluator::LBP )
@ -1245,7 +1245,7 @@ bool CascadeClassifierImpl::ocl_detectSingleScale( InputArray _image, Size proce
ocl::KernelArg::PtrWriteOnly(ufacepos), // positions ocl::KernelArg::PtrWriteOnly(ufacepos), // positions
processingRectSize, processingRectSize,
yStep, (float)factor, yStep, (float)factor,
data.origWinSize, MAX_FACES); data.origWinSize, (int)MAX_FACES);
ok = lbpKernel.run(2, globalsize, 0, true); ok = lbpKernel.run(2, globalsize, 0, true);
} }
//CV_Assert(ok); //CV_Assert(ok);