potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-28 23:03:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2026-04-07 12:02:55 +03:00
parent 2ec6a6bb65 9eb887d02d
commit 1a6f669763
28 changed files with 2027 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/src2/cv2_convert.cpp
+2 -2
View File
@@ -209,9 +209,9 @@ bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo& info)
if (ismultichannel)
{
int channels = ndims >= 1 ? (int)_sizes[ndims - 1] : 1;
if (channels > CV_CN_MAX)
if (channels < 1 || channels > CV_CN_MAX)
{
failmsg("%s unable to wrap channels, too high (%d > CV_CN_MAX=%d)", info.name, (int)channels, (int)CV_CN_MAX);
failmsg("%s unable to wrap channels, invalid count (%d, must be in [1, %d])", info.name, (int)channels, (int)CV_CN_MAX);
return false;
}
ndims--;
modules/python/test/test_mat.py
+17
View File
@@ -89,6 +89,23 @@ try:
print(res1)
def test_mat_wrap_channels_zero(self):
# Passing a 0-channel array must raise cv.error, not segfault.
data = np.zeros((100, 100, 0), dtype=np.uint8)
with self.assertRaises(cv.error):
cv.resize(data, (200, 200)) # channels=0 -> invalid, must not segfault
with self.assertRaises(cv.error):
mat_data = cv.Mat(data, wrap_channels=True) # unable to wrap channels, invalid count (0)
cv.utils.dumpInputArray(mat_data)
# Verify that channels=1 (lower bound) still works correctly
data_1ch = np.zeros((100, 100, 1), dtype=np.uint8)
mat_1ch = cv.Mat(data_1ch, wrap_channels=True)
res = cv.utils.dumpInputArray(mat_1ch)
self.assertIn("CV_8UC1", res)
def test_ufuncs(self):
data = np.arange(10)
mat_data = cv.Mat(data)