summaryrefslogtreecommitdiff
path: root/src/android/camera_metadata.cpp
diff options
context:
space:
mode:
authorUmang Jain <umang.jain@ideasonboard.com>2021-10-19 17:18:02 +0530
committerUmang Jain <umang.jain@ideasonboard.com>2021-10-19 19:17:31 +0530
commita31c8f02b9965ebe5b7d4347e4316172e4b7e8d0 (patch)
tree52d828dd0c7ec11b7280f6c35c4884b80ef90baa /src/android/camera_metadata.cpp
parent274607478c712e085633f4d24dba1165154fa5a8 (diff)
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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Diffstat (limited to 'src/android/camera_metadata.cpp')
-rw-r--r--src/android/camera_metadata.cpp8
1 files changed, 4 insertions, 4 deletions
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;
}