From a6b1ff2e6caa632fe041e3eae569acb861e3353b Mon Sep 17 00:00:00 2001 From: David Plowman Date: Thu, 8 Dec 2022 13:44:14 +0000 Subject: py: Support controls that use an array of Rectangles The Python bindings will now accept, or return, a list or tuple of libcamera.Rectangle objects for such controls. This had previously been omitted, but now we have, for example, the AfWindows control which requires this feature. Signed-off-by: David Plowman Reviewed-by: Naushir Patuck Reviewed-by: Tomi Valkeinen Signed-off-by: Kieran Bingham --- src/py/libcamera/py_helpers.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp index f685e606..79891ab6 100644 --- a/src/py/libcamera/py_helpers.cpp +++ b/src/py/libcamera/py_helpers.cpp @@ -46,10 +46,8 @@ py::object controlValueToPy(const ControlValue &cv) return valueOrTuple(cv); case ControlTypeString: return py::cast(cv.get()); - case ControlTypeRectangle: { - const Rectangle *v = reinterpret_cast(cv.data().data()); - return py::cast(v); - } + case ControlTypeRectangle: + return valueOrTuple(cv); case ControlTypeSize: { const Size *v = reinterpret_cast(cv.data().data()); return py::cast(v); @@ -88,7 +86,7 @@ ControlValue pyToControlValue(const py::object &ob, ControlType type) case ControlTypeString: return ControlValue(ob.cast()); case ControlTypeRectangle: - return ControlValue(ob.cast()); + return controlValueMaybeArray(ob); case ControlTypeSize: return ControlValue(ob.cast()); case ControlTypeNone: -- cgit v1.2.1