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

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

14
include/libcamera/internal/matrix.h
View file

@ -19,8 +19,6 @@ namespace libcamera {
LOG_DECLARE_CATEGORY(Matrix) LOG_DECLARE_CATEGORY(Matrix)
namespace ipa {
#ifndef __DOXYGEN__ #ifndef __DOXYGEN__
template<typename T, unsigned int Rows, unsigned int Cols, template<typename T, unsigned int Rows, unsigned int Cols,
std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr> 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); bool matrixValidateYaml(const YamlObject &obj, unsigned int size);
#endif /* __DOXYGEN__ */ #endif /* __DOXYGEN__ */
} /* namespace ipa */
#ifndef __DOXYGEN__ #ifndef __DOXYGEN__
template<typename T, unsigned int Rows, unsigned int Cols> 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(); out << m.toString();
return out; return out;
} }
template<typename T, unsigned int Rows, unsigned int Cols> template<typename T, unsigned int Rows, unsigned int Cols>
struct YamlObject::Getter<ipa::Matrix<T, Rows, Cols>> { struct YamlObject::Getter<Matrix<T, Rows, Cols>> {
std::optional<ipa::Matrix<T, Rows, Cols>> get(const YamlObject &obj) const 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; return std::nullopt;
ipa::Matrix<T, Rows, Cols> matrix; Matrix<T, Rows, Cols> matrix;
T *data = &matrix[0][0]; T *data = &matrix[0][0];
unsigned int i = 0; unsigned int i = 0;

6
src/libcamera/matrix.cpp
View file

@ -5,7 +5,7 @@
* Matrix and related operations * Matrix and related operations
*/ */
#include "matrix.h" #include "libcamera/internal/matrix.h"
#include <libcamera/base/log.h> #include <libcamera/base/log.h>
@ -18,8 +18,6 @@ namespace libcamera {
LOG_DEFINE_CATEGORY(Matrix) LOG_DEFINE_CATEGORY(Matrix)
namespace ipa {
/** /**
* \class Matrix * \class Matrix
* \brief Matrix class * \brief Matrix class
@ -144,6 +142,4 @@ bool matrixValidateYaml(const YamlObject &obj, unsigned int size)
} }
#endif /* __DOXYGEN__ */ #endif /* __DOXYGEN__ */
} /* namespace ipa */
} /* namespace libcamera */ } /* namespace libcamera */