Merge commit '4b885e206' into merge-2.4

This commit is contained in:
Roman Donchenko committed 2013-12-30 16:48:45 +04:00
commit 9dfb96389c
8 files changed
+18 -515

No files matched your search

+5
View File
@@ -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"