third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20646 from VadimLevin:dev/vlevin/fix-vector-conversion

Browse Source
This commit is contained in:
Alexander Alekhin 2021-09-02 09:30:56 +00:00
commit 7c23ec90a9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1778,7 +1778,7 @@ private:
const NPY_TYPES target_type = asNumpyType<UnderlyingArrayType>(); const NPY_TYPES target_type = asNumpyType<UnderlyingArrayType>();
const int cols = DType::channels; const int cols = DType::channels;
PyObject* array; PyObject* array = NULL;
if (cols == 1) if (cols == 1)
{ {
npy_intp dims = static_cast<npy_intp>(value.size()); npy_intp dims = static_cast<npy_intp>(value.size());
@ -1796,14 +1796,16 @@ private:
String shape; String shape;
if (cols > 1) if (cols > 1)
{ {
shape = cv::format("(%d x %d)", static_cast<int>(value.size()), cols); shape = format("(%d x %d)", static_cast<int>(value.size()), cols);
} }
else else
{ {
shape = cv::format("(%d)", static_cast<int>(value.size())); shape = format("(%d)", static_cast<int>(value.size()));
} }
CV_Error_(Error::StsError, ("Can't allocate NumPy array for vector with dtype=%d shape=%s", const String error_message = format("Can't allocate NumPy array for vector with dtype=%d and shape=%s",
static_cast<int>(target_type), static_cast<int>(value.size()), shape.c_str())); static_cast<int>(target_type), shape.c_str());
emit_failmsg(PyExc_MemoryError, error_message.c_str());
return array;
} }
// Fill the array // Fill the array
PyArrayObject* array_obj = reinterpret_cast<PyArrayObject*>(array); PyArrayObject* array_obj = reinterpret_cast<PyArrayObject*>(array);