[{"id":30071,"web_url":"https://patchwork.libcamera.org/comment/30071/","msgid":"<171930435832.403337.14020408158768952663@ping.linuxembedded.co.uk>","date":"2024-06-25T08:32:38","subject":"Re: [PATCH 04/10] py: libcamera: Move function declarations to\n\tcommon header","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2024-06-24 20:29:35)\n> The init_py_*() functions are called by the top-level entry point of the\n> libcamera Python module to initialize different parts of the bindings.\n> They are declared in py_main.cpp where they are called, and defined in\n> separate compilation units. This results in functions being defined\n> without a corresponding declaration, and will generate warnings when we\n> enable -Wmissing-declarations.\n> \n> Fix this by moving the function declarations from py_main.c to\n> py_main.h, and including py_main.h in the various compilation units that\n> need it.\n> \n\nLooks easy enough...\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \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(-)\n> \n> diff --git a/src/py/libcamera/py_color_space.cpp b/src/py/libcamera/py_color_space.cpp\n> index 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 \n> #include \n> \n> +#include \"py_main.h\"\n> +\n> namespace py = pybind11;\n> \n> using namespace libcamera;\n> diff --git a/src/py/libcamera/py_controls_generated.cpp.in b/src/py/libcamera/py_controls_generated.cpp.in\n> index 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 \n> \n> +#include \"py_main.h\"\n> +\n> namespace py = pybind11;\n> \n> class PyControls\n> diff --git a/src/py/libcamera/py_enums.cpp b/src/py/libcamera/py_enums.cpp\n> index 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 \n> \n> +#include \"py_main.h\"\n> +\n> namespace py = pybind11;\n> \n> using namespace libcamera;\n> diff --git a/src/py/libcamera/py_formats_generated.cpp.in b/src/py/libcamera/py_formats_generated.cpp.in\n> index 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 \n> \n> +#include \"py_main.h\"\n> +\n> namespace py = pybind11;\n> \n> class PyFormats\n> diff --git a/src/py/libcamera/py_geometry.cpp b/src/py/libcamera/py_geometry.cpp\n> index 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 \n> #include \n> \n> +#include \"py_main.h\"\n> +\n> namespace py = pybind11;\n> \n> using namespace libcamera;\n> diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\n> index 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)\n> */\n> static std::weak_ptr 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> init_py_enums(m);\n> diff --git a/src/py/libcamera/py_main.h b/src/py/libcamera/py_main.h\n> index 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 \n> \n> +#include \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);\n> diff --git a/src/py/libcamera/py_properties_generated.cpp.in b/src/py/libcamera/py_properties_generated.cpp.in\n> index 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 \n> \n> +#include \"py_main.h\"\n> +\n> namespace py = pybind11;\n> \n> class PyProperties\n> diff --git a/src/py/libcamera/py_transform.cpp b/src/py/libcamera/py_transform.cpp\n> index 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 \n> #include \n> \n> +#include \"py_main.h\"\n> +\n> namespace py = pybind11;\n> \n> using namespace libcamera;\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","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 6DD60BD87C\n\tfor ;\n\tTue, 25 Jun 2024 08:32:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 71102654A9;\n\tTue, 25 Jun 2024 10:32:43 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6E133619E8\n\tfor ;\n\tTue, 25 Jun 2024 10:32:41 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EA57EBEB;\n\tTue, 25 Jun 2024 10:32:18 +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=\"mB34bQxR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719304339;\n\tbh=f/YLW/vLkhjpAc0zvAib5I/LjYqrS3Hyek2WUVDnXfs=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=mB34bQxRswLiY9adpLp4IlrgkfrCl7fLYgIOknu56J6gPOBZs9yy8rcieFukAtVQn\n\tIWkz4yVQD9xEL+7aqaigw7R+MYabSuptD1UXTTR2MLEkQoMMbBME4Z4CYKWPVqMHNo\n\tbyCLCgxvu4iwb7OhKPuwctAfgmX34EnBMMrmtkeU=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240624192941.22943-5-laurent.pinchart@ideasonboard.com>","References":"<20240624192941.22943-1-laurent.pinchart@ideasonboard.com>\n\t<20240624192941.22943-5-laurent.pinchart@ideasonboard.com>","Subject":"Re: [PATCH 04/10] py: libcamera: Move function declarations to\n\tcommon header","From":"Kieran Bingham ","Cc":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 25 Jun 2024 09:32:38 +0100","Message-ID":"<171930435832.403337.14020408158768952663@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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\" "}}]