NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: controls: Use std::optional to handle invalid control values

Browse source 
Previously, ControlList::get<T>() would use default constructed objects to
indicate that a ControlList does not have the requested Control. This has
several disadvantages: 1) It requires types to be default constructible,
2) it does not differentiate between a default constructed object and an
object that happens to have the same state as a default constructed object.

std::optional<T> additionally stores the information if the object is valid
or not, and therefore is more expressive than a default constructed object.

Signed-off-by: Christian Rauch <Rauch.Christian@gmx.de>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Christian Rauch 2022-07-05 10:55:48 +01:00 • committed by Laurent Pinchart
parent ef77e26379
commit 1c4d480185
10 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/android/camera_hal_manager.cpp
View file

@ -232,7 +232,7 @@ int32_t CameraHalManager::cameraLocation(const Camera *cam)
if (!properties.contains(properties::Location))
return -1;
return properties.get(properties::Location);
return *properties.get(properties::Location);
}
CameraDevice *CameraHalManager::cameraDeviceFromHalId(unsigned int id)