{"id":22973,"url":"https://patchwork.libcamera.org/api/1.1/patches/22973/?format=json","web_url":"https://patchwork.libcamera.org/patch/22973/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250317215705.14219-1-laurent.pinchart@ideasonboard.com>","date":"2025-03-17T21:57:05","name":"apps: cam: Fix include order","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"726eed9971c23fde55e765575d12db9f05dd74b3","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22973/mbox/","series":[{"id":5068,"url":"https://patchwork.libcamera.org/api/1.1/series/5068/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5068","date":"2025-03-17T21:57:05","name":"apps: cam: Fix include order","version":1,"mbox":"https://patchwork.libcamera.org/series/5068/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22973/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22973/checks/","tags":{},"headers":{"Return-Path":"","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 0DCB5C32FA\n\tfor ;\n\tMon, 17 Mar 2025 21:57:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 37DA768928;\n\tMon, 17 Mar 2025 22:57:32 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0FB8E68826\n\tfor ;\n\tMon, 17 Mar 2025 22:57:30 +0100 (CET)","from pendragon.ideasonboard.com (unknown [194.75.195.10])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D3936352\n\tfor ;\n\tMon, 17 Mar 2025 22:55:47 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LymkYFVu\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1742248548;\n\tbh=uVhOPFuG/o9JPuTw7O+ZIgrZKtjStAYl5hAr5XOWOgY=;\n\th=From:To:Subject:Date:From;\n\tb=LymkYFVu6myawf59Ri9jHDfsrXEjYMfqh+/btD3IXkPBXQCNe4uViA0FE0OUT34Vl\n\tZrugty+l3QZgfGGmnHB3l4kVeLrAKKIs9kQVSxnpqGVx2UVyS0VG5BtjIAkenpTBRd\n\tPWfug3sjeSm6byy9Pj4yTdxzegvCwwEzRJ0W+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","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Several .cpp files in the cam application don't include their\ncorresponding header first, as usually done by libcamera to ensure that\nheaders are self-contained. Reorder headers to fix it. This shows\nthrough a compilation error that file_sink.h is missing\nlibcamera/controls.h, fix it as well.\n\nSigned-off-by: Laurent Pinchart \n---\n src/apps/cam/camera_session.cpp | 3 ++-\n src/apps/cam/file_sink.cpp | 4 ++--\n src/apps/cam/file_sink.h | 1 +\n src/apps/cam/main.cpp | 3 ++-\n 4 files changed, 7 insertions(+), 4 deletions(-)\n\n\nbase-commit: 39419ce431dbd4f34d8772bd31bb7f44a3534f86\n--\nRegards,\n\nLaurent Pinchart","diff":"diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\nindex 9e93482775c3..a352494bed57 100644\n--- a/src/apps/cam/camera_session.cpp\n+++ b/src/apps/cam/camera_session.cpp\n@@ -5,6 +5,8 @@\n * Camera capture session\n */\n\n+#include \"camera_session.h\"\n+\n #include \n #include \n #include \n@@ -16,7 +18,6 @@\n #include \"../common/event_loop.h\"\n #include \"../common/stream_options.h\"\n\n-#include \"camera_session.h\"\n #include \"capture_script.h\"\n #include \"file_sink.h\"\n #ifdef HAVE_KMS\ndiff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp\nindex 76e21db9bf9a..65794a2f90a8 100644\n--- a/src/apps/cam/file_sink.cpp\n+++ b/src/apps/cam/file_sink.cpp\n@@ -5,6 +5,8 @@\n * File Sink\n */\n\n+#include \"file_sink.h\"\n+\n #include \n #include \n #include \n@@ -21,8 +23,6 @@\n #include \"../common/image.h\"\n #include \"../common/ppm_writer.h\"\n\n-#include \"file_sink.h\"\n-\n using namespace libcamera;\n\n FileSink::FileSink([[maybe_unused]] const libcamera::Camera *camera,\ndiff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h\nindex 71b7fe0feab5..26cd61b36d04 100644\n--- a/src/apps/cam/file_sink.h\n+++ b/src/apps/cam/file_sink.h\n@@ -11,6 +11,7 @@\n #include \n #include \n\n+#include \n #include \n\n #include \"frame_sink.h\"\ndiff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp\nindex 460dbc813060..fa266eca6d30 100644\n--- a/src/apps/cam/main.cpp\n+++ b/src/apps/cam/main.cpp\n@@ -5,6 +5,8 @@\n * cam - The libcamera swiss army knife\n */\n\n+#include \"main.h\"\n+\n #include \n #include \n #include \n@@ -19,7 +21,6 @@\n #include \"../common/stream_options.h\"\n\n #include \"camera_session.h\"\n-#include \"main.h\"\n\n using namespace libcamera;\n\n","prefixes":[]}