Patch Detail
Show a patch.
GET /api/1.1/patches/20371/?format=api
{ "id": 20371, "url": "https://patchwork.libcamera.org/api/1.1/patches/20371/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20371/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240624192941.22943-5-laurent.pinchart@ideasonboard.com>", "date": "2024-06-24T19:29:35", "name": "[04/10] py: libcamera: Move function declarations to common header", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "73589fbc3c8312e6ace88433f1e205a32c208f56", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20371/mbox/", "series": [ { "id": 4413, "url": "https://patchwork.libcamera.org/api/1.1/series/4413/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4413", "date": "2024-06-24T19:29:31", "name": "libcamera: Enable -Wmissing-declarations", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4413/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20371/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20371/checks/", "tags": {}, "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 262E4BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 24 Jun 2024 19:30:17 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BA0D8654A3;\n\tMon, 24 Jun 2024 21:30:16 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B7EC4654B1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 24 Jun 2024 21:30:09 +0200 (CEST)", "from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8A6BE191B;\n\tMon, 24 Jun 2024 21:29:47 +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=\"ehWqtyUI\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719257387;\n\tbh=0l+odjtUOc5OsKWhoawlrDZnwD+4VcttMUEBoWWUYQU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ehWqtyUIvt5Zv7TqDyRrLDGSAF8qQiRUD872I/HZIUeNNXcCHGcJi/o6L+qOkpPfF\n\tyMIRX9KrRgKAj1Il0GqBV2+/8vz+HEKvNDt31f3UK6Ykeju10BYuYWBfK/0UtwgdOj\n\t/a5rb+kcmMWj+nVnPCWEE0ZKYDSzlZ+adzPkgRlg=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <pobrn@protonmail.com>", "Subject": "[PATCH 04/10] py: libcamera: Move function declarations to common\n\theader", "Date": "Mon, 24 Jun 2024 22:29:35 +0300", "Message-ID": "<20240624192941.22943-5-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.44.2", "In-Reply-To": "<20240624192941.22943-1-laurent.pinchart@ideasonboard.com>", "References": "<20240624192941.22943-1-laurent.pinchart@ideasonboard.com>", "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": "<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>" }, "content": "The init_py_*() functions are called by the top-level entry point of the\nlibcamera Python module to initialize different parts of the bindings.\nThey are declared in py_main.cpp where they are called, and defined in\nseparate compilation units. This results in functions being defined\nwithout a corresponding declaration, and will generate warnings when we\nenable -Wmissing-declarations.\n\nFix this by moving the function declarations from py_main.c to\npy_main.h, and including py_main.h in the various compilation units that\nneed it.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/py/libcamera/py_color_space.cpp | 2 ++\n src/py/libcamera/py_controls_generated.cpp.in | 2 ++\n src/py/libcamera/py_enums.cpp | 2 ++\n src/py/libcamera/py_formats_generated.cpp.in | 2 ++\n src/py/libcamera/py_geometry.cpp | 2 ++\n src/py/libcamera/py_main.cpp | 8 --------\n src/py/libcamera/py_main.h | 10 ++++++++++\n src/py/libcamera/py_properties_generated.cpp.in | 2 ++\n src/py/libcamera/py_transform.cpp | 2 ++\n 9 files changed, 24 insertions(+), 8 deletions(-)", "diff": "diff --git a/src/py/libcamera/py_color_space.cpp b/src/py/libcamera/py_color_space.cpp\nindex 5201121a79ca..fd5a5dabe597 100644\n--- a/src/py/libcamera/py_color_space.cpp\n+++ b/src/py/libcamera/py_color_space.cpp\n@@ -12,6 +12,8 @@\n #include <pybind11/pybind11.h>\n #include <pybind11/stl.h>\n \n+#include \"py_main.h\"\n+\n namespace py = pybind11;\n \n using namespace libcamera;\ndiff --git a/src/py/libcamera/py_controls_generated.cpp.in b/src/py/libcamera/py_controls_generated.cpp.in\nindex 8d282ce51856..26d5a104f209 100644\n--- a/src/py/libcamera/py_controls_generated.cpp.in\n+++ b/src/py/libcamera/py_controls_generated.cpp.in\n@@ -11,6 +11,8 @@\n \n #include <pybind11/pybind11.h>\n \n+#include \"py_main.h\"\n+\n namespace py = pybind11;\n \n class PyControls\ndiff --git a/src/py/libcamera/py_enums.cpp b/src/py/libcamera/py_enums.cpp\nindex e25689c674ef..ca6aeb868cbe 100644\n--- a/src/py/libcamera/py_enums.cpp\n+++ b/src/py/libcamera/py_enums.cpp\n@@ -9,6 +9,8 @@\n \n #include <pybind11/pybind11.h>\n \n+#include \"py_main.h\"\n+\n namespace py = pybind11;\n \n using namespace libcamera;\ndiff --git a/src/py/libcamera/py_formats_generated.cpp.in b/src/py/libcamera/py_formats_generated.cpp.in\nindex a3f7f94d525d..c5fb9063992c 100644\n--- a/src/py/libcamera/py_formats_generated.cpp.in\n+++ b/src/py/libcamera/py_formats_generated.cpp.in\n@@ -11,6 +11,8 @@\n \n #include <pybind11/pybind11.h>\n \n+#include \"py_main.h\"\n+\n namespace py = pybind11;\n \n class PyFormats\ndiff --git a/src/py/libcamera/py_geometry.cpp b/src/py/libcamera/py_geometry.cpp\nindex 5c2aeac483db..c7e303609427 100644\n--- a/src/py/libcamera/py_geometry.cpp\n+++ b/src/py/libcamera/py_geometry.cpp\n@@ -14,6 +14,8 @@\n #include <pybind11/pybind11.h>\n #include <pybind11/stl.h>\n \n+#include \"py_main.h\"\n+\n namespace py = pybind11;\n \n using namespace libcamera;\ndiff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\nindex bce082186a8b..ab33f38a8fb7 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -85,14 +85,6 @@ PYBIND11_DECLARE_HOLDER_TYPE(T, PyCameraSmartPtr<T>)\n */\n static std::weak_ptr<PyCameraManager> gCameraManager;\n \n-void init_py_color_space(py::module &m);\n-void init_py_controls_generated(py::module &m);\n-void init_py_enums(py::module &m);\n-void init_py_formats_generated(py::module &m);\n-void init_py_geometry(py::module &m);\n-void init_py_properties_generated(py::module &m);\n-void init_py_transform(py::module &m);\n-\n PYBIND11_MODULE(_libcamera, m)\n {\n \tinit_py_enums(m);\ndiff --git a/src/py/libcamera/py_main.h b/src/py/libcamera/py_main.h\nindex 5bb5f2d1b303..4d594326e212 100644\n--- a/src/py/libcamera/py_main.h\n+++ b/src/py/libcamera/py_main.h\n@@ -7,8 +7,18 @@\n \n #include <libcamera/base/log.h>\n \n+#include <pybind11/pybind11.h>\n+\n namespace libcamera {\n \n LOG_DECLARE_CATEGORY(Python)\n \n }\n+\n+void init_py_color_space(pybind11::module &m);\n+void init_py_controls_generated(pybind11::module &m);\n+void init_py_enums(pybind11::module &m);\n+void init_py_formats_generated(pybind11::module &m);\n+void init_py_geometry(pybind11::module &m);\n+void init_py_properties_generated(pybind11::module &m);\n+void init_py_transform(pybind11::module &m);\ndiff --git a/src/py/libcamera/py_properties_generated.cpp.in b/src/py/libcamera/py_properties_generated.cpp.in\nindex e3802b81a075..d28f1ab8b61a 100644\n--- a/src/py/libcamera/py_properties_generated.cpp.in\n+++ b/src/py/libcamera/py_properties_generated.cpp.in\n@@ -11,6 +11,8 @@\n \n #include <pybind11/pybind11.h>\n \n+#include \"py_main.h\"\n+\n namespace py = pybind11;\n \n class PyProperties\ndiff --git a/src/py/libcamera/py_transform.cpp b/src/py/libcamera/py_transform.cpp\nindex f3a0bfaf4fc5..768260ffccf0 100644\n--- a/src/py/libcamera/py_transform.cpp\n+++ b/src/py/libcamera/py_transform.cpp\n@@ -12,6 +12,8 @@\n #include <pybind11/pybind11.h>\n #include <pybind11/stl.h>\n \n+#include \"py_main.h\"\n+\n namespace py = pybind11;\n \n using namespace libcamera;\n", "prefixes": [ "04/10" ] }