Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu

2014-07-02 09:56:59 +00:00
parent d6233b13ba 157257b072
commit 0e534b5a25
1 changed files with 2 additions and 1 deletions
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -2228,6 +2228,7 @@ static cl_device_id selectOpenCLDevice()
        if (!isID)
        {
            deviceTypes.push_back("GPU");
+            if (configuration)
                deviceTypes.push_back("CPU");
        }
        else