Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu

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");