diff options
| -rw-r--r-- | include/libcamera/internal/matrix.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/include/libcamera/internal/matrix.h b/include/libcamera/internal/matrix.h index a055e692..b9c3d41e 100644 --- a/include/libcamera/internal/matrix.h +++ b/include/libcamera/internal/matrix.h @@ -19,14 +19,11 @@ namespace libcamera { LOG_DECLARE_CATEGORY(Matrix) -#ifndef __DOXYGEN__ -template<typename T, unsigned int Rows, unsigned int Cols, - std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr> -#else template<typename T, unsigned int Rows, unsigned int Cols> -#endif /* __DOXYGEN__ */ class Matrix { + static_assert(std::is_arithmetic_v<T>, "Matrix type must be arithmetic"); + public: Matrix() { @@ -123,16 +120,10 @@ Matrix<U, Rows, Cols> operator*(const Matrix<U, Rows, Cols> &m, T d) return d * m; } -#ifndef __DOXYGEN__ -template<typename T, - unsigned int R1, unsigned int C1, - unsigned int R2, unsigned int C2, - std::enable_if_t<C1 == R2> * = nullptr> -#else -template<typename T, unsigned int R1, unsigned int C1, unsigned int R2, unsigned in C2> -#endif /* __DOXYGEN__ */ -Matrix<T, R1, C2> operator*(const Matrix<T, R1, C1> &m1, const Matrix<T, R2, C2> &m2) +template<typename T, unsigned int R1, unsigned int C1, unsigned int R2, unsigned int C2> +constexpr Matrix<T, R1, C2> operator*(const Matrix<T, R1, C1> &m1, const Matrix<T, R2, C2> &m2) { + static_assert(C1 == R2, "Matrix dimensions must match for multiplication"); Matrix<T, R1, C2> result; for (unsigned int i = 0; i < R1; i++) { |