Merge pull request opencv#9826 from p0wdrdotcom:master

alalek · alalek · commit 5ea8ea440b0e · 2017-10-11T08:55:15.000Z
diff --git a/modules/objdetect/src/cascadedetect.cpp b/modules/objdetect/src/cascadedetect.cpp
@@ -609,7 +609,7 @@ bool HaarEvaluator::read(const FileNode& node, Size _origWinSize)
     localSize = lbufSize = Size(0, 0);
     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);
             lbufSize = Size(origWinSize.width + localSize.width,

Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@ bool HaarEvaluator::read(const FileNode& node, Size _origWinSize)`
`609`	`609`	`localSize = lbufSize = Size(0, 0);`
`610`	`610`	`if (ocl::haveOpenCL())`
`611`	`611`	`{`
`612`		`- if (ocl::Device::getDefault().isAMD() \|\| ocl::Device::getDefault().isIntel())`
	`612`	`+ if (ocl::Device::getDefault().isAMD() \|\| ocl::Device::getDefault().isIntel() \|\| ocl::Device::getDefault().isNVidia())`
`613`	`613`	`{`
`614`	`614`	`localSize = Size(8, 8);`
`615`	`615`	`lbufSize = Size(origWinSize.width + localSize.width,`