[09/15] libipa: awb: Make controls_ member variable private
diff mbox series

Message ID 20250223230403.1226-10-laurent.pinchart@ideasonboard.com
State Rejected
Headers show
Series
  • libipa: awb: Drive-by fixes
Related show

Commit Message

Laurent Pinchart Feb. 23, 2025, 11:03 p.m. UTC
The AwbAlgorithm::controls_ member variable doesn't need to be accessed
by derived classes. Turn it from public to private.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/libipa/awb.cpp | 5 -----
 src/ipa/libipa/awb.h   | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

Comments

Stefan Klug Feb. 24, 2025, 9:23 a.m. UTC | #1
Hi Laurent,

Thank you for the patch. 

On Mon, Feb 24, 2025 at 01:03:57AM +0200, Laurent Pinchart wrote:
> The AwbAlgorithm::controls_ member variable doesn't need to be accessed
> by derived classes. Turn it from public to private.

How comes? I think that should be accessible by the derived classes as
they should be free to provide additional controls.

At the moment these are protected, so they are not publicly visible.

Regards,
Stefan

> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/ipa/libipa/awb.cpp | 5 -----
>  src/ipa/libipa/awb.h   | 4 +++-
>  2 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/src/ipa/libipa/awb.cpp b/src/ipa/libipa/awb.cpp
> index 925fac232709..04cf2d55ed00 100644
> --- a/src/ipa/libipa/awb.cpp
> +++ b/src/ipa/libipa/awb.cpp
> @@ -249,11 +249,6 @@ int AwbAlgorithm::parseModeConfigs(const YamlObject &tuningData,
>   * \brief The highest valid colour temperature of that mode
>   */
>  
> -/**
> - * \var AwbAlgorithm::controls_
> - * \brief Controls info map for the controls provided by the algorithm
> - */
> -
>  /**
>   * \var AwbAlgorithm::modes_
>   * \brief Map of all configured modes
> diff --git a/src/ipa/libipa/awb.h b/src/ipa/libipa/awb.h
> index a86581adf43e..36c05c37f5e9 100644
> --- a/src/ipa/libipa/awb.h
> +++ b/src/ipa/libipa/awb.h
> @@ -54,8 +54,10 @@ protected:
>  		double ctLo;
>  	};
>  
> -	ControlInfoMap::Map controls_;
>  	std::map<controls::AwbModeEnum, AwbAlgorithm::ModeConfig> modes_;
> +
> +private:
> +	ControlInfoMap::Map controls_;
>  };
>  
>  } /* namespace ipa */
> -- 
> Regards,
> 
> Laurent Pinchart
>
Laurent Pinchart Feb. 24, 2025, 9:35 a.m. UTC | #2
On Mon, Feb 24, 2025 at 10:23:54AM +0100, Stefan Klug wrote:
> On Mon, Feb 24, 2025 at 01:03:57AM +0200, Laurent Pinchart wrote:
> > The AwbAlgorithm::controls_ member variable doesn't need to be accessed
> > by derived classes. Turn it from public to private.
> 
> How comes? I think that should be accessible by the derived classes as
> they should be free to provide additional controls.
> 
> At the moment these are protected, so they are not publicly visible.

I don't foresee a need to do so, but I also can't rule it out, so I'm
fine dropping this patch.

> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >  src/ipa/libipa/awb.cpp | 5 -----
> >  src/ipa/libipa/awb.h   | 4 +++-
> >  2 files changed, 3 insertions(+), 6 deletions(-)
> > 
> > diff --git a/src/ipa/libipa/awb.cpp b/src/ipa/libipa/awb.cpp
> > index 925fac232709..04cf2d55ed00 100644
> > --- a/src/ipa/libipa/awb.cpp
> > +++ b/src/ipa/libipa/awb.cpp
> > @@ -249,11 +249,6 @@ int AwbAlgorithm::parseModeConfigs(const YamlObject &tuningData,
> >   * \brief The highest valid colour temperature of that mode
> >   */
> >  
> > -/**
> > - * \var AwbAlgorithm::controls_
> > - * \brief Controls info map for the controls provided by the algorithm
> > - */
> > -
> >  /**
> >   * \var AwbAlgorithm::modes_
> >   * \brief Map of all configured modes
> > diff --git a/src/ipa/libipa/awb.h b/src/ipa/libipa/awb.h
> > index a86581adf43e..36c05c37f5e9 100644
> > --- a/src/ipa/libipa/awb.h
> > +++ b/src/ipa/libipa/awb.h
> > @@ -54,8 +54,10 @@ protected:
> >  		double ctLo;
> >  	};
> >  
> > -	ControlInfoMap::Map controls_;
> >  	std::map<controls::AwbModeEnum, AwbAlgorithm::ModeConfig> modes_;
> > +
> > +private:
> > +	ControlInfoMap::Map controls_;
> >  };
> >  
> >  } /* namespace ipa */

Patch
diff mbox series

diff --git a/src/ipa/libipa/awb.cpp b/src/ipa/libipa/awb.cpp
index 925fac232709..04cf2d55ed00 100644
--- a/src/ipa/libipa/awb.cpp
+++ b/src/ipa/libipa/awb.cpp
@@ -249,11 +249,6 @@  int AwbAlgorithm::parseModeConfigs(const YamlObject &tuningData,
  * \brief The highest valid colour temperature of that mode
  */
 
-/**
- * \var AwbAlgorithm::controls_
- * \brief Controls info map for the controls provided by the algorithm
- */
-
 /**
  * \var AwbAlgorithm::modes_
  * \brief Map of all configured modes
diff --git a/src/ipa/libipa/awb.h b/src/ipa/libipa/awb.h
index a86581adf43e..36c05c37f5e9 100644
--- a/src/ipa/libipa/awb.h
+++ b/src/ipa/libipa/awb.h
@@ -54,8 +54,10 @@  protected:
 		double ctLo;
 	};
 
-	ControlInfoMap::Map controls_;
 	std::map<controls::AwbModeEnum, AwbAlgorithm::ModeConfig> modes_;
+
+private:
+	ControlInfoMap::Map controls_;
 };
 
 } /* namespace ipa */