Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2126 from yinghau76:master

Browse Source
pull/2119/merge
Roman Donchenko 11 years ago committed by OpenCV Buildbot
parent cab67cd9ac b24f7ee57c
commit b45bb60c8b
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/objdetect/src/cascadedetect.cpp

4
modules/objdetect/src/cascadedetect.cpp
Unescape 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);

Write Preview
Loading…
Cancel
Save