summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Klug <stefan.klug@ideasonboard.com>2025-02-11 18:20:56 +0100
committerStefan Klug <stefan.klug@ideasonboard.com>2025-02-11 23:08:38 +0100
commitf63f4d71d4c917b62242cb9b7e06edae80d6c204 (patch)
treea6a6334799bfbe1c8e52ff5f37a3eb6a62a83464
parentee918b370a08b362de75ee590cfc46fe8e38a0f0 (diff)
ipa: rkisp1: agc: Fix build on debian 11 (gcc-9)
In the CI on debian 11 (gcc 9.3.0 and gcc 10.2.1) compilation fails because the compiler incorrectly selects the explicit ControlInfo(std::set<bool> values, bool def) version of the ControlInfo constructor. This behavior was not reproducible using gcc 9.5.0 and 10.5.0. So it seems newer versions of gcc already contain a fix. Fix the CI build by explicitly passing a ControlValue as second argument to the constructor. Fixes: ee918b370a08 ("ipa: rkisp1: agc: Initialize enum controls with a list of values") Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/ipa/rkisp1/algorithms/agc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp
index e7c6de75..45ec7218 100644
--- a/src/ipa/rkisp1/algorithms/agc.cpp
+++ b/src/ipa/rkisp1/algorithms/agc.cpp
@@ -151,11 +151,11 @@ int Agc::init(IPAContext &context, const YamlObject &tuningData)
context.ctrlMap[&controls::ExposureTimeMode] =
ControlInfo({ { ControlValue(controls::ExposureTimeModeAuto),
ControlValue(controls::ExposureTimeModeManual) } },
- controls::ExposureTimeModeAuto);
+ ControlValue(controls::ExposureTimeModeAuto));
context.ctrlMap[&controls::AnalogueGainMode] =
ControlInfo({ { ControlValue(controls::AnalogueGainModeAuto),
ControlValue(controls::AnalogueGainModeManual) } },
- controls::AnalogueGainModeAuto);
+ ControlValue(controls::AnalogueGainModeAuto));
/* \todo Move this to the Camera class */
context.ctrlMap[&controls::AeEnable] = ControlInfo(false, true, true);
context.ctrlMap.merge(controls());