From patchwork Wed Jul 8 09:24:58 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 27276 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 B5036C3301 for ; Wed, 8 Jul 2026 09:25:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D3549660B7; Wed, 8 Jul 2026 11:25:20 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="TlRqLiFW"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7EFF96608F for ; Wed, 8 Jul 2026 11:25:08 +0200 (CEST) Received: from [192.168.1.182] (93-46-82-201.ip106.fastwebnet.it [93.46.82.201]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C1D5F1D27; Wed, 8 Jul 2026 11:24:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1783502658; bh=rYGOyJqlg6KGcH57Gl0nXxGuPBsSavnxemzwwosWMBY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TlRqLiFWgWYiWQ+o/7ETV/dMYO7FUikq0uve9FALG1pHGDQA0XDr8m2hKapuxWRCK +edz+peWTDeOh+Iz9S7Z0vEpLXOtEhbDRzbvZuCdwvyhLVTzatPKKrQZQr0OQmsbw7 +jrwrcer77V8WFtOsey4+O9icODMN1+qox8TDR+g= From: Jacopo Mondi Date: Wed, 08 Jul 2026 11:24:58 +0200 Subject: [PATCH v4 11/35] ipa: libipa: lsc_polynomial: Don't inline ValueNode accessor MIME-Version: 1.0 Message-Id: <20260708-libipa-algorithms-v4-11-f0e99f035294@ideasonboard.com> References: <20260708-libipa-algorithms-v4-0-f0e99f035294@ideasonboard.com> In-Reply-To: <20260708-libipa-algorithms-v4-0-f0e99f035294@ideasonboard.com> To: libcamera-devel@lists.libcamera.org, Stefan Klug Cc: Jacopo Mondi , Laurent Pinchart , Kieran Bingham X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2952; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=BEf1W1AyI5E5rj0wvDTXSlHFS7EeY8EQyX6MdqC3noI=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBqThdtS6mkGIhgjjlkvAyPgbi6XgJ8eSKAs7JRs Vuhvx8yjhiJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCak4XbQAKCRByNAaPFqFW PJhKD/0TGZPWugWM8278SR+XI2eh6mAkSHzU5Iy4ZoGje3NTWKji6VLdm45UNkjotARtz+IvS59 yYRwVqnUivJ4+XUPavwwFKVAYhxp5KLuf1g/sq9eKwDoWU/WQvoex/mibZ2Y2RMFriXTXcocFJY fEkww0MPO3esfy57DxX3oU+z/fgG1bKyEf5f0SjvziCS+/7sytB60HaZaU85vtAXqqyUgxFeV9C PvBPAAWEloRPRaEgLkqkVRyakwZpwcTkQOlphc+B2UAGYiie102E6sFlpHpdSjPb3cIIlEXgLyM 7z2kxHlscFc0VMFhfkCW2UEYUM7D+R7JnfMubetsfd/iYHsogogV3pz30uroxSM73/hqjr7wceb e3ShG7CdAEhBe6/FDxVSgraNekmXgqmm1jJx5mGU4f0q9eqe7SxdmX9WdsHv4j5WyAFUmsRPc0z sYgAAvpv+B5IXL8+Q4LFvE4O6s/DEe+3uCToxpHxJQA69n5Fol5O5wRR30CcNjviQGy5bum81pC b2sfDnkaXoKbJ0mBGUT0POWjpVIAzHop6bAjr4elHXA+BhUN8sBaK2JCHCTVZjg2QCnFAnXbf1E XdzpaiuOK1/+LulXmGJ9Ov+LIaxJSyYojuv78Omd9Ky7jkmgt24UyUAYsU76C/aT3wyVuQKZykr 1FCdv5lim/nQoAQ== 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 | 26 ++++++++++++++++++++++++-- src/ipa/libipa/lsc_polynomial.h | 24 ------------------------ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/ipa/libipa/lsc_polynomial.cpp b/src/ipa/libipa/lsc_polynomial.cpp index f607d86c54c3..00569c2fd160 100644 --- a/src/ipa/libipa/lsc_polynomial.cpp +++ b/src/ipa/libipa/lsc_polynomial.cpp @@ -77,5 +77,27 @@ 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 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 d7d9ae42e360..d52ec86946b1 100644 --- a/src/ipa/libipa/lsc_polynomial.h +++ b/src/ipa/libipa/lsc_polynomial.h @@ -80,28 +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 ipa::LscPolynomial(*cx, *cy, *k0, *k1, *k2, *k3, *k4); - } -}; - -#endif - } /* namespace libcamera */