Merge pull request #9826 from p0wdrdotcom:master

This commit is contained in:
Alexander Alekhin 2017-10-11 08:55:15 +00:00
commit 5ea8ea440b

View File

@ -609,7 +609,7 @@ bool HaarEvaluator::read(const FileNode& node, Size _origWinSize)
localSize = lbufSize = Size(0, 0); localSize = lbufSize = Size(0, 0);
if (ocl::haveOpenCL()) if (ocl::haveOpenCL())
{ {
if (ocl::Device::getDefault().isAMD() || ocl::Device::getDefault().isIntel()) if (ocl::Device::getDefault().isAMD() || ocl::Device::getDefault().isIntel() || ocl::Device::getDefault().isNVidia())
{ {
localSize = Size(8, 8); localSize = Size(8, 8);
lbufSize = Size(origWinSize.width + localSize.width, lbufSize = Size(origWinSize.width + localSize.width,