From 113cfb1e0821d638b66b3fb8d85c5025b2a089c5 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 26 Oct 2019 20:37:09 +0300 Subject: libcamera: controls: Make ControList constructor public MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to construct empty ControlList objects to serialization. Make the constructor public. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- include/libcamera/controls.h | 1 + src/libcamera/controls.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index a0379d52..d692e088 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -189,6 +189,7 @@ private: using ControlListMap = std::unordered_map; public: + ControlList(); ControlList(const ControlIdMap &idmap, ControlValidator *validator = nullptr); ControlList(const ControlInfoMap &info, ControlValidator *validator = nullptr); diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 50f37c6b..9c6474ad 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -590,6 +590,17 @@ void ControlInfoMap::generateIdmap() * controls. */ +/** + * \brief Construct a ControlList not associated with any object + * + * This constructor is meant to support ControlList serialization and shall not + * be used directly by application. + */ +ControlList::ControlList() + : validator_(nullptr), idmap_(nullptr) +{ +} + /** * \brief Construct a ControlList with an optional control validator * \param[in] idmap The ControlId map for the control list target object -- cgit v1.2.1