generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: ndarray to Mat conversion with NPY_RELAXED_STRIDES set

Browse Source 
Add logic to avoid nonsense strides when dimension size is 1 and
NumPy is built with NPY_RELAXED_STRIDES from tripping OpenCV.
This commit is contained in:
Jaime Fernandez 2015-06-11 09:41:12 -07:00
parent 424c2bddb3
commit c613ee2da4
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/python/src2/cv2.cpp
View File

@ -315,8 +315,9 @@ static bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo info)
// a) multi-dimensional (ndims > 2) arrays, as well as simpler 1- and 2-dimensional cases // a) multi-dimensional (ndims > 2) arrays, as well as simpler 1- and 2-dimensional cases
// b) transposed arrays, where _strides[] elements go in non-descending order // b) transposed arrays, where _strides[] elements go in non-descending order
// c) flipped arrays, where some of _strides[] elements are negative // c) flipped arrays, where some of _strides[] elements are negative
if( (i == ndims-1 && (size_t)_strides[i] != elemsize) || // the _sizes[i] > 1 is needed to avoid spurious copies when NPY_RELAXED_STRIDES is set
(i < ndims-1 && _strides[i] < _strides[i+1]) ) if( (i == ndims-1 && _sizes[i] > 1 && (size_t)_strides[i] != elemsize) ||
(i < ndims-1 && _sizes[i] > 1 && _strides[i] < _strides[i+1]) )
needcopy = true; needcopy = true;
} }
@ -343,10 +344,21 @@ static bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo info)
_strides = PyArray_STRIDES(oarr); _strides = PyArray_STRIDES(oarr);
} }
for(int i = 0; i < ndims; i++) // Normalize strides in case NPY_RELAXED_STRIDES is set
size_t default_step = elemsize;
for ( int i = ndims - 1; i >= 0; --i )
{ {
size[i] = (int)_sizes[i]; size[i] = (int)_sizes[i];
step[i] = (size_t)_strides[i]; if ( size[i] > 1 )
{
step[i] = (size_t)_strides[i];
default_step = step[i] * size[i];
}
else
{
step[i] = default_step;
default_step *= size[i];
}
} }
// handle degenerate case // handle degenerate case