diff --git a/src/Magnum/Math/Bezier.h b/src/Magnum/Math/Bezier.h index b3f1bda6a..c7bbdc19b 100644 --- a/src/Magnum/Math/Bezier.h +++ b/src/Magnum/Math/Bezier.h @@ -30,7 +30,7 @@ * @brief Class @ref Magnum::Math::Bezier */ -#include +#include #include "Vector.h" namespace Magnum { namespace Math { @@ -87,9 +87,9 @@ namespace Magnum { namespace Math { * @param t The interpolation factor * */ - std::vector>> calculateIntermediatePoints(Float t) const { + std::array, order + 1>, order + 1> calculateIntermediatePoints(Float t) const { const auto n = order + 1; - std::vector>> i_points(n,std::vector>(n)); + std::array, n>, n> i_points; for (UnsignedInt i = 0; i < n; ++i) { i_points[i][0] = _points[i]; } @@ -115,3 +115,4 @@ namespace Magnum { namespace Math { } #endif //Magnum_Math_Bezier_h + diff --git a/src/Magnum/Math/CMakeLists.txt b/src/Magnum/Math/CMakeLists.txt index c0d0990f5..d6783821f 100644 --- a/src/Magnum/Math/CMakeLists.txt +++ b/src/Magnum/Math/CMakeLists.txt @@ -25,7 +25,7 @@ set(MagnumMath_HEADERS Angle.h - Bezier.h + Bezier.h BoolVector.h Color.h Complex.h diff --git a/src/Magnum/Math/Test/BezierTest.cpp b/src/Magnum/Math/Test/BezierTest.cpp index 54fd303f2..cc2a3f5c0 100644 --- a/src/Magnum/Math/Test/BezierTest.cpp +++ b/src/Magnum/Math/Test/BezierTest.cpp @@ -24,6 +24,7 @@ */ #include +#include #include "Magnum/Math/Bezier.h" namespace Magnum { namespace Math { namespace Test {