From b9369a0e6079df987a70fd9edfa294d098147d93 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Thu, 21 Jan 2021 12:50:04 +0100 Subject: android: camera_metadata: Add defaul constructor Add a default constructor that initializes a non valid CameraMetadata to allow embedding instances of the class in other types. Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart Signed-off-by: Jacopo Mondi --- src/android/camera_metadata.cpp | 5 +++++ src/android/camera_metadata.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index 8e36e758..6f1bcdbe 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -13,6 +13,11 @@ using namespace libcamera; LOG_DEFINE_CATEGORY(CameraMetadata) +CameraMetadata::CameraMetadata() + : metadata_(nullptr), valid_(false) +{ +} + CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity) { metadata_ = allocate_camera_metadata(entryCapacity, dataCapacity); diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h index 720b760d..d653e2f0 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -14,6 +14,7 @@ class CameraMetadata { public: + CameraMetadata(); CameraMetadata(size_t entryCapacity, size_t dataCapacity); CameraMetadata(const camera_metadata_t *metadata); CameraMetadata(const CameraMetadata &other); -- cgit v1.2.1