Commit b45bb60c authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot

Merge pull request #2126 from yinghau76:master

parents cab67cd9 b24f7ee5
...@@ -1212,7 +1212,7 @@ bool CascadeClassifierImpl::ocl_detectSingleScale( InputArray _image, Size proce ...@@ -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 ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment