Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu

0e534b5a · Vadim Pisarevsky · d6233b13 · 157257b0 · 0e534b5a
Commit 0e534b5a authored Jul 02, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

ocl.cpp modules/core/src/ocl.cpp +2 -1

No files found.
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -2228,7 +2228,8 @@ static cl_device_id selectOpenCLDevice()
        if (!isID)
        {
            deviceTypes.push_back("GPU");
-            deviceTypes.push_back("CPU");
+            if (configuration)
+                deviceTypes.push_back("CPU");
        }
        else
            deviceTypes.push_back("ALL");