potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +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/core/src/system.cpp
+1 -1
View File
@@ -1029,7 +1029,7 @@ void error( const Exception& exc )
*p = 0;
}
CV_THROW(exc);
throw exc;
#ifdef __GNUC__
# if !defined __clang__ && !defined __APPLE__
// this suppresses this warning: "noreturn" function does return [enabled by default]