[{"id":32273,"web_url":"https://patchwork.libcamera.org/comment/32273/","msgid":"<20241119110746.GJ31681@pendragon.ideasonboard.com>","date":"2024-11-19T11:07:46","subject":"Re: [PATCH v2 3/9] libcamera: internal: Move Matrix class into\n\tlibcamera namespace","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Stefan,\n\nThank you for the patch.\n\nOn Tue, Nov 19, 2024 at 11:37:30AM +0100, Stefan Klug wrote:\n> The Matrix class no longer lives inside lipipa. Move it into the\n> libcamera namespace to account for that.\n> \n> Signed-off-by: Stefan Klug \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> include/libcamera/internal/matrix.h | 14 +++++---------\n> src/libcamera/matrix.cpp | 6 +-----\n> 2 files changed, 6 insertions(+), 14 deletions(-)\n> \n> diff --git a/include/libcamera/internal/matrix.h b/include/libcamera/internal/matrix.h\n> index 5471e6975b74..3701d0ee980b 100644\n> --- a/include/libcamera/internal/matrix.h\n> +++ b/include/libcamera/internal/matrix.h\n> @@ -19,8 +19,6 @@ namespace libcamera {\n> \n> LOG_DECLARE_CATEGORY(Matrix)\n> \n> -namespace ipa {\n> -\n> #ifndef __DOXYGEN__\n> template \t std::enable_if_t> * = nullptr>\n> @@ -166,24 +164,22 @@ Matrix operator+(const Matrix &m1, const Matrix bool matrixValidateYaml(const YamlObject &obj, unsigned int size);\n> #endif /* __DOXYGEN__ */\n> \n> -} /* namespace ipa */\n> -\n> #ifndef __DOXYGEN__\n> template\n> -std::ostream &operator<<(std::ostream &out, const ipa::Matrix &m)\n> +std::ostream &operator<<(std::ostream &out, const Matrix &m)\n> {\n> \tout << m.toString();\n> \treturn out;\n> }\n> \n> template\n> -struct YamlObject::Getter> {\n> -\tstd::optional> get(const YamlObject &obj) const\n> +struct YamlObject::Getter> {\n> +\tstd::optional> get(const YamlObject &obj) const\n> \t{\n> -\t\tif (!ipa::matrixValidateYaml(obj, Rows * Cols))\n> +\t\tif (!matrixValidateYaml(obj, Rows * Cols))\n> \t\t\treturn std::nullopt;\n> \n> -\t\tipa::Matrix matrix;\n> +\t\tMatrix matrix;\n> \t\tT *data = &matrix[0][0];\n> \n> \t\tunsigned int i = 0;\n> diff --git a/src/libcamera/matrix.cpp b/src/libcamera/matrix.cpp\n> index 8346f0d34160..55359aa206ee 100644\n> --- a/src/libcamera/matrix.cpp\n> +++ b/src/libcamera/matrix.cpp\n> @@ -5,7 +5,7 @@\n> * Matrix and related operations\n> */\n> \n> -#include \"matrix.h\"\n> +#include \"libcamera/internal/matrix.h\"\n> \n> #include \n> \n> @@ -18,8 +18,6 @@ namespace libcamera {\n> \n> LOG_DEFINE_CATEGORY(Matrix)\n> \n> -namespace ipa {\n> -\n> /**\n> * \\class Matrix\n> * \\brief Matrix class\n> @@ -144,6 +142,4 @@ bool matrixValidateYaml(const YamlObject &obj, unsigned int size)\n> }\n> #endif /* __DOXYGEN__ */\n> \n> -} /* namespace ipa */\n> -\n> } /* namespace libcamera */","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 1A247C326B\n\tfor ;\n\tTue, 19 Nov 2024 11:07:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C575E65F03;\n\tTue, 19 Nov 2024 12:07:56 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 88B4565EFC\n\tfor ;\n\tTue, 19 Nov 2024 12:07:55 +0100 (CET)","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 15D1F22E;\n\tTue, 19 Nov 2024 12:07:38 +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=\"lN3Q0j0J\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1732014458;\n\tbh=Y15DdHFQ4ZzVKYYR+fH37y9uprJSDLlmoxMhjM+p9IA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=lN3Q0j0JdK5LV56zg8C35Xu6yAaR6cDWOv77zMdyjEw0LBVfu+gZII+x7/XfZkT5M\n\t3hQsfsCeinNuLf8VWOiri7IqBII1cJSVNImoACSTonwVPHkHpLaBk1BAhVugG0QvyW\n\twgSI/8ROh3jVtZ5iRMtSQPMbwk6WTbX/9yPoXnS0=","Date":"Tue, 19 Nov 2024 13:07:46 +0200","From":"Laurent Pinchart ","To":"Stefan Klug ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v2 3/9] libcamera: internal: Move Matrix class into\n\tlibcamera namespace","Message-ID":"<20241119110746.GJ31681@pendragon.ideasonboard.com>","References":"<20241119103740.1919807-1-stefan.klug@ideasonboard.com>\n\t<20241119103740.1919807-4-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20241119103740.1919807-4-stefan.klug@ideasonboard.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\" "}}]