1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge pull request #10263 from mshabunin:embedded-build

This commit is contained in:
Vadim Pisarevsky
2017-12-11 12:42:45 +00:00
25 changed files with 184 additions and 135 deletions
+2 -2
View File
@@ -867,11 +867,11 @@ bool useOpenCL()
CoreTLSData* data = getCoreTlsData().get();
if( data->useOpenCL < 0 )
{
try
CV_TRY
{
data->useOpenCL = (int)(haveOpenCL() && Device::getDefault().ptr() && Device::getDefault().available()) ? 1 : 0;
}
catch (...)
CV_CATCH_ALL
{
data->useOpenCL = 0;
}