Merge 2.4.3-rc

2012-10-24 19:56:27 +04:00
parent f14a711bda 12747068b5
commit 6211f156e6
93 changed files with 53456 additions and 51646 deletions
--- a/modules/features2d/src/fast.cpp
+++ b/modules/features2d/src/fast.cpp
@@ -44,6 +44,10 @@ The references are:
 #include "precomp.hpp"
 #include "fast_score.hpp"

+#if defined _MSC_VER
+# pragma warning( disable : 4127)
+#endif
+
 namespace cv
 {