[PATCH] ipa: rkisp1: agc: Fix build on debian 11 (gcc-9)

Kieran Bingham kieran.bingham at ideasonboard.com
Tue Feb 11 18:58:20 CET 2025


Quoting Kieran Bingham (2025-02-11 17:56:36)
> Quoting Stefan Klug (2025-02-11 17:20:56)
> > Apparently not every compiler is able to deduce types the same way. Fix
> > compile on gcc-9 by explicitly specifying the type.

I think this fixes compilation on both gcc-9 and gcc-10 in fact, based
on both 
 https://gitlab.freedesktop.org/camera/libcamera/-/jobs/70899831
and
 https://gitlab.freedesktop.org/camera/libcamera/-/jobs/70878357

--
Kieran

> > 
> > Fixes: ee918b370a08 ("ipa: rkisp1: agc: Initialize enum controls with a list of values")
> > Signed-off-by: Stefan Klug <stefan.klug at ideasonboard.com>
> > ---
> > 
> > Hi all,
> > 
> > Unfortunately I broke the CI build of mainline :-(. This patch fixes it.
> > A corresponding CI run is here:
> > https://gitlab.freedesktop.org/camera/libcamera/-/pipelines/1362476
> 
> Ayeee,
> 
> Being explicit on the type looks fine here, and it's how the other
> ControlValues are also specified, so I guess that's expected too.
> 
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
> 
> > 
> > Best regards,
> > Stefan
> > 
> >  src/ipa/rkisp1/algorithms/agc.cpp | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp
> > index e7c6de757593..45ec72188b3a 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());
> > -- 
> > 2.43.0
> >


More information about the libcamera-devel mailing list