From patchwork Mon Mar 17 21:57:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 22973 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 0DCB5C32FA for ; Mon, 17 Mar 2025 21:57:33 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 37DA768928; Mon, 17 Mar 2025 22:57:32 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="LymkYFVu"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0FB8E68826 for ; Mon, 17 Mar 2025 22:57:30 +0100 (CET) Received: from pendragon.ideasonboard.com (unknown [194.75.195.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D3936352 for ; Mon, 17 Mar 2025 22:55:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742248548; bh=uVhOPFuG/o9JPuTw7O+ZIgrZKtjStAYl5hAr5XOWOgY=; h=From:To:Subject:Date:From; b=LymkYFVu6myawf59Ri9jHDfsrXEjYMfqh+/btD3IXkPBXQCNe4uViA0FE0OUT34Vl Zrugty+l3QZgfGGmnHB3l4kVeLrAKKIs9kQVSxnpqGVx2UVyS0VG5BtjIAkenpTBRd PWfug3sjeSm6byy9Pj4yTdxzegvCwwEzRJ0W+c88= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH] apps: cam: Fix include order Date: Mon, 17 Mar 2025 23:57:05 +0200 Message-ID: <20250317215705.14219-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 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" Several .cpp files in the cam application don't include their corresponding header first, as usually done by libcamera to ensure that headers are self-contained. Reorder headers to fix it. This shows through a compilation error that file_sink.h is missing libcamera/controls.h, fix it as well. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Stefan Klug --- src/apps/cam/camera_session.cpp | 3 ++- src/apps/cam/file_sink.cpp | 4 ++-- src/apps/cam/file_sink.h | 1 + src/apps/cam/main.cpp | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) base-commit: 39419ce431dbd4f34d8772bd31bb7f44a3534f86 -- Regards, Laurent Pinchart diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 9e93482775c3..a352494bed57 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -5,6 +5,8 @@ * Camera capture session */ +#include "camera_session.h" + #include #include #include @@ -16,7 +18,6 @@ #include "../common/event_loop.h" #include "../common/stream_options.h" -#include "camera_session.h" #include "capture_script.h" #include "file_sink.h" #ifdef HAVE_KMS diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp index 76e21db9bf9a..65794a2f90a8 100644 --- a/src/apps/cam/file_sink.cpp +++ b/src/apps/cam/file_sink.cpp @@ -5,6 +5,8 @@ * File Sink */ +#include "file_sink.h" + #include #include #include @@ -21,8 +23,6 @@ #include "../common/image.h" #include "../common/ppm_writer.h" -#include "file_sink.h" - using namespace libcamera; FileSink::FileSink([[maybe_unused]] const libcamera::Camera *camera, diff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h index 71b7fe0feab5..26cd61b36d04 100644 --- a/src/apps/cam/file_sink.h +++ b/src/apps/cam/file_sink.h @@ -11,6 +11,7 @@ #include #include +#include #include #include "frame_sink.h" diff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp index 460dbc813060..fa266eca6d30 100644 --- a/src/apps/cam/main.cpp +++ b/src/apps/cam/main.cpp @@ -5,6 +5,8 @@ * cam - The libcamera swiss army knife */ +#include "main.h" + #include #include #include @@ -19,7 +21,6 @@ #include "../common/stream_options.h" #include "camera_session.h" -#include "main.h" using namespace libcamera;