Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-29 23:33:05 +04:00 · 2018-11-10 20:10:57 +00:00
parent c7d04c6c5c 56eebb926d
commit 1913482cf5
90 changed files with 6261 additions and 6657 deletions
@@ -894,11 +894,11 @@ bool useOpenCL()
    CoreTLSData* data = getCoreTlsData().get();
    if( data->useOpenCL < 0 )
    {
-        CV_TRY
+        try
        {
            data->useOpenCL = (int)(haveOpenCL() && Device::getDefault().ptr() && Device::getDefault().available()) ? 1 : 0;
        }
-        CV_CATCH_ALL
+        catch (...)
        {
            data->useOpenCL = 0;
        }