potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

ocl: stop using of OpenCL without explicit UMat arguments

Browse Source
This commit is contained in:
Alexander Alekhin
2016-12-04 02:19:38 +03:00
parent 4a095e4d66
commit 44d9d59f08
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/src/cascadedetect.cpp
+3 -2
View File
@@ -1290,8 +1290,8 @@ void CascadeClassifierImpl::detectMultiScaleNoGrouping( InputArray _image, std::
#ifdef HAVE_OPENCL
bool use_ocl = tryOpenCL && ocl::useOpenCL() &&
OCL_FORCE_CHECK(_image.isUMat()) &&
featureEvaluator->getLocalSize().area() > 0 &&
ocl::Device::getDefault().type() != ocl::Device::TYPE_CPU &&
(data.minNodesPerTree == data.maxNodesPerTree) &&
!isOldFormatCascade() &&
maskGenerator.empty() &&
@@ -1316,7 +1316,8 @@ void CascadeClassifierImpl::detectMultiScaleNoGrouping( InputArray _image, std::
// OpenCL code
CV_OCL_RUN(use_ocl, ocl_detectMultiScaleNoGrouping( scales, candidates ))
tryOpenCL = false;
if (use_ocl)
tryOpenCL = false;
#endif
// CPU code