[{"id":38745,"web_url":"https://patchwork.libcamera.org/comment/38745/","msgid":"<20260506202230.GB1778786@killaraus.ideasonboard.com>","date":"2026-05-06T20:22:30","subject":"Re: [PATCH v2] libcamera: software_isp: #include cleanup","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Milan,\n\nThank you for the patch.\n\nOn Wed, May 06, 2026 at 11:17:44AM +0200, Milan Zamazal wrote:\n> Remove unused #include's, move improper ones and add missing ones.\n> \n> Signed-off-by: Milan Zamazal <mzamazal@redhat.com>\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> ---\n>  include/libcamera/internal/software_isp/software_isp.h | 1 -\n>  include/libcamera/internal/software_isp/swstats_cpu.h  | 2 +-\n>  src/libcamera/software_isp/debayer_cpu.cpp             | 1 +\n>  src/libcamera/software_isp/debayer_cpu.h               | 3 ++-\n>  src/libcamera/software_isp/debayer_egl.cpp             | 9 +++++++--\n>  src/libcamera/software_isp/debayer_egl.h               | 3 +--\n>  src/libcamera/software_isp/software_isp.cpp            | 4 +++-\n>  7 files changed, 15 insertions(+), 8 deletions(-)\n> \n> diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\n> index 585e0d6d9..86cb8f8de 100644\n> --- a/include/libcamera/internal/software_isp/software_isp.h\n> +++ b/include/libcamera/internal/software_isp/software_isp.h\n> @@ -9,7 +9,6 @@\n>  \n>  #include <deque>\n>  #include <functional>\n> -#include <initializer_list>\n>  #include <map>\n>  #include <memory>\n>  #include <stdint.h>\n> diff --git a/include/libcamera/internal/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h\n> index 802370bdb..1f8873818 100644\n> --- a/include/libcamera/internal/software_isp/swstats_cpu.h\n> +++ b/include/libcamera/internal/software_isp/swstats_cpu.h\n> @@ -16,10 +16,10 @@\n>  \n>  #include <libcamera/base/signal.h>\n>  \n> +#include <libcamera/framebuffer.h>\n>  #include <libcamera/geometry.h>\n>  \n>  #include \"libcamera/internal/bayer_format.h\"\n> -#include \"libcamera/internal/framebuffer.h\"\n>  #include \"libcamera/internal/shared_mem_object.h\"\n>  #include \"libcamera/internal/software_isp/swisp_stats.h\"\n>  \n> diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\n> index d9f5b3268..1f9b24da0 100644\n> --- a/src/libcamera/software_isp/debayer_cpu.cpp\n> +++ b/src/libcamera/software_isp/debayer_cpu.cpp\n> @@ -23,6 +23,7 @@\n>  #include <libcamera/formats.h>\n>  \n>  #include \"libcamera/internal/bayer_format.h\"\n> +#include \"libcamera/internal/camera_manager.h\"\n>  #include \"libcamera/internal/framebuffer.h\"\n>  #include \"libcamera/internal/global_configuration.h\"\n>  #include \"libcamera/internal/mapped_framebuffer.h\"\n> diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\n> index 8c58775d5..68da95083 100644\n> --- a/src/libcamera/software_isp/debayer_cpu.h\n> +++ b/src/libcamera/software_isp/debayer_cpu.h\n> @@ -18,8 +18,9 @@\n>  #include <libcamera/base/mutex.h>\n>  #include <libcamera/base/object.h>\n>  \n> +#include <libcamera/camera_manager.h>\n> +\n>  #include \"libcamera/internal/bayer_format.h\"\n> -#include \"libcamera/internal/camera_manager.h\"\n>  #include \"libcamera/internal/software_isp/debayer_params.h\"\n>  #include \"libcamera/internal/software_isp/swstats_cpu.h\"\n>  \n> diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\n> index 8f0c229fd..eae4c57f4 100644\n> --- a/src/libcamera/software_isp/debayer_egl.cpp\n> +++ b/src/libcamera/software_isp/debayer_egl.cpp\n> @@ -9,14 +9,19 @@\n>  \n>  #include \"debayer_egl.h\"\n>  \n> -#include <cmath>\n> +#include <algorithm>\n> +#include <memory>\n>  #include <stdlib.h>\n> -#include <time.h>\n> +#include <string>\n> +#include <tuple>\n> +#include <vector>\n>  \n>  #include <libcamera/base/utils.h>\n>  \n>  #include <libcamera/formats.h>\n>  \n> +#include \"libcamera/internal/framebuffer.h\"\n> +\n>  #include \"../glsl_shaders.h\"\n>  \n>  namespace libcamera {\n> diff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h\n> index fcd281f4c..141fb288f 100644\n> --- a/src/libcamera/software_isp/debayer_egl.h\n> +++ b/src/libcamera/software_isp/debayer_egl.h\n> @@ -11,15 +11,14 @@\n>  \n>  #include <memory>\n>  #include <stdint.h>\n> +#include <tuple>\n>  #include <vector>\n>  \n>  #define GL_GLEXT_PROTOTYPES\n>  #define EGL_EGLEXT_PROTOTYPES\n>  #include <libcamera/base/object.h>\n>  \n> -#include \"libcamera/internal/bayer_format.h\"\n>  #include \"libcamera/internal/egl.h\"\n> -#include \"libcamera/internal/framebuffer.h\"\n>  #include \"libcamera/internal/mapped_framebuffer.h\"\n>  #include \"libcamera/internal/software_isp/benchmark.h\"\n>  #include \"libcamera/internal/software_isp/swstats_cpu.h\"\n> diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\n> index d227bd8e3..781cf02f8 100644\n> --- a/src/libcamera/software_isp/software_isp.cpp\n> +++ b/src/libcamera/software_isp/software_isp.cpp\n> @@ -7,8 +7,10 @@\n>  \n>  #include \"libcamera/internal/software_isp/software_isp.h\"\n>  \n> -#include <cmath>\n> +#include <memory>\n> +#include <optional>\n>  #include <stdint.h>\n> +#include <string>\n>  #include <sys/mman.h>\n>  #include <sys/types.h>\n>  #include <unistd.h>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 75DC7BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed,  6 May 2026 20:22:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 82A1163025;\n\tWed,  6 May 2026 22:22:34 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CE00C6271A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed,  6 May 2026 22:22:32 +0200 (CEST)","from killaraus.ideasonboard.com\n\t(2001-14ba-70f3-e800--a06.rev.dnainternet.fi\n\t[IPv6:2001:14ba:70f3:e800::a06])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C134C63D;\n\tWed,  6 May 2026 22:22:28 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"res1Ro4f\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1778098949;\n\tbh=qAcJAiV510s8442ehMPHtmzowPiySEtK3inyZm4onj0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=res1Ro4fG++cq8SPuO5zx63QvCZiN2qHShtjFmzkY9S9m1IsR5KMNqrHNH5JXKY0t\n\tNsOTfEnwezUuFCiNYyY1zwBmcvW40J8PojYzQRvTCrZTwms6A0+kxzPqzmBVFNKtg4\n\tIdeSUgf0K7Q5EEbQICF9XQq5wbNEQf+BZ8mkgX0c=","Date":"Wed, 6 May 2026 23:22:30 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Milan Zamazal <mzamazal@redhat.com>","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v2] libcamera: software_isp: #include cleanup","Message-ID":"<20260506202230.GB1778786@killaraus.ideasonboard.com>","References":"<20260506091744.53006-1-mzamazal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20260506091744.53006-1-mzamazal@redhat.com>","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]