[v2,04/17] libcamera: vector: Add a Span based constructor
diff mbox series

Message ID 20250319161152.63625-5-stefan.klug@ideasonboard.com
State New
Headers show
Series
  • Some rkisp1 awb improvements
Related show

Commit Message

Stefan Klug March 19, 2025, 4:11 p.m. UTC 
Now that Matrix has a Span based constructor, add the same for Vector.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>

---

Changes in v2:
- Added this patch
---
 include/libcamera/internal/vector.h | 12 ++++++++----
 src/libcamera/vector.cpp            |  8 ++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/internal/vector.h b/include/libcamera/internal/vector.h
index a67a09474204..66cc5ac988c2 100644
--- a/include/libcamera/internal/vector.h
+++ b/include/libcamera/internal/vector.h
@@ -40,10 +40,14 @@  public:
 		data_.fill(scalar);
 	}
 
-	constexpr Vector(const std::array<T, Rows> &data)
+	Vector(const std::array<T, Rows> &data)
 	{
-		for (unsigned int i = 0; i < Rows; i++)
-			data_[i] = data[i];
+		std::copy(data.begin(), data.end(), data_.begin());
+	}
+
+	Vector(const Span<const T, Rows> &data)
+	{
+		std::copy(data.begin(), data.end(), data_.begin());
 	}
 
 	const T &operator[](size_t i) const
@@ -285,7 +289,7 @@  private:
 		return *this;
 	}
 
-	std::array<T, Rows> data_;
+	std::array<T, Rows> data_{};
 };
 
 template<typename T>
diff --git a/src/libcamera/vector.cpp b/src/libcamera/vector.cpp
index 85ca2208245a..435f2fc62f8b 100644
--- a/src/libcamera/vector.cpp
+++ b/src/libcamera/vector.cpp
@@ -44,6 +44,14 @@  LOG_DEFINE_CATEGORY(Vector)
  * The size of \a data must be equal to the dimension size Rows of the vector.
  */
 
+/**
+ * \fn Vector::Vector(const Span<const T, Rows> &data)
+ * \brief Construct vector from supplied data
+ * \param data Data from which to construct a vector
+ *
+ * The size of \a data must be equal to the dimension size Rows of the vector.
+ */
+
 /**
  * \fn T Vector::operator[](size_t i) const
  * \brief Index to an element in the vector