From patchwork Tue Nov 23 22:40:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 14737 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E6E6BBF415 for ; Tue, 23 Nov 2021 22:40:33 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E303D6048E; Tue, 23 Nov 2021 23:40:29 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Ardpms/Q"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E92B660228 for ; Tue, 23 Nov 2021 23:40:21 +0100 (CET) Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A6BFAF95; Tue, 23 Nov 2021 23:40:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1637707221; bh=PfJPRRTvz3lFXnA9I2TlTN/N7fj1lAka5Kwf4Lbn2Ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ardpms/QzwDaEwPxKLBL6a4ClV1cT6hxhIJcABMK2Ov5sR5gVFO0cYakWOgctv9v+ r7LDBXZ8yg56xqu6/SRmvTxm8fO9k5sayHPCxW+AcinKOfelaP6TPOYSa4MI2F4Ht7 eTokKyGg7pFH35OcEvWf5vjwI4cPD1Q+LQMZhkEA= From: Kieran Bingham To: libcamera devel Date: Tue, 23 Nov 2021 22:40:06 +0000 Message-Id: <20211123224015.3619282-7-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211123224015.3619282-1-kieran.bingham@ideasonboard.com> References: <20211123224015.3619282-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 06/15] android: Convert to pragma once X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 --- src/android/camera_buffer.h | 5 ++--- src/android/camera_capabilities.h | 6 ++---- src/android/camera_device.h | 6 ++---- src/android/camera_hal_config.h | 5 ++--- src/android/camera_hal_manager.h | 6 ++---- src/android/camera_metadata.h | 6 ++---- src/android/camera_ops.h | 6 ++---- src/android/camera_request.h | 6 ++---- src/android/camera_stream.h | 6 ++---- src/android/camera_worker.h | 6 ++---- src/android/jpeg/encoder.h | 6 ++---- src/android/jpeg/encoder_libjpeg.h | 6 ++---- src/android/jpeg/exif.h | 6 ++---- src/android/jpeg/post_processor_jpeg.h | 6 ++---- src/android/jpeg/thumbnailer.h | 6 ++---- src/android/post_processor.h | 6 ++---- src/android/yuv/post_processor_yuv.h | 6 ++---- 17 files changed, 34 insertions(+), 66 deletions(-) diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index 226a8f5c153b..b4531c800fdb 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -4,8 +4,8 @@ * * camera_buffer.h - Frame buffer handling interface definition */ -#ifndef __ANDROID_CAMERA_BUFFER_H__ -#define __ANDROID_CAMERA_BUFFER_H__ + +#pragma once #include @@ -82,4 +82,3 @@ size_t CameraBuffer::jpegBufferSize(size_t maxJpegBufferSize) const \ { \ return _d()->jpegBufferSize(maxJpegBufferSize); \ } -#endif /* __ANDROID_CAMERA_BUFFER_H__ */ diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h index 2cf97ae80095..6f66f221d33f 100644 --- a/src/android/camera_capabilities.h +++ b/src/android/camera_capabilities.h @@ -4,8 +4,8 @@ * * camera_capabilities.h - Camera static properties manager */ -#ifndef __ANDROID_CAMERA_CAPABILITIES_H__ -#define __ANDROID_CAMERA_CAPABILITIES_H__ + +#pragma once #include #include @@ -84,5 +84,3 @@ private: std::set availableRequestKeys_; std::set availableResultKeys_; }; - -#endif /* __ANDROID_CAMERA_CAPABILITIES_H__ */ diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 2a414020f1ad..51fe7da2cb47 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -4,8 +4,8 @@ * * camera_device.h - libcamera Android Camera Device */ -#ifndef __ANDROID_CAMERA_DEVICE_H__ -#define __ANDROID_CAMERA_DEVICE_H__ + +#pragma once #include #include @@ -130,5 +130,3 @@ private: CameraMetadata lastSettings_; }; - -#endif /* __ANDROID_CAMERA_DEVICE_H__ */ diff --git a/src/android/camera_hal_config.h b/src/android/camera_hal_config.h index a79d5d6c42dc..9df554f9929b 100644 --- a/src/android/camera_hal_config.h +++ b/src/android/camera_hal_config.h @@ -4,8 +4,8 @@ * * camera_hal_config.h - Camera HAL configuration file manager */ -#ifndef __ANDROID_CAMERA_HAL_CONFIG_H__ -#define __ANDROID_CAMERA_HAL_CONFIG_H__ + +#pragma once #include #include @@ -36,4 +36,3 @@ private: int parseConfigurationFile(); }; -#endif /* __ANDROID_CAMERA_HAL_CONFIG_H__ */ diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h index 3f6d302ad615..192f2fc56540 100644 --- a/src/android/camera_hal_manager.h +++ b/src/android/camera_hal_manager.h @@ -4,8 +4,8 @@ * * camera_hal_manager.h - libcamera Android Camera Manager */ -#ifndef __ANDROID_CAMERA_MANAGER_H__ -#define __ANDROID_CAMERA_MANAGER_H__ + +#pragma once #include #include @@ -69,5 +69,3 @@ private: unsigned int numInternalCameras_; unsigned int nextExternalCameraId_; }; - -#endif /* __ANDROID_CAMERA_MANAGER_H__ */ diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h index 8555c7c3aaff..e70f60afdc01 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -4,8 +4,8 @@ * * camera_metadata.h - libcamera Android Camera Metadata Helper */ -#ifndef __ANDROID_CAMERA_METADATA_H__ -#define __ANDROID_CAMERA_METADATA_H__ + +#pragma once #include #include @@ -99,5 +99,3 @@ private: bool valid_; bool resized_; }; - -#endif /* __ANDROID_CAMERA_METADATA_H__ */ diff --git a/src/android/camera_ops.h b/src/android/camera_ops.h index 304e7b856e81..b501bb7ef639 100644 --- a/src/android/camera_ops.h +++ b/src/android/camera_ops.h @@ -4,12 +4,10 @@ * * camera_ops.h - Android Camera HAL Operations */ -#ifndef __ANDROID_CAMERA_OPS_H__ -#define __ANDROID_CAMERA_OPS_H__ + +#pragma once #include int hal_dev_close(hw_device_t *hw_device); extern camera3_device_ops hal_dev_ops; - -#endif /* __ANDROID_CAMERA_OPS_H__ */ diff --git a/src/android/camera_request.h b/src/android/camera_request.h index 8d1204e5590b..f3cb6d643961 100644 --- a/src/android/camera_request.h +++ b/src/android/camera_request.h @@ -4,8 +4,8 @@ * * camera_request.h - libcamera Android Camera Request Descriptor */ -#ifndef __ANDROID_CAMERA_REQUEST_H__ -#define __ANDROID_CAMERA_REQUEST_H__ + +#pragma once #include #include @@ -80,5 +80,3 @@ public: private: LIBCAMERA_DISABLE_COPY(Camera3RequestDescriptor) }; - -#endif /* __ANDROID_CAMERA_REQUEST_H__ */ diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index 0c402deb4e8d..e9da75f0fed8 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -4,8 +4,8 @@ * * camera_stream.h - Camera HAL stream */ -#ifndef __ANDROID_CAMERA_STREAM_H__ -#define __ANDROID_CAMERA_STREAM_H__ + +#pragma once #include #include @@ -179,5 +179,3 @@ private: std::unique_ptr worker_; }; - -#endif /* __ANDROID_CAMERA_STREAM__ */ diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h index c94f16325925..26ecc2732046 100644 --- a/src/android/camera_worker.h +++ b/src/android/camera_worker.h @@ -4,8 +4,8 @@ * * camera_worker.h - Process capture requests on behalf of the Camera HAL */ -#ifndef __ANDROID_CAMERA_WORKER_H__ -#define __ANDROID_CAMERA_WORKER_H__ + +#pragma once #include #include @@ -68,5 +68,3 @@ private: Worker worker_; }; - -#endif /* __ANDROID_CAMERA_WORKER_H__ */ diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h index a28522f41714..b974d367d8fa 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 @@ -23,5 +23,3 @@ public: libcamera::Span 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 45ffbd7fae5d..1b3ac067a1c0 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 23b0e0974459..2ff8fb78abce 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 #include @@ -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 43fcbe60bb26..98309b012a3b 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 4d086c4943b0..d933cf0e31f1 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 #include @@ -30,5 +30,3 @@ private: bool valid_; }; - -#endif /* __ANDROID_JPEG_THUMBNAILER_H__ */ diff --git a/src/android/post_processor.h b/src/android/post_processor.h index 5ec71c93f40a..1a205b05e842 100644 --- a/src/android/post_processor.h +++ b/src/android/post_processor.h @@ -4,8 +4,8 @@ * * post_processor.h - CameraStream Post Processing Interface */ -#ifndef __ANDROID_POST_PROCESSOR_H__ -#define __ANDROID_POST_PROCESSOR_H__ + +#pragma once #include @@ -31,5 +31,3 @@ public: libcamera::Signal processComplete; }; - -#endif /* __ANDROID_POST_PROCESSOR_H__ */ diff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h index 39ec7994c0c0..a7ac17c564b6 100644 --- a/src/android/yuv/post_processor_yuv.h +++ b/src/android/yuv/post_processor_yuv.h @@ -4,8 +4,8 @@ * * post_processor_yuv.h - Post Processor using libyuv */ -#ifndef __ANDROID_POST_PROCESSOR_YUV_H__ -#define __ANDROID_POST_PROCESSOR_YUV_H__ + +#pragma once #include "../post_processor.h" @@ -33,5 +33,3 @@ private: unsigned int sourceStride_[2] = {}; unsigned int destinationStride_[2] = {}; }; - -#endif /* __ANDROID_POST_PROCESSOR_YUV_H__ */