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

libcamera: internal: Move Matrix class into libcamera namespace

Browse Source 
The Matrix class no longer lives inside lipipa. Move it into the
libcamera namespace to account for that.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Stefan Klug
2024-11-11 12:47:07 +01:00
parent 9d61c09462
commit 056a0fe0ab
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libcamera/internal/matrix.h
+5 -9
View File
@@ -19,8 +19,6 @@ namespace libcamera {
LOG_DECLARE_CATEGORY(Matrix)
namespace ipa {
#ifndef __DOXYGEN__
template<typename T, unsigned int Rows, unsigned int Cols,
std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr>
@@ -166,24 +164,22 @@ Matrix<T, Rows, Cols> operator+(const Matrix<T, Rows, Cols> &m1, const Matrix<T,
bool matrixValidateYaml(const YamlObject &obj, unsigned int size);
#endif /* __DOXYGEN__ */
} /* namespace ipa */
#ifndef __DOXYGEN__
template<typename T, unsigned int Rows, unsigned int Cols>
std::ostream &operator<<(std::ostream &out, const ipa::Matrix<T, Rows, Cols> &m)
std::ostream &operator<<(std::ostream &out, const Matrix<T, Rows, Cols> &m)
{
out << m.toString();
return out;
}
template<typename T, unsigned int Rows, unsigned int Cols>
struct YamlObject::Getter<ipa::Matrix<T, Rows, Cols>> {
std::optional<ipa::Matrix<T, Rows, Cols>> get(const YamlObject &obj) const
struct YamlObject::Getter<Matrix<T, Rows, Cols>> {
std::optional<Matrix<T, Rows, Cols>> get(const YamlObject &obj) const
{
if (!ipa::matrixValidateYaml(obj, Rows * Cols))
if (!matrixValidateYaml(obj, Rows * Cols))
return std::nullopt;
ipa::Matrix<T, Rows, Cols> matrix;
Matrix<T, Rows, Cols> matrix;
T *data = &matrix[0][0];
unsigned int i = 0;