Merge commit '4b885e206' into merge-2.4

2013-12-30 16:48:45 +04:00
parent d611509842 4b885e2067
commit 9dfb96389c
8 changed files with 18 additions and 515 deletions
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@ -1,3 +1,8 @@
+#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+// eliminating duplicated round() declaration
+#define HAVE_ROUND
+#endif
+
 #include <Python.h>

 #define MODULESTR "cv2"