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
@@ -1821,7 +1821,7 @@ cvFindContours_Impl( void*  img,  CvMemStorage*  storage,
    }
    else
    {
-        CV_TRY
+        try
        {
            scanner = cvStartFindContours_Impl( img, storage, cntHeaderSize, mode, method, offset,
                                            needFillBorder);
@@ -1833,11 +1833,11 @@ cvFindContours_Impl( void*  img,  CvMemStorage*  storage,
            }
            while( contour != 0 );
        }
-        CV_CATCH_ALL
+        catch(...)
        {
            if( scanner )
                cvEndFindContours(&scanner);
-            CV_RETHROW();
+            throw;
        }

        *firstContour = cvEndFindContours( &scanner );