summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-11-23 17:23:07 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-11-24 12:18:41 +0000
commitf8a797102d06805db434a7bb0bf8c501b1def04d (patch)
tree1c12c9a89c5e118a61a94d02bfdd9b13affeb8a1 /src
parentc296c91a71bcaeddd042f2d0535d56efc6c371a3 (diff)
ipa: ipu3: 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')
-rw-r--r--src/ipa/ipu3/algorithms/agc.h6
-rw-r--r--src/ipa/ipu3/algorithms/algorithm.h6
-rw-r--r--src/ipa/ipu3/algorithms/awb.h5
-rw-r--r--src/ipa/ipu3/algorithms/blc.h6
-rw-r--r--src/ipa/ipu3/algorithms/tone_mapping.h6
-rw-r--r--src/ipa/ipu3/ipa_context.h6
6 files changed, 12 insertions, 23 deletions
diff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h
index a04a81fb..96ec7005 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 <linux/intel-ipu3.h>
@@ -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 43f5d8b0..16310ab1 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 <libcamera/ipa/ipu3_ipa_interface.h>
@@ -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 b90782c1..ab4b0a33 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 <vector>
@@ -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 4b7cb483..d8da1748 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 46dd6171..b727ab1e 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 fd97e240..c6dc0814 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 <linux/intel-ipu3.h>
@@ -68,5 +68,3 @@ struct IPAContext {
} /* namespace ipa::ipu3 */
} /* namespace libcamera*/
-
-#endif /* __LIBCAMERA_IPU3_IPA_CONTEXT_H__ */