@@ -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<ipa::LscPolynomial>
+ValueNode::Accessor<ipa::LscPolynomial>::get(const ValueNode &obj) const
+{
+ std::optional<double> cx = obj["cx"].get<double>();
+ std::optional<double> cy = obj["cy"].get<double>();
+ std::optional<double> k0 = obj["k0"].get<double>();
+ std::optional<double> k1 = obj["k1"].get<double>();
+ std::optional<double> k2 = obj["k2"].get<double>();
+ std::optional<double> k3 = obj["k3"].get<double>();
+ std::optional<double> k4 = obj["k4"].get<double>();
+
+ 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 */
@@ -80,28 +80,4 @@ private:
} /* namespace ipa */
-#ifndef __DOXYGEN__
-
-template<>
-struct ValueNode::Accessor<ipa::LscPolynomial> {
- std::optional<ipa::LscPolynomial> get(const ValueNode &obj) const
- {
- std::optional<double> cx = obj["cx"].get<double>();
- std::optional<double> cy = obj["cy"].get<double>();
- std::optional<double> k0 = obj["k0"].get<double>();
- std::optional<double> k1 = obj["k1"].get<double>();
- std::optional<double> k2 = obj["k2"].get<double>();
- std::optional<double> k3 = obj["k3"].get<double>();
- std::optional<double> k4 = obj["k4"].get<double>();
-
- 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 */
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 <laurent.pinchart@ideasonboard.com> --- src/ipa/libipa/lsc_polynomial.cpp | 26 ++++++++++++++++++++++++-- src/ipa/libipa/lsc_polynomial.h | 24 ------------------------ 2 files changed, 24 insertions(+), 26 deletions(-) base-commit: bd266aa3405d3aea20b407b27e52482b02146030