From patchwork Wed Jul 8 15:50:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 27320 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 89E91C3323 for ; Wed, 8 Jul 2026 15:51:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CD46E660EF; Wed, 8 Jul 2026 17:51:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="SriVvzXI"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B3C5B660B9 for ; Wed, 8 Jul 2026 17:51:15 +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 D4CB01E3A; Wed, 8 Jul 2026 17:50:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1783525826; bh=yXwIPDDYuWnxiEQ7pfsAy2nzJEmWvfcuWcpTAAq3aio=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SriVvzXIznAtE6Z/itvzyuHPyAj2LBM/JL7tDx7ADH15I/NkeBcs7oc5Ojs3VOny2 ExY3DdtjHU4VIEIoXGg3ChSvk2HqgJpWh98YoVy0fQsVhcys3L1vUkaVKVmJ477N6a 66VwTE97y+v85Fx6ufuTZfZquZw/DbltWFjatOrw= From: Jacopo Mondi Date: Wed, 08 Jul 2026 17:50:54 +0200 Subject: [PATCH v5 12/36] ipa: libipa: lsc_polynomial: Don't inline ValueNode accessor MIME-Version: 1.0 Message-Id: <20260708-libipa-algorithms-v5-12-0759d0359f52@ideasonboard.com> References: <20260708-libipa-algorithms-v5-0-0759d0359f52@ideasonboard.com> In-Reply-To: <20260708-libipa-algorithms-v5-0-0759d0359f52@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=3022; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=gKG7oMvPdTnWPY3Xqu6aZDyF064c3RNYURQAJyWHzUw=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBqTnHkbCSP2ITtLCo8waEz3hDkkk0TOZLUc76pt D+ccNv2f5yJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCak5x5AAKCRByNAaPFqFW PGcJD/wPrWSHFrQNrcFw4Pe9H6wrIX9s7Qt6G8ez14AdtcrnAZfp426zI32ut7bLLmoq4Kv033F hmZ2O6jKoz7OcrZ4Ql8HBSbXryAb2r8dkekZpXPk590Juxb0Oyjsi993D05sU9nPHScyogf1RiL MOgymCEftazvb5o2K5gBTnWuffBAGNQCr00MkwVjrk0RgRt4vH5bZm3IP84vIo7pnMF81adIDw1 5M4GimxyAHKx4PnFotk/humBbjDTgXzLYnzzIOf2/aEvG2luEPihAiX0MO9hekiHmAIfQlucHi7 zBN9FHwL+1BKeO2FrRqVaR9zrrM1VujO+phwlu0MYrkom6eqsZg6M8sh6gRKRF0hFNTl558egxH LAFnLCMmKfx60BHd1hhYXPN3lmyyEGUaDr89GwofjJpbah4gIK+41ZKepLe7oK4Fim2OdW59MKM J3TBE/eEn5CVSPKpmXqhP1WZkRRNM0KkyI9d/KQbMN7sGgg8ulCI8rxhol/qrKBrSwiiqKMPYrw vacuLZvvtTF3tDlEFEtDJfQ+Ukpmp/lzhvxJCOfCHXbZVVB7hy2o0PYr1bIFAoDRgzVmtyCIKeb g06U7w37k7lT7BjJ7FPJ3rvAU2IfyOXGIQzZYtAZz7IkttlygKjWn+xRJycSQG9wU4Z0vFRuse8 YCUDzDuSuz5ZtNg== 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 */