[{"id":31070,"web_url":"https://patchwork.libcamera.org/comment/31070/","msgid":"<20240902193428.GM1995@pendragon.ideasonboard.com>","date":"2024-09-02T19:34:28","subject":"Re: [PATCH v3 15/18] libcamera: libcamera: Formatting improvements","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Milan,\n\nThank you for the patch.\n\nOn Mon, Sep 02, 2024 at 05:42:08PM +0200, Milan Zamazal wrote:\n> The LSP autoformatter doesn't like some of the current formatting, let's\n> make it happier. Note that not all of its suggestions were accepted\n> because readability is preferred and adjusting .clang-format may not be\n> easy or possible.\n> \n> Signed-off-by: Milan Zamazal \n> ---\n> src/libcamera/controls.cpp | 2 +-\n> src/libcamera/ipa_data_serializer.cpp | 3 +--\n> src/libcamera/ipa_module.cpp | 4 ++--\n> src/libcamera/orientation.cpp | 12 ++++++++----\n> src/libcamera/process.cpp | 5 ++---\n> src/libcamera/sensor/camera_sensor.cpp | 6 +++---\n> src/libcamera/shared_mem_object.cpp | 4 ++--\n> src/libcamera/stream.cpp | 1 +\n> 8 files changed, 20 insertions(+), 17 deletions(-)\n> \n> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> index 67400797..dba74404 100644\n> --- a/src/libcamera/controls.cpp\n> +++ b/src/libcamera/controls.cpp\n> @@ -8,8 +8,8 @@\n> #include \n> \n> #include \n> -#include \n> #include \n> +#include \n> \n> #include \n> #include \n> diff --git a/src/libcamera/ipa_data_serializer.cpp b/src/libcamera/ipa_data_serializer.cpp\n> index f6dd7e6f..2189a246 100644\n> --- a/src/libcamera/ipa_data_serializer.cpp\n> +++ b/src/libcamera/ipa_data_serializer.cpp\n> @@ -539,7 +539,6 @@ IPADataSerializer::serialize(const SharedFD &data,\n> \tif (data.isValid())\n> \t\tfdVec.push_back(data);\n> \n> -\n> \treturn { dataVec, fdVec };\n> }\n> \n> @@ -606,7 +605,7 @@ IPADataSerializer::deserialize(std::vector::const_i\n> \tFrameBuffer::Plane ret;\n> \n> \tret.fd = IPADataSerializer::deserialize(dataBegin, dataBegin + 4,\n> -\t\t\t\t\t\t\t\tfdsBegin, fdsBegin + 1);\n> +\t\t\t\t\t\t\t fdsBegin, fdsBegin + 1);\n> \tret.offset = readPOD(dataBegin, 4, dataEnd);\n> \tret.length = readPOD(dataBegin, 8, dataEnd);\n> \n> diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp\n> index 86d88a86..9ca74be6 100644\n> --- a/src/libcamera/ipa_module.cpp\n> +++ b/src/libcamera/ipa_module.cpp\n> @@ -50,8 +50,8 @@ typename std::remove_extent_t *elfPointer(Span elf,\n> \tif (size > elf.size() || size < objSize)\n> \t\treturn nullptr;\n> \n> -\treturn reinterpret_cast *>\n> -\t\t(reinterpret_cast(elf.data()) + offset);\n> +\treturn reinterpret_cast *>(\n> +\t\treinterpret_cast(elf.data()) + offset);\n> }\n> \n> template\n> diff --git a/src/libcamera/orientation.cpp b/src/libcamera/orientation.cpp\n> index bf960249..7d7d21ae 100644\n> --- a/src/libcamera/orientation.cpp\n> +++ b/src/libcamera/orientation.cpp\n> @@ -101,10 +101,14 @@ std::ostream &operator<<(std::ostream &out, const Orientation &orientation)\n> {\n> \tconstexpr std::array orientationNames = {\n> \t\t\"\", /* Orientation starts counting from 1. */\n> -\t\t\"Rotate0\", \"Rotate0Mirror\",\n> -\t\t\"Rotate180\", \"Rotate180Mirror\",\n> -\t\t\"Rotate90Mirror\", \"Rotate270\",\n> -\t\t\"Rotate270Mirror\", \"Rotate90\",\n> +\t\t\"Rotate0\",\n> +\t\t\"Rotate0Mirror\",\n> +\t\t\"Rotate180\",\n> +\t\t\"Rotate180Mirror\",\n> +\t\t\"Rotate90Mirror\",\n> +\t\t\"Rotate270\",\n> +\t\t\"Rotate270Mirror\",\n> +\t\t\"Rotate90\",\n> \t};\n> \n> \tout << orientationNames[static_cast(orientation)];\n> diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp\n> index c0f4d49f..bc9833f4 100644\n> --- a/src/libcamera/process.cpp\n> +++ b/src/libcamera/process.cpp\n> @@ -188,7 +188,6 @@ const struct sigaction &ProcessManager::oldsa() const\n> \treturn oldsa_;\n> }\n> \n> -\n> /**\n> * \\class Process\n> * \\brief Process object\n> @@ -270,8 +269,8 @@ int Process::start(const std::string &path,\n> \t\tunsigned int len = args.size();\n> \t\targv[0] = path.c_str();\n> \t\tfor (unsigned int i = 0; i < len; i++)\n> -\t\t\targv[i+1] = args[i].c_str();\n> -\t\targv[len+1] = nullptr;\n> +\t\t\targv[i + 1] = args[i].c_str();\n> +\t\targv[len + 1] = nullptr;\n> \n> \t\texecv(path.c_str(), (char **)argv);\n> \n> diff --git a/src/libcamera/sensor/camera_sensor.cpp b/src/libcamera/sensor/camera_sensor.cpp\n> index 1382081a..4a990bb9 100644\n> --- a/src/libcamera/sensor/camera_sensor.cpp\n> +++ b/src/libcamera/sensor/camera_sensor.cpp\n> @@ -6,7 +6,6 @@\n> */\n> \n> #include \"libcamera/internal/camera_sensor.h\"\n> -#include \"libcamera/internal/media_device.h\"\n> \n> #include \n> #include \n> @@ -14,15 +13,16 @@\n> #include \n> #include \n> \n> +#include \n> +\n> #include \n> #include \n> #include \n> \n> -#include \n> -\n> #include \"libcamera/internal/bayer_format.h\"\n> #include \"libcamera/internal/camera_lens.h\"\n> #include \"libcamera/internal/camera_sensor_properties.h\"\n> +#include \"libcamera/internal/media_device.h\"\n> #include \"libcamera/internal/sysfs.h\"\n> \n> /**\n> diff --git a/src/libcamera/shared_mem_object.cpp b/src/libcamera/shared_mem_object.cpp\n> index 65b53919..d9b61d37 100644\n> --- a/src/libcamera/shared_mem_object.cpp\n> +++ b/src/libcamera/shared_mem_object.cpp\n> @@ -57,8 +57,8 @@ SharedMem::SharedMem() = default;\n> */\n> SharedMem::SharedMem(const std::string &name, std::size_t size)\n> {\n> -\tUniqueFD memfd = MemFd::create(name.c_str(), size, MemFd::Seal::Shrink |\n> -\t\t\t\t MemFd::Seal::Grow);\n> +\tUniqueFD memfd = MemFd::create(name.c_str(), size,\n> +\t\t\t\t MemFd::Seal::Shrink | MemFd::Seal::Grow);\n> \tif (!memfd.isValid())\n> \t\treturn;\n> \n> diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp\n> index 33018ec1..a254d2f6 100644\n> --- a/src/libcamera/stream.cpp\n> +++ b/src/libcamera/stream.cpp\n> @@ -19,6 +19,7 @@\n> #include \n> #include \n> \n> +#include \n\nThis duplicates the header instead of moving it. I'll fix this when\napplying.\n\nReviewed-by: Laurent Pinchart \n\n> \n> /**\n> * \\file stream.h","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 1A17ABF415\n\tfor ;\n\tMon, 2 Sep 2024 19:35:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3D54E634E4;\n\tMon, 2 Sep 2024 21:35:02 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 12127618FF\n\tfor ;\n\tMon, 2 Sep 2024 21:35:01 +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 897304CE;\n\tMon, 2 Sep 2024 21:33:49 +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=\"qiHSTTWx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1725305629;\n\tbh=OWTdOgirw7gMpNCCWIEYcvD9VSxkA8Ybg9HxBG8efLk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=qiHSTTWxrIHfoh8X5LjRhhYdR2wmeWAVtTMHLlPKN32ZyH5svPRwYvPKZJ2pVMofF\n\tTvZMBK1iyqpBa3P0b3BVuELpCrv0Ns3uDlM/z8ENeiB3xrJJTtY7Ek+bbVox9W7ivI\n\tPl0xEddQD7slDo/lZujDfu+jbfq3RTr3t8qYzOMs=","Date":"Mon, 2 Sep 2024 22:34:28 +0300","From":"Laurent Pinchart ","To":"Milan Zamazal ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v3 15/18] libcamera: libcamera: Formatting improvements","Message-ID":"<20240902193428.GM1995@pendragon.ideasonboard.com>","References":"<20240902154212.1281257-1-mzamazal@redhat.com>\n\t<20240902154212.1281257-16-mzamazal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240902154212.1281257-16-mzamazal@redhat.com>","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\" "}}]