potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2018-11-10 20:10:57 +00:00
parent c7d04c6c5c 56eebb926d
commit 1913482cf5
90 changed files with 6261 additions and 6657 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ts/include/opencv2/ts/ts_ext.hpp
+2 -2
View File
@@ -39,7 +39,7 @@ extern int testThreads;
Body(); \
CV__TEST_CLEANUP \
} \
catch (cvtest::SkipTestException& e) \
catch (const cvtest::SkipTestException& e) \
{ \
printf("[ SKIP ] %s\n", e.what()); \
} \
@@ -87,7 +87,7 @@ extern int testThreads;
Body(); \
CV__TEST_CLEANUP \
} \
catch (cvtest::SkipTestException& e) \
catch (const cvtest::SkipTestException& e) \
{ \
printf("[ SKIP ] %s\n", e.what()); \
} \