NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: yaml_parser: Add get() specializations for 16-bit integers

Browse source 
Extend the YamlObject::get() function template to support 16-bit
integers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Han-Lin Chen <hanlinchen@chromium.org>
This commit is contained in:
Laurent Pinchart 2022-05-25 01:58:14 +03:00
parent 839c4a5a48
commit c7d260c03a
2 changed files with 63 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/internal/yaml_parser.h
View file

@ -156,6 +156,8 @@ public:
typename std::enable_if_t<
std::is_same_v<bool, T> ||
std::is_same_v<double, T> ||
std::is_same_v<int16_t, T> ||
std::is_same_v<uint16_t, T> ||
std::is_same_v<int32_t, T> ||
std::is_same_v<uint32_t, T> ||
std::is_same_v<std::string, T> ||

61
src/libcamera/yaml_parser.cpp
View file

@ -138,6 +138,67 @@ bool YamlObject::get(const bool &defaultValue, bool *ok) const
return defaultValue;
}
template<>
int16_t YamlObject::get(const int16_t &defaultValue, bool *ok) const
{
setOk(ok, false);
if (type_ != Type::Value)
return defaultValue;
if (value_ == "")
return defaultValue;
char *end;
errno = 0;
int16_t value = std::strtol(value_.c_str(), &end, 10);
if ('\0' != *end || errno == ERANGE ||
value < std::numeric_limits<int16_t>::min() ||
value > std::numeric_limits<int16_t>::max())
return defaultValue;
setOk(ok, true);
return value;
}
template<>
uint16_t YamlObject::get(const uint16_t &defaultValue, bool *ok) const
{
setOk(ok, false);
if (type_ != Type::Value)
return defaultValue;
if (value_ == "")
return defaultValue;
/*
* libyaml parses all scalar values as strings. When a string has
* leading spaces before a minus sign, for example " -10", strtoul
* skips leading spaces, accepts the leading minus sign, and the
* calculated digits are negated as if by unary minus. Rule it out in
* case the user gets a large number when the value is negative.
*/
std::size_t found = value_.find_first_not_of(" \t");
if (found != std::string::npos && value_[found] == '-')
return defaultValue;
char *end;
errno = 0;
uint16_t value = std::strtoul(value_.c_str(), &end, 10);
if ('\0' != *end || errno == ERANGE ||
value < std::numeric_limits<uint16_t>::min() ||
value > std::numeric_limits<uint16_t>::max())
return defaultValue;
setOk(ok, true);
return value;
}
template<>
int32_t YamlObject::get(const int32_t &defaultValue, bool *ok) const
{