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/src/precomp.hpp
+++ b/modules/gpu/src/precomp.hpp
@@ -73,6 +73,14 @@
 #include "opencv2/core/internal.hpp"
 #include "opencv2/video/video.hpp"

+#if defined WIN32 || defined WINCE
+    #include <windows.h>
+    #undef small
+    #undef min
+    #undef max
+    #undef abs
+#endif
+
 #define OPENCV_GPU_UNUSED(x) (void)x

 #ifdef HAVE_CUDA