[11/15] libipa: awb: Tidy up includes

22833 diff mbox series

Drop unneeded headers and add missing ones.

The yaml_parser.h header is dropped from awb_grey.h as the classes it
provides are only used in virtual functions defined by the base class,
so any required definitions are guaranteed to be available already.

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

Hi Laurent,

Thank you for the patch. 

On Mon, Feb 24, 2025 at 01:03:59AM +0200, Laurent Pinchart wrote:
> Drop unneeded headers and add missing ones.
> 
> The yaml_parser.h header is dropped from awb_grey.h as the classes it
> provides are only used in virtual functions defined by the base class,
> so any required definitions are guaranteed to be available already.

Yes, these slipped through.

> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com> 

> ---
>  src/ipa/libipa/awb_bayes.cpp | 5 +++++
>  src/ipa/libipa/awb_bayes.h   | 8 --------
>  src/ipa/libipa/awb_grey.cpp  | 2 +-
>  src/ipa/libipa/awb_grey.h    | 3 ++-
>  4 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/src/ipa/libipa/awb_bayes.cpp b/src/ipa/libipa/awb_bayes.cpp
> index 97bd256526a4..d2869610a25b 100644
> --- a/src/ipa/libipa/awb_bayes.cpp
> +++ b/src/ipa/libipa/awb_bayes.cpp
> @@ -8,7 +8,12 @@
>  
>  #include "awb_bayes.h"
>  
> +#include <algorithm>
>  #include <cmath>
> +#include <limits>
> +#include <map>
> +#include <ostream>
> +#include <vector>
>  
>  #include <libcamera/base/log.h>
>  #include <libcamera/control_ids.h>
> diff --git a/src/ipa/libipa/awb_bayes.h b/src/ipa/libipa/awb_bayes.h
> index b74201b542fb..a5790e69eed7 100644
> --- a/src/ipa/libipa/awb_bayes.h
> +++ b/src/ipa/libipa/awb_bayes.h
> @@ -7,14 +7,6 @@
>  
>  #pragma once
>  
> -#include <map>
> -#include <memory>
> -#include <tuple>
> -#include <vector>
> -
> -#include <libcamera/base/utils.h>
> -
> -#include <libcamera/control_ids.h>
>  #include <libcamera/controls.h>
>  
>  #include "libcamera/internal/vector.h"
> diff --git a/src/ipa/libipa/awb_grey.cpp b/src/ipa/libipa/awb_grey.cpp
> index 17b8598400e7..0e6c5220c393 100644
> --- a/src/ipa/libipa/awb_grey.cpp
> +++ b/src/ipa/libipa/awb_grey.cpp
> @@ -7,7 +7,7 @@
>  
>  #include "awb_grey.h"
>  
> -#include <cmath>
> +#include <algorithm>
>  
>  #include <libcamera/base/log.h>
>  #include <libcamera/control_ids.h>
> diff --git a/src/ipa/libipa/awb_grey.h b/src/ipa/libipa/awb_grey.h
> index e3c34201dbc9..7ec7bfa5da9a 100644
> --- a/src/ipa/libipa/awb_grey.h
> +++ b/src/ipa/libipa/awb_grey.h
> @@ -7,8 +7,9 @@
>  
>  #pragma once
>  
> +#include <optional>
> +
>  #include "libcamera/internal/vector.h"
> -#include "libcamera/internal/yaml_parser.h"
>  
>  #include "awb.h"
>  #include "interpolator.h"
> -- 
> Regards,
> 
> Laurent Pinchart
>