diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-11-23 17:23:07 +0000 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-11-24 12:18:29 +0000 |
| commit | 0382fcb22b40e9f8b94b9ea3fc41716b011d5162 (patch) | |
| tree | f0d9ddab6fabc98c9be7de59d17302c2164cb9eb /src/android/jpeg | |
| parent | b426b778c680a266d3c67e866fa07d81011bd16d (diff) | |
android: Convert to pragma once
Remove the verbose #ifndef/#define/#endif pattern for maintaining
header idempotency, and replace it with a simple #pragma once.
This simplifies the headers, and prevents redundant changes when
header files get moved.
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Diffstat (limited to 'src/android/jpeg')
| -rw-r--r-- | src/android/jpeg/encoder.h | 6 | ||||
| -rw-r--r-- | src/android/jpeg/encoder_libjpeg.h | 6 | ||||
| -rw-r--r-- | src/android/jpeg/exif.h | 6 | ||||
| -rw-r--r-- | src/android/jpeg/post_processor_jpeg.h | 6 | ||||
| -rw-r--r-- | src/android/jpeg/thumbnailer.h | 6 |
5 files changed, 10 insertions, 20 deletions
diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h index a28522f4..b974d367 100644 --- a/src/android/jpeg/encoder.h +++ b/src/android/jpeg/encoder.h @@ -4,8 +4,8 @@ * * encoder.h - Image encoding interface */ -#ifndef __ANDROID_JPEG_ENCODER_H__ -#define __ANDROID_JPEG_ENCODER_H__ + +#pragma once #include <libcamera/base/span.h> @@ -23,5 +23,3 @@ public: libcamera::Span<const uint8_t> exifData, unsigned int quality) = 0; }; - -#endif /* __ANDROID_JPEG_ENCODER_H__ */ diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h index 45ffbd7f..1b3ac067 100644 --- a/src/android/jpeg/encoder_libjpeg.h +++ b/src/android/jpeg/encoder_libjpeg.h @@ -4,8 +4,8 @@ * * encoder_libjpeg.h - JPEG encoding using libjpeg */ -#ifndef __ANDROID_JPEG_ENCODER_LIBJPEG_H__ -#define __ANDROID_JPEG_ENCODER_LIBJPEG_H__ + +#pragma once #include "encoder.h" @@ -43,5 +43,3 @@ private: bool nv_; bool nvSwap_; }; - -#endif /* __ANDROID_JPEG_ENCODER_LIBJPEG_H__ */ diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h index 23b0e097..2ff8fb78 100644 --- a/src/android/jpeg/exif.h +++ b/src/android/jpeg/exif.h @@ -4,8 +4,8 @@ * * exif.h - EXIF tag creator using libexif */ -#ifndef __ANDROID_JPEG_EXIF_H__ -#define __ANDROID_JPEG_EXIF_H__ + +#pragma once #include <chrono> #include <string> @@ -107,5 +107,3 @@ private: unsigned char *exifData_; unsigned int size_; }; - -#endif /* __ANDROID_JPEG_EXIF_H__ */ diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h index 43fcbe60..98309b01 100644 --- a/src/android/jpeg/post_processor_jpeg.h +++ b/src/android/jpeg/post_processor_jpeg.h @@ -4,8 +4,8 @@ * * post_processor_jpeg.h - JPEG Post Processor */ -#ifndef __ANDROID_POST_PROCESSOR_JPEG_H__ -#define __ANDROID_POST_PROCESSOR_JPEG_H__ + +#pragma once #include "../post_processor.h" #include "encoder_libjpeg.h" @@ -36,5 +36,3 @@ private: EncoderLibJpeg thumbnailEncoder_; Thumbnailer thumbnailer_; }; - -#endif /* __ANDROID_POST_PROCESSOR_JPEG_H__ */ diff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h index 4d086c49..d933cf0e 100644 --- a/src/android/jpeg/thumbnailer.h +++ b/src/android/jpeg/thumbnailer.h @@ -4,8 +4,8 @@ * * thumbnailer.h - Simple image thumbnailer */ -#ifndef __ANDROID_JPEG_THUMBNAILER_H__ -#define __ANDROID_JPEG_THUMBNAILER_H__ + +#pragma once #include <libcamera/framebuffer.h> #include <libcamera/geometry.h> @@ -30,5 +30,3 @@ private: bool valid_; }; - -#endif /* __ANDROID_JPEG_THUMBNAILER_H__ */ |