| Message ID | 20210121165305.367801-5-jacopo@jmondi.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Jacopo, Thank you for the patch. On Thu, Jan 21, 2021 at 05:53:02PM +0100, Jacopo Mondi wrote: > Add a default constructor that initializes a non valid CameraMetadata > to allow embedding instances of the class in other types. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > 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 8e36e758d231..6f1bcdbe274a 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 720b760d44da..d653e2f0f502 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);
Hi Jacopo, On Thu, Jan 21, 2021 at 05:53:02PM +0100, Jacopo Mondi wrote: > Add a default constructor that initializes a non valid CameraMetadata > to allow embedding instances of the class in other types. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> > --- > 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 8e36e758d231..6f1bcdbe274a 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 720b760d44da..d653e2f0f502 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); > -- > 2.29.2 >
diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index 8e36e758d231..6f1bcdbe274a 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 720b760d44da..d653e2f0f502 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);
Add a default constructor that initializes a non valid CameraMetadata to allow embedding instances of the class in other types. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> --- src/android/camera_metadata.cpp | 5 +++++ src/android/camera_metadata.h | 1 + 2 files changed, 6 insertions(+)