Merge release 2.4.3

2012-11-02 17:45:58 +04:00
parent 66b90d19a6 6484732509
commit 4d059e9e5b
126 changed files with 61518 additions and 51142 deletions
--- a/modules/gpu/perf/perf_precomp.hpp
+++ b/modules/gpu/perf/perf_precomp.hpp
@@ -1,6 +1,9 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
+#  ifdef __clang__
+#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#    pragma GCC diagnostic ignored "-Wextra"
+#  endif
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__