From patchwork Tue Nov 23 22:40:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 14740 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 04716C324F for ; Tue, 23 Nov 2021 22:40:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 951056033C; Tue, 23 Nov 2021 23:40:37 +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="LfHFP0Ah"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A81F060398 for ; Tue, 23 Nov 2021 23:40:22 +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 5DEFCA1B; Tue, 23 Nov 2021 23:40:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1637707222; bh=mQKAYdHDiBYDJwPawVQKjRTAdeoTD0GV4aMZBH93E3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LfHFP0AhtCoSCV+No9B753FqM0pni450yh5/8//7q7hDmNowcS8ph8sRQQWfhpcyw cv8hX+ne8P6p/nrkLHjfo/Tmp26141md2hiaonS5b27fLXlVtobTnjTugox23tM6fm t5ItxKDsGKH2GfWmOgjeZIBqWEtFEN+UpmbxNlY0= From: Kieran Bingham To: libcamera devel Date: Tue, 23 Nov 2021 22:40:09 +0000 Message-Id: <20211123224015.3619282-10-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 09/15] ipa: ipu3: 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/ipa/ipu3/algorithms/agc.h | 6 ++---- src/ipa/ipu3/algorithms/algorithm.h | 6 ++---- src/ipa/ipu3/algorithms/awb.h | 5 ++--- src/ipa/ipu3/algorithms/blc.h | 6 ++---- src/ipa/ipu3/algorithms/tone_mapping.h | 6 ++---- src/ipa/ipu3/ipa_context.h | 6 ++---- 6 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h index a04a81fb8eae..96ec7005acb6 100644 --- a/src/ipa/ipu3/algorithms/agc.h +++ b/src/ipa/ipu3/algorithms/agc.h @@ -4,8 +4,8 @@ * * agc.h - IPU3 AGC/AEC mean-based control algorithm */ -#ifndef __LIBCAMERA_IPU3_ALGORITHMS_AGC_H__ -#define __LIBCAMERA_IPU3_ALGORITHMS_AGC_H__ + +#pragma once #include @@ -59,5 +59,3 @@ private: } /* namespace ipa::ipu3::algorithms */ } /* namespace libcamera */ - -#endif /* __LIBCAMERA_IPU3_ALGORITHMS_AGC_H__ */ diff --git a/src/ipa/ipu3/algorithms/algorithm.h b/src/ipa/ipu3/algorithms/algorithm.h index 43f5d8b058b5..16310ab16985 100644 --- a/src/ipa/ipu3/algorithms/algorithm.h +++ b/src/ipa/ipu3/algorithms/algorithm.h @@ -4,8 +4,8 @@ * * algorithm.h - IPU3 control algorithm interface */ -#ifndef __LIBCAMERA_IPA_IPU3_ALGORITHM_H__ -#define __LIBCAMERA_IPA_IPU3_ALGORITHM_H__ + +#pragma once #include @@ -28,5 +28,3 @@ public: } /* namespace ipa::ipu3 */ } /* namespace libcamera */ - -#endif /* __LIBCAMERA_IPA_IPU3_ALGORITHM_H__ */ diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h index b90782c1cb5c..ab4b0a338369 100644 --- a/src/ipa/ipu3/algorithms/awb.h +++ b/src/ipa/ipu3/algorithms/awb.h @@ -4,8 +4,8 @@ * * awb.h - IPU3 AWB control algorithm */ -#ifndef __LIBCAMERA_IPU3_ALGORITHMS_AWB_H__ -#define __LIBCAMERA_IPU3_ALGORITHMS_AWB_H__ + +#pragma once #include @@ -86,4 +86,3 @@ private: } /* namespace ipa::ipu3::algorithms */ } /* namespace libcamera*/ -#endif /* __LIBCAMERA_IPU3_ALGORITHMS_AWB_H__ */ diff --git a/src/ipa/ipu3/algorithms/blc.h b/src/ipa/ipu3/algorithms/blc.h index 4b7cb483fae6..d8da1748baba 100644 --- a/src/ipa/ipu3/algorithms/blc.h +++ b/src/ipa/ipu3/algorithms/blc.h @@ -4,8 +4,8 @@ * * black_correction.h - IPU3 Black Level Correction control */ -#ifndef __LIBCAMERA_IPU3_ALGORITHMS_BLC_H__ -#define __LIBCAMERA_IPU3_ALGORITHMS_BLC_H__ + +#pragma once #include "algorithm.h" @@ -24,5 +24,3 @@ public: } /* namespace ipa::ipu3::algorithms */ } /* namespace libcamera */ - -#endif /* __LIBCAMERA_IPU3_ALGORITHMS_BLC_H__ */ diff --git a/src/ipa/ipu3/algorithms/tone_mapping.h b/src/ipa/ipu3/algorithms/tone_mapping.h index 46dd6171b1d5..b727ab1e25a6 100644 --- a/src/ipa/ipu3/algorithms/tone_mapping.h +++ b/src/ipa/ipu3/algorithms/tone_mapping.h @@ -4,8 +4,8 @@ * * tone_mapping.h - IPU3 ToneMapping and Gamma control */ -#ifndef __LIBCAMERA_IPU3_ALGORITHMS_TONE_MAPPING_H__ -#define __LIBCAMERA_IPU3_ALGORITHMS_TONE_MAPPING_H__ + +#pragma once #include "algorithm.h" @@ -29,5 +29,3 @@ private: } /* namespace ipa::ipu3::algorithms */ } /* namespace libcamera */ - -#endif /* __LIBCAMERA_IPU3_ALGORITHMS_TONE_MAPPING_H__ */ diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h index fd97e240f3fa..c6dc08147321 100644 --- a/src/ipa/ipu3/ipa_context.h +++ b/src/ipa/ipu3/ipa_context.h @@ -5,8 +5,8 @@ * ipa_context.h - IPU3 IPA Context * */ -#ifndef __LIBCAMERA_IPU3_IPA_CONTEXT_H__ -#define __LIBCAMERA_IPU3_IPA_CONTEXT_H__ + +#pragma once #include @@ -68,5 +68,3 @@ struct IPAContext { } /* namespace ipa::ipu3 */ } /* namespace libcamera*/ - -#endif /* __LIBCAMERA_IPU3_IPA_CONTEXT_H__ */