Made the Python bindings not use deprecated NumPy 1.7 API.

2013-07-16 14:33:15 +04:00
parent 886c009da6
commit 28a5c127ea
2 changed files with 25 additions and 12 deletions
--- a/modules/python/src2/cv2.cv.hpp
+++ b/modules/python/src2/cv2.cv.hpp
@@ -510,7 +510,11 @@ static void arrayinterface_common(PyArrayInterface *s, int mtype)
    assert(0);
  }

+#ifdef NPY_1_7_API_VERSION
+  s->flags = NPY_ARRAY_WRITEABLE | NPY_ARRAY_NOTSWAPPED;
+#else
  s->flags = NPY_WRITEABLE | NPY_NOTSWAPPED;
+#endif
 }

 static PyObject *cvmat_array_struct(cvmat_t *cva)