summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-01-12 01:29:50 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-06 18:10:18 +0200
commit9c6d32fcf3198cc83cff6af3c9393e94c88bf9b9 (patch)
tree12c54865325dcf8a73c84f2abe1c190068d7ffd0
parentdd0923960040a0a8832b581c7a7e8d3a14b5061f (diff)
libcamera: controls: Don't convert 32-bit and 64-bit implicitly
The ControlValue::get<T>() method verifies that the T type corresponds to the ControlValue type. It however accepts int32_t as a return type for 64-bit integer controls, and int64_t as a return type for 32-bit integer controls. There's no reason to do so anymore, make the type check stricter. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--src/libcamera/controls.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp
index 613e6d76..f632d60a 100644
--- a/src/libcamera/controls.cpp
+++ b/src/libcamera/controls.cpp
@@ -187,7 +187,7 @@ const bool &ControlValue::get<bool>() const
template<>
const int32_t &ControlValue::get<int32_t>() const
{
- ASSERT(type_ == ControlTypeInteger32 || type_ == ControlTypeInteger64);
+ ASSERT(type_ == ControlTypeInteger32);
return integer32_;
}
@@ -195,7 +195,7 @@ const int32_t &ControlValue::get<int32_t>() const
template<>
const int64_t &ControlValue::get<int64_t>() const
{
- ASSERT(type_ == ControlTypeInteger32 || type_ == ControlTypeInteger64);
+ ASSERT(type_ == ControlTypeInteger64);
return integer64_;
}