PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: controls: Use a const ControlValidator

Browse Source 
The ControlValidator passed to a ControlList constructor
is used, but not modified.

Make it const.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham
2021-08-10 16:52:15 +01:00
parent 0eea207b04
commit 3d297f7ac8
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/libcamera/controls.h
View File

@@ -353,8 +353,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;
@@ -412,7 +412,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_;

6
src/libcamera/controls.cpp
View File

@@ -821,7 +821,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)
{
}
@@ -831,7 +832,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)
{
}