Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device

ef9669ba · Andrey Pavlenko · OpenCV Buildbot · 7193762d · d060d30f · ef9669ba
Commit ef9669ba authored Mar 21, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Mar 21, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

cascadedetect.cpp modules/objdetect/src/cascadedetect.cpp +2 -5

No files found.
--- 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())
-    {
-        const ocl::Device& device = ocl::Device::getDefault();
-        if (device.isAMD() && !device.hostUnifiedMemory())
-            localSize = Size(8, 8);
-    }
+        localSize = Size(8, 8);
+
    return true;
 }