Message ID | 20201020052905.89267-5-hiroh@chromium.org |
---|---|
State | Accepted |
Headers | show |
Series |
|
Related | show |
Hi Hiro-san, Thank you for the patch. On Tue, Oct 20, 2020 at 02:29:01PM +0900, Hirokazu Honda wrote: > The end semicolons with LOG_DECLARE_CATEGORY and > LOG_DEFINE_CATEGORY are unnecessary. > > Signed-off-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > src/android/camera_device.cpp | 2 +- > src/android/camera_hal_manager.cpp | 2 +- > src/android/camera_metadata.cpp | 2 +- > src/android/camera_stream.cpp | 2 +- > src/android/camera_worker.cpp | 2 +- > src/android/jpeg/encoder.h | 2 +- > src/android/jpeg/encoder_libjpeg.cpp | 2 +- > src/android/jpeg/post_processor_jpeg.cpp | 2 +- > 8 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp > index d706cf4..e9404c2 100644 > --- a/src/android/camera_device.cpp > +++ b/src/android/camera_device.cpp > @@ -129,7 +129,7 @@ const std::map<int, const Camera3Format> camera3FormatsMap = { > > } /* namespace */ > > -LOG_DECLARE_CATEGORY(HAL); > +LOG_DECLARE_CATEGORY(HAL) > > MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer, > int flags) > diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp > index 2a33f9b..189eda2 100644 > --- a/src/android/camera_hal_manager.cpp > +++ b/src/android/camera_hal_manager.cpp > @@ -16,7 +16,7 @@ > > using namespace libcamera; > > -LOG_DECLARE_CATEGORY(HAL); > +LOG_DECLARE_CATEGORY(HAL) > > /* > * \class CameraHalManager > diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp > index f0da9ea..edea48f 100644 > --- a/src/android/camera_metadata.cpp > +++ b/src/android/camera_metadata.cpp > @@ -11,7 +11,7 @@ > > using namespace libcamera; > > -LOG_DEFINE_CATEGORY(CameraMetadata); > +LOG_DEFINE_CATEGORY(CameraMetadata) > > CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity) > { > diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp > index 1b8afa8..eae451e 100644 > --- a/src/android/camera_stream.cpp > +++ b/src/android/camera_stream.cpp > @@ -15,7 +15,7 @@ > > using namespace libcamera; > > -LOG_DECLARE_CATEGORY(HAL); > +LOG_DECLARE_CATEGORY(HAL) > > /* > * \class CameraStream > diff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp > index ff09b75..df43646 100644 > --- a/src/android/camera_worker.cpp > +++ b/src/android/camera_worker.cpp > @@ -15,7 +15,7 @@ > > using namespace libcamera; > > -LOG_DECLARE_CATEGORY(HAL); > +LOG_DECLARE_CATEGORY(HAL) > > /* > * \class CaptureRequest > diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h > index 4483153..4e85996 100644 > --- a/src/android/jpeg/encoder.h > +++ b/src/android/jpeg/encoder.h > @@ -14,7 +14,7 @@ > class Encoder > { > public: > - virtual ~Encoder() {}; > + virtual ~Encoder() {} > > virtual int configure(const libcamera::StreamConfiguration &cfg) = 0; > virtual int encode(const libcamera::FrameBuffer *source, > diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp > index 8995ba5..f11e004 100644 > --- a/src/android/jpeg/encoder_libjpeg.cpp > +++ b/src/android/jpeg/encoder_libjpeg.cpp > @@ -25,7 +25,7 @@ > > using namespace libcamera; > > -LOG_DECLARE_CATEGORY(JPEG); > +LOG_DECLARE_CATEGORY(JPEG) > > namespace { > > diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp > index 753c28e..9d452b7 100644 > --- a/src/android/jpeg/post_processor_jpeg.cpp > +++ b/src/android/jpeg/post_processor_jpeg.cpp > @@ -18,7 +18,7 @@ > > using namespace libcamera; > > -LOG_DEFINE_CATEGORY(JPEG); > +LOG_DEFINE_CATEGORY(JPEG) > > PostProcessorJpeg::PostProcessorJpeg(CameraDevice *device) > : cameraDevice_(device)
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index d706cf4..e9404c2 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -129,7 +129,7 @@ const std::map<int, const Camera3Format> camera3FormatsMap = { } /* namespace */ -LOG_DECLARE_CATEGORY(HAL); +LOG_DECLARE_CATEGORY(HAL) MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer, int flags) diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index 2a33f9b..189eda2 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -16,7 +16,7 @@ using namespace libcamera; -LOG_DECLARE_CATEGORY(HAL); +LOG_DECLARE_CATEGORY(HAL) /* * \class CameraHalManager diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index f0da9ea..edea48f 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -11,7 +11,7 @@ using namespace libcamera; -LOG_DEFINE_CATEGORY(CameraMetadata); +LOG_DEFINE_CATEGORY(CameraMetadata) CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity) { diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 1b8afa8..eae451e 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -15,7 +15,7 @@ using namespace libcamera; -LOG_DECLARE_CATEGORY(HAL); +LOG_DECLARE_CATEGORY(HAL) /* * \class CameraStream diff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp index ff09b75..df43646 100644 --- a/src/android/camera_worker.cpp +++ b/src/android/camera_worker.cpp @@ -15,7 +15,7 @@ using namespace libcamera; -LOG_DECLARE_CATEGORY(HAL); +LOG_DECLARE_CATEGORY(HAL) /* * \class CaptureRequest diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h index 4483153..4e85996 100644 --- a/src/android/jpeg/encoder.h +++ b/src/android/jpeg/encoder.h @@ -14,7 +14,7 @@ class Encoder { public: - virtual ~Encoder() {}; + virtual ~Encoder() {} virtual int configure(const libcamera::StreamConfiguration &cfg) = 0; virtual int encode(const libcamera::FrameBuffer *source, diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index 8995ba5..f11e004 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -25,7 +25,7 @@ using namespace libcamera; -LOG_DECLARE_CATEGORY(JPEG); +LOG_DECLARE_CATEGORY(JPEG) namespace { diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp index 753c28e..9d452b7 100644 --- a/src/android/jpeg/post_processor_jpeg.cpp +++ b/src/android/jpeg/post_processor_jpeg.cpp @@ -18,7 +18,7 @@ using namespace libcamera; -LOG_DEFINE_CATEGORY(JPEG); +LOG_DEFINE_CATEGORY(JPEG) PostProcessorJpeg::PostProcessorJpeg(CameraDevice *device) : cameraDevice_(device)
The end semicolons with LOG_DECLARE_CATEGORY and LOG_DEFINE_CATEGORY are unnecessary. Signed-off-by: Hirokazu Honda <hiroh@chromium.org> --- src/android/camera_device.cpp | 2 +- src/android/camera_hal_manager.cpp | 2 +- src/android/camera_metadata.cpp | 2 +- src/android/camera_stream.cpp | 2 +- src/android/camera_worker.cpp | 2 +- src/android/jpeg/encoder.h | 2 +- src/android/jpeg/encoder_libjpeg.cpp | 2 +- src/android/jpeg/post_processor_jpeg.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)