diff options
| author | David Plowman <david.plowman@raspberrypi.com> | 2022-12-08 13:44:14 +0000 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2022-12-09 16:02:40 +0000 |
| commit | a6b1ff2e6caa632fe041e3eae569acb861e3353b (patch) | |
| tree | 9dd1c66496f0ead3f81c244e22583c38eddd4a6a | |
| parent | 1bd74b91be2da535918d509ff32c1cb2b76dcec3 (diff) | |
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 <david.plowman@raspberrypi.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
| -rw-r--r-- | src/py/libcamera/py_helpers.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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<float>(cv); case ControlTypeString: return py::cast(cv.get<std::string>()); - case ControlTypeRectangle: { - const Rectangle *v = reinterpret_cast<const Rectangle *>(cv.data().data()); - return py::cast(v); - } + case ControlTypeRectangle: + return valueOrTuple<Rectangle>(cv); case ControlTypeSize: { const Size *v = reinterpret_cast<const Size *>(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<std::string>()); case ControlTypeRectangle: - return ControlValue(ob.cast<Rectangle>()); + return controlValueMaybeArray<Rectangle>(ob); case ControlTypeSize: return ControlValue(ob.cast<Size>()); case ControlTypeNone: |