mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 12:40:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19380 from alalek:python_fix_rect_conversion

Browse Source
This commit is contained in:
Alexander Alekhin 2021-01-24 22:19:28 +00:00
commit 8e5e1b62aa
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dnn/misc/python/test/test_dnn.py
View File

@ -177,7 +177,7 @@ class dnn_test(NewOpenCVTests):
cv.rectangle(frame, box, (0, 255, 0)) cv.rectangle(frame, box, (0, 255, 0))
cv.rectangle(frame, np.array(box), (0, 255, 0)) cv.rectangle(frame, np.array(box), (0, 255, 0))
cv.rectangle(frame, tuple(box), (0, 255, 0)) cv.rectangle(frame, tuple(box), (0, 255, 0))
cv.rectangle(frame, list(box), (0, 255, 0)) # FIXIT never properly work: cv.rectangle(frame, list(box), (0, 255, 0))
def test_classification_model(self): def test_classification_model(self):

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

@ -1552,8 +1552,13 @@ template<typename _Tp> struct pyopencvVecConverter
break; break;
} }
} }
if (i != n)
{
failmsg("Can't convert vector element for '%s', index=%d", info.name, i);
}
return i == n; return i == n;
} }
failmsg("Can't convert object to vector for '%s', unsupported type", info.name);
return false; return false;
} }
@ -1772,7 +1777,15 @@ bool pyopencv_to(PyObject* obj, Rect& r, const ArgInfo& info)
else else
{ {
std::vector<int> value(4); std::vector<int> value(4);
pyopencvVecConverter<int>::to(obj, value, info); if (!pyopencvVecConverter<int>::to(obj, value, info))
{
return false;
}
if (value.size() != 4)
{
failmsg("Expected 4 values for '%s', got %d", info.name, (int)value.size());
return false;
}
r = Rect(value[0], value[1], value[2], value[3]); r = Rect(value[0], value[1], value[2], value[3]);
return true; return true;
} }

5
modules/python/test/test_misc.py
View File

@ -98,13 +98,14 @@ class Bindings(NewOpenCVTests):
no_exception_msg = 'Overload resolution failed without any exception for: "{}"'.format(msg) no_exception_msg = 'Overload resolution failed without any exception for: "{}"'.format(msg)
wrong_exception_msg = 'Overload resolution failed with wrong exception type for: "{}"'.format(msg) wrong_exception_msg = 'Overload resolution failed with wrong exception type for: "{}"'.format(msg)
with self.assertRaises((cv.error, Exception), msg=no_exception_msg) as cm: with self.assertRaises((cv.error, Exception), msg=no_exception_msg) as cm:
cv.utils.testOverloadResolution(*args, **kwargs) res = cv.utils.testOverloadResolution(*args, **kwargs)
self.fail("Unexpected result for {}: '{}'".format(msg, res))
self.assertEqual(type(cm.exception), cv.error, wrong_exception_msg) self.assertEqual(type(cm.exception), cv.error, wrong_exception_msg)
test_overload_resolution('wrong second arg type (keyword arg)', 5, point=(1, 2, 3)) test_overload_resolution('wrong second arg type (keyword arg)', 5, point=(1, 2, 3))
test_overload_resolution('wrong second arg type', 5, 2) test_overload_resolution('wrong second arg type', 5, 2)
test_overload_resolution('wrong first arg', 3.4, (12, 21)) test_overload_resolution('wrong first arg', 3.4, (12, 21))
# FIXIT: test_overload_resolution('wrong first arg, no second arg', 4.5) test_overload_resolution('wrong first arg, no second arg', 4.5)
test_overload_resolution('wrong args number for first overload', 3, (12, 21), 123) test_overload_resolution('wrong args number for first overload', 3, (12, 21), 123)
test_overload_resolution('wrong args number for second overload', (3, 12, 12, 1), (12, 21)) test_overload_resolution('wrong args number for second overload', (3, 12, 12, 1), (12, 21))
# One of the common problems # One of the common problems