PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: yaml_parser: Rename Getter to Accessor

Browse Source 
In preparation for support to set the value of a YamlObject, rename the
Getter structure to Accessor. The structure will be extended with a
set() function.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Isaac Scott <isaac.scott@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2025-10-17 21:53:34 +03:00
parent c6aace4467
commit 56e679ee09
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libcamera/internal/matrix.h
View File

@@ -200,7 +200,7 @@ std::ostream &operator<<(std::ostream &out, const Matrix<T, Rows, Cols> &m)
}
template<typename T, unsigned int Rows, unsigned int Cols>
struct YamlObject::Getter<Matrix<T, Rows, Cols>> {
struct YamlObject::Accessor<Matrix<T, Rows, Cols>> {
std::optional<Matrix<T, Rows, Cols>> get(const YamlObject &obj) const
{
if (!matrixValidateYaml(obj, Rows * Cols))

2
include/libcamera/internal/vector.h
View File

@@ -347,7 +347,7 @@ std::ostream &operator<<(std::ostream &out, const Vector<T, Rows> &v)
}
template<typename T, unsigned int Rows>
struct YamlObject::Getter<Vector<T, Rows>> {
struct YamlObject::Accessor<Vector<T, Rows>> {
std::optional<Vector<T, Rows>> get(const YamlObject &obj) const
{
if (!vectorValidateYaml(obj, Rows))

6
include/libcamera/internal/yaml_parser.h
View File

@@ -173,7 +173,7 @@ public:
template<typename T>
std::optional<T> get() const
{
return Getter<T>{}.get(*this);
return Accessor<T>{}.get(*this);
}
template<typename T, typename U>
@@ -213,7 +213,7 @@ private:
LIBCAMERA_DISABLE_COPY_AND_MOVE(YamlObject)
template<typename T>
friend struct Getter;
friend struct Accessor;
friend class YamlParserContext;
enum class Type {
@@ -224,7 +224,7 @@ private:
};
template<typename T, typename Enable = void>
struct Getter {
struct Accessor {
std::optional<T> get(const YamlObject &obj) const;
};

2
src/ipa/libipa/lsc_polynomial.h
View File

@@ -81,7 +81,7 @@ private:
#ifndef __DOXYGEN__
template<>
struct YamlObject::Getter<ipa::LscPolynomial> {
struct YamlObject::Accessor<ipa::LscPolynomial> {
std::optional<ipa::LscPolynomial> get(const YamlObject &obj) const
{
std::optional<double> cx = obj["cx"].get<double>();

2
src/ipa/libipa/pwl.cpp
View File

@@ -435,7 +435,7 @@ std::string Pwl::toString() const
*/
template<>
std::optional<ipa::Pwl>
YamlObject::Getter<ipa::Pwl>::get(const YamlObject &obj) const
YamlObject::Accessor<ipa::Pwl>::get(const YamlObject &obj) const
{
/* Treat a single value as single point PWL. */
if (obj.isValue()) {

24
src/libcamera/yaml_parser.cpp
View File

@@ -134,7 +134,7 @@ std::size_t YamlObject::size() const
template<>
std::optional<bool>
YamlObject::Getter<bool>::get(const YamlObject &obj) const
YamlObject::Accessor<bool>::get(const YamlObject &obj) const
{
if (obj.type_ != Type::Value)
return std::nullopt;
@@ -148,7 +148,7 @@ YamlObject::Getter<bool>::get(const YamlObject &obj) const
}
template<typename T>
struct YamlObject::Getter<T, std::enable_if_t<
struct YamlObject::Accessor<T, std::enable_if_t<
std::is_same_v<int8_t, T> ||
std::is_same_v<uint8_t, T> ||
std::is_same_v<int16_t, T> ||
@@ -173,23 +173,23 @@ struct YamlObject::Getter<T, std::enable_if_t<
}
};
template struct YamlObject::Getter<int8_t>;
template struct YamlObject::Getter<uint8_t>;
template struct YamlObject::Getter<int16_t>;
template struct YamlObject::Getter<uint16_t>;
template struct YamlObject::Getter<int32_t>;
template struct YamlObject::Getter<uint32_t>;
template struct YamlObject::Accessor<int8_t>;
template struct YamlObject::Accessor<uint8_t>;
template struct YamlObject::Accessor<int16_t>;
template struct YamlObject::Accessor<uint16_t>;
template struct YamlObject::Accessor<int32_t>;
template struct YamlObject::Accessor<uint32_t>;
template<>
std::optional<float>
YamlObject::Getter<float>::get(const YamlObject &obj) const
YamlObject::Accessor<float>::get(const YamlObject &obj) const
{
return obj.get<double>();
}
template<>
std::optional<double>
YamlObject::Getter<double>::get(const YamlObject &obj) const
YamlObject::Accessor<double>::get(const YamlObject &obj) const
{
if (obj.type_ != Type::Value)
return std::nullopt;
@@ -210,7 +210,7 @@ YamlObject::Getter<double>::get(const YamlObject &obj) const
template<>
std::optional<std::string>
YamlObject::Getter<std::string>::get(const YamlObject &obj) const
YamlObject::Accessor<std::string>::get(const YamlObject &obj) const
{
if (obj.type_ != Type::Value)
return std::nullopt;
@@ -220,7 +220,7 @@ YamlObject::Getter<std::string>::get(const YamlObject &obj) const
template<>
std::optional<Size>
YamlObject::Getter<Size>::get(const YamlObject &obj) const
YamlObject::Accessor<Size>::get(const YamlObject &obj) const
{
if (obj.type_ != Type::List)
return std::nullopt;