summaryrefslogtreecommitdiff
path: root/src/ipa/raspberrypi
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2022-07-27 09:55:19 +0100
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-07-27 18:12:14 +0300
commitde9e95bfcc5149bc136895ec77537a8a73751621 (patch)
tree99784e84b70f4f214aa3d512a8417eb40342dfc3 /src/ipa/raspberrypi
parentacd5d9979fca93bf7a0ffa6f5d08f5cf43ba0cee (diff)
ipa: raspberrypi: Remove extern "C" declarations
Since the controller header files are now C++ specific, remove the extern "C" declarations. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/ipa/raspberrypi')
-rw-r--r--src/ipa/raspberrypi/controller/agc_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/alsc_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/awb_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/black_level_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/camera_mode.h8
-rw-r--r--src/ipa/raspberrypi/controller/ccm_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/contrast_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/denoise_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/dpc_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/focus_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/geq_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/lux_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/noise_status.h8
-rw-r--r--src/ipa/raspberrypi/controller/sharpen_status.h8
14 files changed, 0 insertions, 112 deletions
diff --git a/src/ipa/raspberrypi/controller/agc_status.h b/src/ipa/raspberrypi/controller/agc_status.h
index 9d184a15..c7b7c1b2 100644
--- a/src/ipa/raspberrypi/controller/agc_status.h
+++ b/src/ipa/raspberrypi/controller/agc_status.h
@@ -13,10 +13,6 @@
* "agc.status" metadata.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/*
* Note: total_exposure_value will be reported as zero until the algorithm has
* seen statistics and calculated meaningful values. The contents should be
@@ -39,7 +35,3 @@ struct AgcStatus {
double digitalGain;
int locked;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/alsc_status.h b/src/ipa/raspberrypi/controller/alsc_status.h
index e074f935..d7122f51 100644
--- a/src/ipa/raspberrypi/controller/alsc_status.h
+++ b/src/ipa/raspberrypi/controller/alsc_status.h
@@ -11,10 +11,6 @@
* "alsc.status" metadata.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#define ALSC_CELLS_X 16
#define ALSC_CELLS_Y 12
@@ -23,7 +19,3 @@ struct AlscStatus {
double g[ALSC_CELLS_Y][ALSC_CELLS_X];
double b[ALSC_CELLS_Y][ALSC_CELLS_X];
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/awb_status.h b/src/ipa/raspberrypi/controller/awb_status.h
index 2f6e88ef..353906f8 100644
--- a/src/ipa/raspberrypi/controller/awb_status.h
+++ b/src/ipa/raspberrypi/controller/awb_status.h
@@ -11,10 +11,6 @@
* under the tag "awb.status".
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct AwbStatus {
char mode[32];
double temperatureK;
@@ -22,7 +18,3 @@ struct AwbStatus {
double gainG;
double gainB;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/black_level_status.h b/src/ipa/raspberrypi/controller/black_level_status.h
index 8b052383..8d2c497a 100644
--- a/src/ipa/raspberrypi/controller/black_level_status.h
+++ b/src/ipa/raspberrypi/controller/black_level_status.h
@@ -8,16 +8,8 @@
/* The "black level" algorithm stores the black levels to use. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct BlackLevelStatus {
uint16_t blackLevelR; /* out of 16 bits */
uint16_t blackLevelG;
uint16_t blackLevelB;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/camera_mode.h b/src/ipa/raspberrypi/controller/camera_mode.h
index 47a0fea4..6e1597d2 100644
--- a/src/ipa/raspberrypi/controller/camera_mode.h
+++ b/src/ipa/raspberrypi/controller/camera_mode.h
@@ -16,10 +16,6 @@
* including binning, scaling, cropping etc.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#define CAMERA_MODE_NAME_LEN 32
struct CameraMode {
@@ -46,7 +42,3 @@ struct CameraMode {
/* sensitivity of this mode */
double sensitivity;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/ccm_status.h b/src/ipa/raspberrypi/controller/ccm_status.h
index 4cdd8bed..44471d0e 100644
--- a/src/ipa/raspberrypi/controller/ccm_status.h
+++ b/src/ipa/raspberrypi/controller/ccm_status.h
@@ -8,15 +8,7 @@
/* The "ccm" algorithm generates an appropriate colour matrix. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct CcmStatus {
double matrix[9];
double saturation;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/contrast_status.h b/src/ipa/raspberrypi/controller/contrast_status.h
index 5eb084f7..88152575 100644
--- a/src/ipa/raspberrypi/controller/contrast_status.h
+++ b/src/ipa/raspberrypi/controller/contrast_status.h
@@ -11,10 +11,6 @@
* of contrast stretching based on the AGC histogram.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#define CONTRAST_NUM_POINTS 33
struct ContrastPoint {
@@ -27,7 +23,3 @@ struct ContrastStatus {
double brightness;
double contrast;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/denoise_status.h b/src/ipa/raspberrypi/controller/denoise_status.h
index c2d9c730..e97368aa 100644
--- a/src/ipa/raspberrypi/controller/denoise_status.h
+++ b/src/ipa/raspberrypi/controller/denoise_status.h
@@ -8,17 +8,9 @@
/* This stores the parameters required for Denoise. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct DenoiseStatus {
double noiseConstant;
double noiseSlope;
double strength;
unsigned int mode;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/dpc_status.h b/src/ipa/raspberrypi/controller/dpc_status.h
index c99ad8c5..685ffc7b 100644
--- a/src/ipa/raspberrypi/controller/dpc_status.h
+++ b/src/ipa/raspberrypi/controller/dpc_status.h
@@ -8,14 +8,6 @@
/* The "DPC" algorithm sets defective pixel correction strength. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct DpcStatus {
int strength; /* 0 = "off", 1 = "normal", 2 = "strong" */
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/focus_status.h b/src/ipa/raspberrypi/controller/focus_status.h
index c75795dc..f0dbe4e2 100644
--- a/src/ipa/raspberrypi/controller/focus_status.h
+++ b/src/ipa/raspberrypi/controller/focus_status.h
@@ -14,15 +14,7 @@
* measurements, it's not driving any kind of auto-focus algorithm!
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct FocusStatus {
unsigned int num;
uint32_t focusMeasures[FOCUS_REGIONS];
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/geq_status.h b/src/ipa/raspberrypi/controller/geq_status.h
index 0ebb7ce7..791f34ca 100644
--- a/src/ipa/raspberrypi/controller/geq_status.h
+++ b/src/ipa/raspberrypi/controller/geq_status.h
@@ -8,15 +8,7 @@
/* The "GEQ" algorithm calculates the green equalisation thresholds */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct GeqStatus {
uint16_t offset;
double slope;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/lux_status.h b/src/ipa/raspberrypi/controller/lux_status.h
index c1134bec..cd5ed473 100644
--- a/src/ipa/raspberrypi/controller/lux_status.h
+++ b/src/ipa/raspberrypi/controller/lux_status.h
@@ -17,15 +17,7 @@
* (presumably meaningless) value in the image metadata.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct LuxStatus {
double lux;
double aperture;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/noise_status.h b/src/ipa/raspberrypi/controller/noise_status.h
index 689beed3..843260f0 100644
--- a/src/ipa/raspberrypi/controller/noise_status.h
+++ b/src/ipa/raspberrypi/controller/noise_status.h
@@ -8,15 +8,7 @@
/* The "noise" algorithm stores an estimate of the noise profile for this image. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct NoiseStatus {
double noiseConstant;
double noiseSlope;
};
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/ipa/raspberrypi/controller/sharpen_status.h b/src/ipa/raspberrypi/controller/sharpen_status.h
index 5ea21ab2..c66eaa73 100644
--- a/src/ipa/raspberrypi/controller/sharpen_status.h
+++ b/src/ipa/raspberrypi/controller/sharpen_status.h
@@ -8,10 +8,6 @@
/* The "sharpen" algorithm stores the strength to use. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
struct SharpenStatus {
/* controls the smallest level of detail (or noise!) that sharpening will pick up */
double threshold;
@@ -22,7 +18,3 @@ struct SharpenStatus {
/* The sharpening strength requested by the user or application. */
double userStrength;
};
-
-#ifdef __cplusplus
-}
-#endif