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

libcamera: controls: Name all ControlInfoMap instance variables infoMap

Browse Source 
To prepare for the rename of ControlRange to ControlInfo, rename all the
ControlInfoMap instance variables currently named info to infoMap. This
will help avoiding namespace clashes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart
2020-03-20 16:47:45 +02:00
parent cf66c4406b
commit 73b7ba9da5
7 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/controls.cpp
+3 -3
View File
@@ -706,11 +706,11 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator)
/**
* \brief Construct a ControlList with the idmap of a control info map
* \param[in] info The ControlInfoMap for the control list target object
* \param[in] infoMap The ControlInfoMap for the control list target object
* \param[in] validator The validator (may be null)
*/
ControlList::ControlList(const ControlInfoMap &info, ControlValidator *validator)
: validator_(validator), idmap_(&info.idmap()), infoMap_(&info)
ControlList::ControlList(const ControlInfoMap &infoMap, ControlValidator *validator)
: validator_(validator), idmap_(&infoMap.idmap()), infoMap_(&infoMap)
{
}