From a31c8f02b9965ebe5b7d4347e4316172e4b7e8d0 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Tue, 19 Oct 2021 17:18:02 +0530 Subject: android: camera_metadata: Rename get() to getMetadata() 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 Reviewed-by: Jacopo Mondi Signed-off-by: Umang Jain --- src/android/camera_metadata.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/android/camera_metadata.cpp') diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index 075b6a22..b3e515d2 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -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; } -- cgit v1.2.1