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

2026-07-29 23:33:05 +04:00 · 2018-09-15 00:52:21 +03:00
parent a024593fa6 14b438317e
commit 808ba552c5
235 changed files with 18422 additions and 3526 deletions
@@ -54,6 +54,10 @@
 using namespace cv;
 using namespace cv::cuda;

+#if defined(_MSC_VER)
+#pragma warning(disable : 4702)  // unreachable code
+#endif
+
 namespace
 {
 #ifndef HAVE_OPENGL