Merge pull request #5180 from boatx:bugfix/proper-conversion-of-numpy-array-to-mat

11a829f9 · Alexander Alekhin · 6483919b · d674965b · 11a829f9
Commit 11a829f9 authored Aug 13, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cv2.cpp modules/python/src2/cv2.cpp +1 -1

No files found.
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@ -282,7 +282,7 @@ static bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo info)
    if( type < 0 )
    {
-        if( typenum == NPY_INT64 || typenum == NPY_UINT64 || type == NPY_LONG )
+        if( typenum == NPY_INT64 || typenum == NPY_UINT64 || typenum == NPY_LONG )
        {
            needcopy = needcast = true;
            new_typenum = NPY_INT;