Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device

11 years ago · ef9669ba1a
parent 7193762d2d d060d30fa0
commit ef9669ba1a
1 changed files with 2 additions and 5 deletions
--- a/modules/objdetect/src/cascadedetect.cpp
+++ b/modules/objdetect/src/cascadedetect.cpp
@ -765,11 +765,8 @@ bool LBPEvaluator::read( const FileNode& node, Size _origWinSize )
    nchannels = 1;
    localSize = lbufSize = Size(0, 0);
    if (ocl::haveOpenCL())
-    {
+        localSize = Size(8, 8);
-        const ocl::Device& device = ocl::Device::getDefault();
+
        if (device.isAMD() && !device.hostUnifiedMemory())
            localSize = Size(8, 8);
    }
    return true;
 }