From patchwork Mon Jul 20 14:59:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 27404 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 5A7F0C3306 for ; Mon, 20 Jul 2026 15:00:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 126DE67E80; Mon, 20 Jul 2026 17:00:01 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="YB2fttu5"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1282C67E4C for ; Mon, 20 Jul 2026 16:59:48 +0200 (CEST) Received: from [192.168.1.106] (mob-5-90-63-152.net.vodafone.it [5.90.63.152]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1E1091CE6; Mon, 20 Jul 2026 16:58:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1784559529; bh=yXwIPDDYuWnxiEQ7pfsAy2nzJEmWvfcuWcpTAAq3aio=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YB2fttu5HIUPxwdsxreNg5vHR1shh5Sfsfkcmv4n0gsNLKt3yQ/Oqz2I/dKdKqxNi GqkxeVEH2HdRIwYspNNDtYbig4gYZ9j5LdqHmJBDpOt5rBRWZ4Nmqn70goEdShA9Ui C2QoeR93I5q7H9+KF1+KSFiCR62QmuW7hVfgFaLM= From: Jacopo Mondi Date: Mon, 20 Jul 2026 16:59:30 +0200 Subject: [PATCH v6 12/31] ipa: libipa: lsc_polynomial: Don't inline ValueNode accessor MIME-Version: 1.0 Message-Id: <20260720-libipa-algorithms-v6-12-ececb73f97cb@ideasonboard.com> References: <20260720-libipa-algorithms-v6-0-ececb73f97cb@ideasonboard.com> In-Reply-To: <20260720-libipa-algorithms-v6-0-ececb73f97cb@ideasonboard.com> To: libcamera-devel@lists.libcamera.org, Stefan Klug , Milan Zamazal Cc: Jacopo Mondi , Laurent Pinchart , Kieran Bingham X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3022; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=gKG7oMvPdTnWPY3Xqu6aZDyF064c3RNYURQAJyWHzUw=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBqXjfVGg1sKi/VnboIm8dmzF/XpqZsProJZkwGP jWSmElYAKWJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCal431QAKCRByNAaPFqFW PBjQEACw2aSQV1RQPkJwqlf16apbO+/HCb1FXNDhXQZSdHpbjtCfjmTUBj/rkKgfcVNXLpP3CB5 UfkQjLRLSP4pC0jc5GSMABUtxKOOajXuIG5lchG4NpPMZWrFlqIHQhgXdnQ4Sk7l4SOrTcsO2Xr PTMRIL2vuIeUbwbyn6wLxQYdAdnMmkXTl4xE06IOk/xiS9EhgnwpntrJekjYyQgS8qLb49TcKY2 XUD9yWKDPIzfG1fvkL9ED10eskOm++2EXiNgmphTxdTz9WtLlEAJN+2KTeUIch4fgtb8i64+jyR udn5ERLYvDJnfvHIiZZ6riJLBM1MVowyScw6xPOgo6ZB/W8TMt7f0fSMWNsafWAs6jK6Eo/7uFG D6jSaIrd5j1pEBFlnRLG3aL9iV52AblE+BJ3N4jOAL6vWQ8yDfUF18w642BxgLsWUyC4ItYLqde 98bKxy1KeKAUGd/X3TGJ05vc2MQ0NkZpIdW3J4uAT4wxod7oFIr2Jzrryymw5PZEZtfyZ5tTZyH +29ESPe+EnLLzaOOyLQFifHCdQpKA+eAUP7c35Bzbm5C5fQuXJu08mpH1fcb5dMOrwTW5YVPERy jHr3ZSQnjH/1p8yPqpvh/U9wQtDWJHR6n53tmu9Luii1FitACl5EONgLzBssEDLTNTh/aOu/XwF BYD0tCEMUw1QBtA== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Laurent Pinchart There's no need to inline the ValueNode::Accessor::get() function for LscPolynomial. Move it to from lsc_polynomial.h to lsc_polynomial.cpp. While at it, replace C++-style comments with C-style comments according to the libcamera coding style. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi Signed-off-by: Jacopo Mondi --- src/ipa/libipa/lsc_polynomial.cpp | 28 ++++++++++++++++++++++++++-- src/ipa/libipa/lsc_polynomial.h | 26 -------------------------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/ipa/libipa/lsc_polynomial.cpp b/src/ipa/libipa/lsc_polynomial.cpp index f607d86c54c3..921af0b0bd13 100644 --- a/src/ipa/libipa/lsc_polynomial.cpp +++ b/src/ipa/libipa/lsc_polynomial.cpp @@ -77,5 +77,29 @@ namespace ipa { * \param size The size of the reference image */ -} // namespace ipa -} // namespace libcamera +} /* namespace ipa */ + +#ifndef __DOXYGEN__ +template<> +std::optional +ValueNode::Accessor::get(const ValueNode &obj) const +{ + std::optional cx = obj["cx"].get(); + std::optional cy = obj["cy"].get(); + std::optional k0 = obj["k0"].get(); + std::optional k1 = obj["k1"].get(); + std::optional k2 = obj["k2"].get(); + std::optional k3 = obj["k3"].get(); + std::optional k4 = obj["k4"].get(); + + if (!(cx && cy && k0 && k1 && k2 && k3 && k4)) { + LOG(LscPolynomial, Error) + << "Polynomial is missing a parameter"; + return std::nullopt; + } + + return ipa::LscPolynomial(*cx, *cy, *k0, *k1, *k2, *k3, *k4); +} +#endif /* __DOXYGEN__ */ + +} /* namespace libcamera */ diff --git a/src/ipa/libipa/lsc_polynomial.h b/src/ipa/libipa/lsc_polynomial.h index a0d27c4b21d6..d52ec86946b1 100644 --- a/src/ipa/libipa/lsc_polynomial.h +++ b/src/ipa/libipa/lsc_polynomial.h @@ -80,30 +80,4 @@ private: } /* namespace ipa */ -#ifndef __DOXYGEN__ - -template<> -struct ValueNode::Accessor { - std::optional get(const ValueNode &obj) const - { - std::optional cx = obj["cx"].get(); - std::optional cy = obj["cy"].get(); - std::optional k0 = obj["k0"].get(); - std::optional k1 = obj["k1"].get(); - std::optional k2 = obj["k2"].get(); - std::optional k3 = obj["k3"].get(); - std::optional k4 = obj["k4"].get(); - - if (!(cx && cy && k0 && k1 && k2 && k3 && k4)) { - LOG(LscPolynomial, Error) - << "Polynomial is missing a parameter"; - return std::nullopt; - } - - return ipa::LscPolynomial(*cx, *cy, *k0, *k1, *k2, *k3, *k4); - } -}; - -#endif - } /* namespace libcamera */