Merge pull request #2126 from yinghau76:master

b45bb60c · Roman Donchenko · OpenCV Buildbot · cab67cd9 · b24f7ee5 · b45bb60c
Commit b45bb60c authored Jan 09, 2014 by Roman Donchenko Committed by OpenCV Buildbot Jan 09, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cascadedetect.cpp modules/objdetect/src/cascadedetect.cpp +2 -2

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