Commit 91ca834b authored by Alexander Alekhin's avatar Alexander Alekhin

bug fix for issue 3470

parent 206df7fd
...@@ -189,7 +189,6 @@ public: ...@@ -189,7 +189,6 @@ public:
UMatData* allocate(PyObject* o, int dims, const int* sizes, int type, size_t* step) const UMatData* allocate(PyObject* o, int dims, const int* sizes, int type, size_t* step) const
{ {
UMatData* u = new UMatData(this); UMatData* u = new UMatData(this);
u->refcount = 1;
u->data = u->origdata = (uchar*)PyArray_DATA((PyArrayObject*) o); u->data = u->origdata = (uchar*)PyArray_DATA((PyArrayObject*) o);
npy_intp* _strides = PyArray_STRIDES((PyArrayObject*) o); npy_intp* _strides = PyArray_STRIDES((PyArrayObject*) o);
for( int i = 0; i < dims - 1; i++ ) for( int i = 0; i < dims - 1; i++ )
...@@ -416,6 +415,7 @@ static bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo info) ...@@ -416,6 +415,7 @@ static bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo info)
m = Mat(ndims, size, type, PyArray_DATA(oarr), step); m = Mat(ndims, size, type, PyArray_DATA(oarr), step);
m.u = g_numpyAllocator.allocate(o, ndims, size, type, step); m.u = g_numpyAllocator.allocate(o, ndims, size, type, step);
m.addref();
if( !needcopy ) if( !needcopy )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment