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

android: camera_metadata: Rename get() to getMetadata()

Browse Source 
Rename CameraMetadata::get() to CameraMetadata::getMetadata()
to avoid confusion with std::unique_ptr::get() when CameraMetadata
is used with a std::unique_ptr.

No functional changes intended in this patch.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
This commit is contained in:
Umang Jain
2021-10-19 17:18:02 +05:30
parent 274607478c
commit a31c8f02b9
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/android/camera_metadata.cpp
View File

@@ -33,7 +33,7 @@ CameraMetadata::CameraMetadata(const camera_metadata_t *metadata)
}
CameraMetadata::CameraMetadata(const CameraMetadata &other)
: CameraMetadata(other.get())
: CameraMetadata(other.getMetadata())
{
}
@@ -51,7 +51,7 @@ CameraMetadata &CameraMetadata::operator=(const CameraMetadata &other)
if (metadata_)
free_camera_metadata(metadata_);
metadata_ = clone_camera_metadata(other.get());
metadata_ = clone_camera_metadata(other.getMetadata());
valid_ = metadata_ != nullptr;
return *this;
@@ -220,12 +220,12 @@ bool CameraMetadata::updateEntry(uint32_t tag, const void *data, size_t count,
return false;
}
camera_metadata_t *CameraMetadata::get()
camera_metadata_t *CameraMetadata::getMetadata()
{
return valid_ ? metadata_ : nullptr;
}
const camera_metadata_t *CameraMetadata::get() const
const camera_metadata_t *CameraMetadata::getMetadata() const
{
return valid_ ? metadata_ : nullptr;
}