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

ocl: add try-catch for OpenCL device getter

Browse Source
This commit is contained in:
Alexander Alekhin 2014-07-03 12:18:19 +04:00
parent 93f8581b69
commit c5d3c08256
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1416,7 +1416,16 @@ bool useOpenCL()
{ {
CoreTLSData* data = coreTlsData.get(); CoreTLSData* data = coreTlsData.get();
if( data->useOpenCL < 0 ) if( data->useOpenCL < 0 )
data->useOpenCL = (int)haveOpenCL() && Device::getDefault().ptr() != NULL; {
try
{
data->useOpenCL = (int)haveOpenCL() && Device::getDefault().ptr() != NULL;
}
catch (...)
{
data->useOpenCL = 0;
}
}
return data->useOpenCL > 0; return data->useOpenCL > 0;
} }