Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-13 05:42:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29524 from abhishek-gola/onnx_coverage

Browse Source 
Fix: 0-D / empty-Mat Python binding
This commit is contained in:
Abhishek Gola
2026-07-28 22:14:50 +05:30
committed by GitHub
parent 36d8bc4a44 319a03a2c9
commit 62732ab966
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/python/src2/cv2_convert.cpp
View File

@@ -315,8 +315,23 @@ bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo& info)
template<>
PyObject* pyopencv_from(const cv::Mat& m)
{
if( !m.data )
if( m.empty() )
{
// empty() also catches a live buffer with a zero-length dim: return an empty array, not None.
if( m.dims >= 1 )
{
int cn = m.channels();
int typenum = cvDepthToNumpyType(m.depth());
int dims = m.dims;
cv::AutoBuffer<npy_intp> _sizes(dims + 1);
for( int i = 0; i < dims; i++ )
_sizes[i] = (npy_intp)m.size[i];
if( cn > 1 )
_sizes[dims++] = cn;
return PyArray_SimpleNew(dims, _sizes.data(), typenum);
}
Py_RETURN_NONE;
}
// 0D (scalar) Mat: return a true 0D numpy array.
if( m.dims == 0 )
{