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>
This commit is contained in:
Kieran Bingham
2021-11-23 17:23:07 +00:00
parent b426b778c6
commit 0382fcb22b
17 changed files with 34 additions and 66 deletions
+2 -4
View File
@@ -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__ */
+2 -4
View File
@@ -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__ */
+2 -4
View File
@@ -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__ */
+2 -4
View File
@@ -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__ */
+2 -4
View File
@@ -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__ */