generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-07-02 09:56:59 +00:00
commit 0e534b5a25
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/ocl.cpp
View File

@ -2228,7 +2228,8 @@ static cl_device_id selectOpenCLDevice()
if (!isID) if (!isID)
{ {
deviceTypes.push_back("GPU"); deviceTypes.push_back("GPU");
deviceTypes.push_back("CPU"); if (configuration)
deviceTypes.push_back("CPU");
} }
else else
deviceTypes.push_back("ALL"); deviceTypes.push_back("ALL");