From a1772d44e8655484f47baefa92c8d6ed15603fee Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 12 Oct 2019 02:10:28 +0300 Subject: libcamera: controls: Default ControlList validator argument to nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ControlList constructor takes a validator pointer that can be null. Set its default value to nullptr to simplify code in users of ControlList. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Tested-by: Niklas Söderlund Reviewed-by: Niklas Söderlund --- include/libcamera/controls.h | 2 +- src/ipa/rkisp1/rkisp1.cpp | 2 +- src/libcamera/request.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 342251c2..12a13aac 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -126,7 +126,7 @@ private: using ControlListMap = std::unordered_map; public: - ControlList(ControlValidator *validator); + ControlList(ControlValidator *validator = nullptr); using iterator = ControlListMap::iterator; using const_iterator = ControlListMap::const_iterator; diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 02419e25..80138f19 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -220,7 +220,7 @@ void IPARkISP1::setControls(unsigned int frame) void IPARkISP1::metadataReady(unsigned int frame, unsigned int aeState) { - ControlList ctrls(nullptr); + ControlList ctrls; if (aeState) ctrls.set(controls::AeLocked, aeState == 2); diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 23d3ab6f..e800f144 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -69,7 +69,7 @@ Request::Request(Camera *camera, uint64_t cookie) /** * \todo: Add a validator for metadata controls. */ - metadata_ = new ControlList(nullptr); + metadata_ = new ControlList(); } Request::~Request() -- cgit v1.2.1