| Message ID | 20240902154212.1281257-6-mzamazal@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Milan, Thank you for the patch. On Mon, Sep 02, 2024 at 05:41:58PM +0200, Milan Zamazal wrote: > The includes that are not used can be removed. > > Signed-off-by: Milan Zamazal <mzamazal@redhat.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > src/ipa/rkisp1/algorithms/agc.h | 1 - > src/ipa/rkisp1/algorithms/awb.cpp | 4 ++-- > src/ipa/rkisp1/algorithms/ccm.cpp | 6 +----- > src/ipa/rkisp1/algorithms/dpf.cpp | 4 +++- > src/ipa/rkisp1/rkisp1.cpp | 7 ++++--- > src/ipa/rkisp1/utils.h | 1 - > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 3 +-- > 7 files changed, 11 insertions(+), 15 deletions(-) > > diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h > index d64ff42c..aa86f2c5 100644 > --- a/src/ipa/rkisp1/algorithms/agc.h > +++ b/src/ipa/rkisp1/algorithms/agc.h > @@ -15,7 +15,6 @@ > #include <libcamera/geometry.h> > > #include "libipa/agc_mean_luminance.h" > -#include "libipa/histogram.h" > > #include "algorithm.h" > > diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp > index b40f405f..c6451719 100644 > --- a/src/ipa/rkisp1/algorithms/awb.cpp > +++ b/src/ipa/rkisp1/algorithms/awb.cpp > @@ -8,12 +8,12 @@ > #include "awb.h" > > #include <algorithm> > -#include <cmath> > -#include <iomanip> > +#include <ios> > > #include <libcamera/base/log.h> > > #include <libcamera/control_ids.h> > + > #include <libcamera/ipa/core_ipa_interface.h> > > /** > diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp > index ca80112a..1ca0e73f 100644 > --- a/src/ipa/rkisp1/algorithms/ccm.cpp > +++ b/src/ipa/rkisp1/algorithms/ccm.cpp > @@ -7,11 +7,7 @@ > > #include "ccm.h" > > -#include <algorithm> > -#include <chrono> > -#include <cmath> > -#include <tuple> > -#include <vector> > +#include <map> > > #include <libcamera/base/log.h> > #include <libcamera/base/utils.h> > diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp > index 079cc2c3..cb6095da 100644 > --- a/src/ipa/rkisp1/algorithms/dpf.cpp > +++ b/src/ipa/rkisp1/algorithms/dpf.cpp > @@ -7,7 +7,9 @@ > > #include "dpf.h" > > -#include <cmath> > +#include <algorithm> > +#include <string> > +#include <vector> > > #include <libcamera/base/log.h> > > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp > index 79ae9289..a62fe151 100644 > --- a/src/ipa/rkisp1/rkisp1.cpp > +++ b/src/ipa/rkisp1/rkisp1.cpp > @@ -6,8 +6,8 @@ > */ > > #include <algorithm> > -#include <math.h> > -#include <queue> > +#include <array> > +#include <chrono> > #include <stdint.h> > #include <string.h> > > @@ -19,10 +19,11 @@ > > #include <libcamera/control_ids.h> > #include <libcamera/framebuffer.h> > +#include <libcamera/request.h> > + > #include <libcamera/ipa/ipa_interface.h> > #include <libcamera/ipa/ipa_module_info.h> > #include <libcamera/ipa/rkisp1_ipa_interface.h> > -#include <libcamera/request.h> > > #include "libcamera/internal/formats.h" > #include "libcamera/internal/mapped_framebuffer.h" > diff --git a/src/ipa/rkisp1/utils.h b/src/ipa/rkisp1/utils.h > index 450f2244..5f38b50b 100644 > --- a/src/ipa/rkisp1/utils.h > +++ b/src/ipa/rkisp1/utils.h > @@ -8,7 +8,6 @@ > #pragma once > > #include <cmath> > -#include <limits> > #include <type_traits> > > namespace libcamera { > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > index 710d9573..e521623b 100644 > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp > @@ -6,10 +6,9 @@ > */ > > #include <algorithm> > -#include <array> > -#include <iomanip> > #include <memory> > #include <numeric> > +#include <optional> > #include <queue> > > #include <linux/media-bus-format.h>
diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h index d64ff42c..aa86f2c5 100644 --- a/src/ipa/rkisp1/algorithms/agc.h +++ b/src/ipa/rkisp1/algorithms/agc.h @@ -15,7 +15,6 @@ #include <libcamera/geometry.h> #include "libipa/agc_mean_luminance.h" -#include "libipa/histogram.h" #include "algorithm.h" diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp index b40f405f..c6451719 100644 --- a/src/ipa/rkisp1/algorithms/awb.cpp +++ b/src/ipa/rkisp1/algorithms/awb.cpp @@ -8,12 +8,12 @@ #include "awb.h" #include <algorithm> -#include <cmath> -#include <iomanip> +#include <ios> #include <libcamera/base/log.h> #include <libcamera/control_ids.h> + #include <libcamera/ipa/core_ipa_interface.h> /** diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp index ca80112a..1ca0e73f 100644 --- a/src/ipa/rkisp1/algorithms/ccm.cpp +++ b/src/ipa/rkisp1/algorithms/ccm.cpp @@ -7,11 +7,7 @@ #include "ccm.h" -#include <algorithm> -#include <chrono> -#include <cmath> -#include <tuple> -#include <vector> +#include <map> #include <libcamera/base/log.h> #include <libcamera/base/utils.h> diff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp index 079cc2c3..cb6095da 100644 --- a/src/ipa/rkisp1/algorithms/dpf.cpp +++ b/src/ipa/rkisp1/algorithms/dpf.cpp @@ -7,7 +7,9 @@ #include "dpf.h" -#include <cmath> +#include <algorithm> +#include <string> +#include <vector> #include <libcamera/base/log.h> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 79ae9289..a62fe151 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -6,8 +6,8 @@ */ #include <algorithm> -#include <math.h> -#include <queue> +#include <array> +#include <chrono> #include <stdint.h> #include <string.h> @@ -19,10 +19,11 @@ #include <libcamera/control_ids.h> #include <libcamera/framebuffer.h> +#include <libcamera/request.h> + #include <libcamera/ipa/ipa_interface.h> #include <libcamera/ipa/ipa_module_info.h> #include <libcamera/ipa/rkisp1_ipa_interface.h> -#include <libcamera/request.h> #include "libcamera/internal/formats.h" #include "libcamera/internal/mapped_framebuffer.h" diff --git a/src/ipa/rkisp1/utils.h b/src/ipa/rkisp1/utils.h index 450f2244..5f38b50b 100644 --- a/src/ipa/rkisp1/utils.h +++ b/src/ipa/rkisp1/utils.h @@ -8,7 +8,6 @@ #pragma once #include <cmath> -#include <limits> #include <type_traits> namespace libcamera { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 710d9573..e521623b 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -6,10 +6,9 @@ */ #include <algorithm> -#include <array> -#include <iomanip> #include <memory> #include <numeric> +#include <optional> #include <queue> #include <linux/media-bus-format.h>
The includes that are not used can be removed. Signed-off-by: Milan Zamazal <mzamazal@redhat.com> --- src/ipa/rkisp1/algorithms/agc.h | 1 - src/ipa/rkisp1/algorithms/awb.cpp | 4 ++-- src/ipa/rkisp1/algorithms/ccm.cpp | 6 +----- src/ipa/rkisp1/algorithms/dpf.cpp | 4 +++- src/ipa/rkisp1/rkisp1.cpp | 7 ++++--- src/ipa/rkisp1/utils.h | 1 - src/libcamera/pipeline/rkisp1/rkisp1.cpp | 3 +-- 7 files changed, 11 insertions(+), 15 deletions(-)