From c8ec8ac8c5a3665adf39b1a939404027395ace0e Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Sun, 13 Feb 2011 21:06:36 +0100 Subject: update to latest 2geom. fixes bezier curve casts. (bzr r10050) --- src/2geom/numeric/fitting-model.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/2geom/numeric') diff --git a/src/2geom/numeric/fitting-model.h b/src/2geom/numeric/fitting-model.h index b1ecbe92c..a44c1ddac 100644 --- a/src/2geom/numeric/fitting-model.h +++ b/src/2geom/numeric/fitting-model.h @@ -470,12 +470,13 @@ class LFMBezier // this model generates Bezier curves -class LFMBezierCurve - : public LinearFittingModel< double, Point, BezierCurve > +template +class LFMBezierCurveN + : public LinearFittingModel< double, Point, BezierCurveN > { public: - LFMBezierCurve( size_t _order ) - : mob(_order) + LFMBezierCurveN() + : mob(degree+1) { } @@ -489,13 +490,13 @@ class LFMBezierCurve return mob.size(); } - void instance(BezierCurve & bc, ConstMatrixView const& raw_data) const + void instance(BezierCurveN & bc, ConstMatrixView const& raw_data) const { - Bezier bx(size()-1); - Bezier by(size()-1); + Bezier bx(degree); + Bezier by(degree); mob.instance(bx, raw_data.column_const_view(X)); mob.instance(by, raw_data.column_const_view(Y)); - bc = BezierCurve(bx, by); + bc = BezierCurveN(bx, by); } private: -- cgit v1.2.3