| Message ID | 20210515183826.21003-4-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Delegated to: | Laurent Pinchart |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, On Sun, May 16, 2021 at 3:38 AM Laurent Pinchart < laurent.pinchart@ideasonboard.com> wrote: > The resize() function and the addEntry() override that takes a void > pointer are not meant to be called by the user of the CameraMetadata > class. Make them private. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Reviewed-by: Hirokazu Honda <hiroh@chromium.org> > --- > src/android/camera_metadata.h | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h > index f95c34581fe4..d7c8d9df689f 100644 > --- a/src/android/camera_metadata.h > +++ b/src/android/camera_metadata.h > @@ -24,7 +24,6 @@ public: > CameraMetadata &operator=(const CameraMetadata &other); > > bool isValid() const { return valid_; } > - bool resize(size_t count, size_t size); > bool getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) > const; > > template<typename T, > @@ -72,14 +71,16 @@ public: > return updateEntry(tag, data.data(), data.size()); > } > > - bool addEntry(uint32_t tag, const void *data, size_t count, > - size_t elementSize); > bool updateEntry(uint32_t tag, const void *data, size_t count); > > camera_metadata_t *get(); > const camera_metadata_t *get() const; > > private: > + bool resize(size_t count, size_t size); > + bool addEntry(uint32_t tag, const void *data, size_t count, > + size_t elementSize); > + > camera_metadata_t *metadata_; > bool valid_; > }; > -- > Regards, > > Laurent Pinchart > >
On 15/05/2021 19:38, Laurent Pinchart wrote: > The resize() function and the addEntry() override that takes a void > pointer are not meant to be called by the user of the CameraMetadata > class. Make them private. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > src/android/camera_metadata.h | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h > index f95c34581fe4..d7c8d9df689f 100644 > --- a/src/android/camera_metadata.h > +++ b/src/android/camera_metadata.h > @@ -24,7 +24,6 @@ public: > CameraMetadata &operator=(const CameraMetadata &other); > > bool isValid() const { return valid_; } > - bool resize(size_t count, size_t size); > bool getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) const; > > template<typename T, > @@ -72,14 +71,16 @@ public: > return updateEntry(tag, data.data(), data.size()); > } > > - bool addEntry(uint32_t tag, const void *data, size_t count, > - size_t elementSize); > bool updateEntry(uint32_t tag, const void *data, size_t count); > > camera_metadata_t *get(); > const camera_metadata_t *get() const; > > private: > + bool resize(size_t count, size_t size); > + bool addEntry(uint32_t tag, const void *data, size_t count, > + size_t elementSize); > + > camera_metadata_t *metadata_; > bool valid_; > }; >
diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h index f95c34581fe4..d7c8d9df689f 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -24,7 +24,6 @@ public: CameraMetadata &operator=(const CameraMetadata &other); bool isValid() const { return valid_; } - bool resize(size_t count, size_t size); bool getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) const; template<typename T, @@ -72,14 +71,16 @@ public: return updateEntry(tag, data.data(), data.size()); } - bool addEntry(uint32_t tag, const void *data, size_t count, - size_t elementSize); bool updateEntry(uint32_t tag, const void *data, size_t count); camera_metadata_t *get(); const camera_metadata_t *get() const; private: + bool resize(size_t count, size_t size); + bool addEntry(uint32_t tag, const void *data, size_t count, + size_t elementSize); + camera_metadata_t *metadata_; bool valid_; };
The resize() function and the addEntry() override that takes a void pointer are not meant to be called by the user of the CameraMetadata class. Make them private. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/android/camera_metadata.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)