Merge pull request #3625 from wangyan42164:ocl_cascade_deadlock

2015-01-21 10:43:50 +00:00
parent 479cac2a14 f5b21e8141
commit b49fa7d384
2 changed files with 3 additions and 2 deletions
--- a/modules/objdetect/src/cascadedetect.cpp
+++ b/modules/objdetect/src/cascadedetect.cpp
@@ -587,7 +587,7 @@ bool HaarEvaluator::read(const FileNode& node, Size _origWinSize)
    localSize = lbufSize = Size(0, 0);
    if (ocl::haveOpenCL())
    {
-        if (ocl::Device::getDefault().isAMD())
+        if (ocl::Device::getDefault().isAMD() || ocl::Device::getDefault().isIntel())
        {
            localSize = Size(8, 8);
            lbufSize = Size(origWinSize.width + localSize.width,