From patchwork Tue Aug 10 16:11:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 13291 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 0C6E5C3240 for ; Tue, 10 Aug 2021 16:11:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 25C296884F; Tue, 10 Aug 2021 18:11:40 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fRrccUhT"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6A64E68822 for ; Tue, 10 Aug 2021 18:11:37 +0200 (CEST) Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EEC5D4A3; Tue, 10 Aug 2021 18:11:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1628611897; bh=pzdpimxjBSbOq/vVvZim7cHr4+lv4OH0LEiPERJ4PaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fRrccUhTu6vSqKr94xKimv7mAT/PPIlYs28/wbjNvAGBf+ixmwCNAgN9V9sv2Xnhf nD5o8AzrFZvw/rSEDG6rkB1BLatHC6EU1oasIt8TclE+a87qZZ2jBuuMUgVg6RyYhS 6WlEbTJXPRo2cKsIeExtba4S+62SwKwXC2roC4Mw= From: Kieran Bingham To: libcamera devel Date: Tue, 10 Aug 2021 17:11:32 +0100 Message-Id: <20210810161134.2243796-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210810161134.2243796-1-kieran.bingham@ideasonboard.com> References: <20210810161134.2243796-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] libcamera: controls: Use a const ControlValidator X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The ControlValidator passed to a ControlList constructor is used, but not modified. Make it const. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- include/libcamera/controls.h | 6 +++--- src/libcamera/controls.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index de733bd868a6..2c38b23ad443 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -354,8 +354,8 @@ private: public: ControlList(); - ControlList(const ControlIdMap &idmap, ControlValidator *validator = nullptr); - ControlList(const ControlInfoMap &infoMap, ControlValidator *validator = nullptr); + ControlList(const ControlIdMap &idmap, const ControlValidator *validator = nullptr); + ControlList(const ControlInfoMap &infoMap, const ControlValidator *validator = nullptr); using iterator = ControlListMap::iterator; using const_iterator = ControlListMap::const_iterator; @@ -413,7 +413,7 @@ private: const ControlValue *find(unsigned int id) const; ControlValue *find(unsigned int id); - ControlValidator *validator_; + const ControlValidator *validator_; const ControlIdMap *idmap_; const ControlInfoMap *infoMap_; diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 64fd5c296226..a5943700ea89 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -836,7 +836,8 @@ ControlList::ControlList() * controls is provided by controls::controls and can be used as the \a idmap * argument. */ -ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator) +ControlList::ControlList(const ControlIdMap &idmap, + const ControlValidator *validator) : validator_(validator), idmap_(&idmap), infoMap_(nullptr) { } @@ -846,7 +847,8 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator) * \param[in] infoMap The ControlInfoMap for the control list target object * \param[in] validator The validator (may be null) */ -ControlList::ControlList(const ControlInfoMap &infoMap, ControlValidator *validator) +ControlList::ControlList(const ControlInfoMap &infoMap, + const ControlValidator *validator) : validator_(validator), idmap_(&infoMap.idmap()), infoMap_(&infoMap) { }