From patchwork Wed May 6 09:17:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 26639 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C22E2BE173 for ; Wed, 6 May 2026 09:17:56 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 892D962FE8; Wed, 6 May 2026 11:17:55 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Ix2v51WL"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A5EA462FE1 for ; Wed, 6 May 2026 11:17:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778059072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZIFNMc+g6IVL5ck58/ERuW7uNMuJsD76/0KcrgIEC8=; b=Ix2v51WLKLuuyXS6pB4MIIT8HIpc6qj8/TBsEe2R6/DxIWVZPuzqLaja5oFH1DEj7RdolY An6Mz4CNetafsigR4tIJuaEwVjvLds7LOe1AiS33BE/mQEQIHgGdMIp++x2Z6Qoj64babO rJPbVNBbo1uT1EUAskzcFmhVRDogJuA= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-16-bhR6EhPBNSair3iTB26mzw-1; Wed, 06 May 2026 05:17:49 -0400 X-MC-Unique: bhR6EhPBNSair3iTB26mzw-1 X-Mimecast-MFC-AGG-ID: bhR6EhPBNSair3iTB26mzw_1778059068 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3830E19560A3; Wed, 6 May 2026 09:17:48 +0000 (UTC) Received: from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.49.240]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DE4791803A8E; Wed, 6 May 2026 09:17:46 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Laurent Pinchart Subject: [PATCH v2] libcamera: software_isp: #include cleanup Date: Wed, 6 May 2026 11:17:44 +0200 Message-ID: <20260506091744.53006-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: koZieg4FM4_gLbeg1OKZDlaMf3_OG_blg5zH3JpODUg_1778059068 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Remove unused #include's, move improper ones and add missing ones. Signed-off-by: Milan Zamazal --- include/libcamera/internal/software_isp/software_isp.h | 1 - include/libcamera/internal/software_isp/swstats_cpu.h | 2 +- src/libcamera/software_isp/debayer_cpu.cpp | 1 + src/libcamera/software_isp/debayer_cpu.h | 3 ++- src/libcamera/software_isp/debayer_egl.cpp | 9 +++++++-- src/libcamera/software_isp/debayer_egl.h | 3 +-- src/libcamera/software_isp/software_isp.cpp | 4 +++- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h index 585e0d6d9..86cb8f8de 100644 --- a/include/libcamera/internal/software_isp/software_isp.h +++ b/include/libcamera/internal/software_isp/software_isp.h @@ -9,7 +9,6 @@ #include #include -#include #include #include #include diff --git a/include/libcamera/internal/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h index 802370bdb..1f8873818 100644 --- a/include/libcamera/internal/software_isp/swstats_cpu.h +++ b/include/libcamera/internal/software_isp/swstats_cpu.h @@ -16,10 +16,10 @@ #include +#include #include #include "libcamera/internal/bayer_format.h" -#include "libcamera/internal/framebuffer.h" #include "libcamera/internal/shared_mem_object.h" #include "libcamera/internal/software_isp/swisp_stats.h" diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index d9f5b3268..1f9b24da0 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -23,6 +23,7 @@ #include #include "libcamera/internal/bayer_format.h" +#include "libcamera/internal/camera_manager.h" #include "libcamera/internal/framebuffer.h" #include "libcamera/internal/global_configuration.h" #include "libcamera/internal/mapped_framebuffer.h" diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h index 8c58775d5..68da95083 100644 --- a/src/libcamera/software_isp/debayer_cpu.h +++ b/src/libcamera/software_isp/debayer_cpu.h @@ -18,8 +18,9 @@ #include #include +#include + #include "libcamera/internal/bayer_format.h" -#include "libcamera/internal/camera_manager.h" #include "libcamera/internal/software_isp/debayer_params.h" #include "libcamera/internal/software_isp/swstats_cpu.h" diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 8f0c229fd..eae4c57f4 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -9,14 +9,19 @@ #include "debayer_egl.h" -#include +#include +#include #include -#include +#include +#include +#include #include #include +#include "libcamera/internal/framebuffer.h" + #include "../glsl_shaders.h" namespace libcamera { diff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h index fcd281f4c..141fb288f 100644 --- a/src/libcamera/software_isp/debayer_egl.h +++ b/src/libcamera/software_isp/debayer_egl.h @@ -11,15 +11,14 @@ #include #include +#include #include #define GL_GLEXT_PROTOTYPES #define EGL_EGLEXT_PROTOTYPES #include -#include "libcamera/internal/bayer_format.h" #include "libcamera/internal/egl.h" -#include "libcamera/internal/framebuffer.h" #include "libcamera/internal/mapped_framebuffer.h" #include "libcamera/internal/software_isp/benchmark.h" #include "libcamera/internal/software_isp/swstats_cpu.h" diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index d227bd8e3..781cf02f8 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -7,8 +7,10 @@ #include "libcamera/internal/software_isp/software_isp.h" -#include +#include +#include #include +#include #include #include #include