diff --git a/matrix/Matrix.hpp b/matrix/Matrix.hpp index 2fcfce321a..5c59593318 100644 --- a/matrix/Matrix.hpp +++ b/matrix/Matrix.hpp @@ -341,7 +341,7 @@ public: { Matrix &self = *this; for (size_t i = 0; i < M; i++) { - self(i, j) = col(i, 1); + self(i, j) = col(i, 0); } } diff --git a/test/matrixAssignment.cpp b/test/matrixAssignment.cpp index 7ff4a41a78..4d2ccb0b95 100644 --- a/test/matrixAssignment.cpp +++ b/test/matrixAssignment.cpp @@ -78,8 +78,14 @@ int main() TEST(fabs(m5(0,0) - s) < 1e-5); Matrix m6; - m6.setRow(0, Vector2f(1, 1)); - m6.setCol(0, Vector2f(1, 1)); + m6.setRow(0, Vector2f(1, 2)); + float m7_array[] = {1,2,0,0}; + Matrix m7(m7_array); + TEST(isEqual(m6, m7)); + m6.setCol(0, Vector2f(3, 4)); + float m8_array[] = {3,2,4,0}; + Matrix m8(m8_array); + TEST(isEqual(m6, m8)); return 0; }