diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2011-02-13 20:06:36 +0000 |
|---|---|---|
| committer | Johan Engelen <goejendaagh@zonnet.nl> | 2011-02-13 20:06:36 +0000 |
| commit | c8ec8ac8c5a3665adf39b1a939404027395ace0e (patch) | |
| tree | 9c53b646d227da2a44460fb13d6016843049f7f7 /src/2geom/numeric | |
| parent | calligraphy tool does not need to know the type of the end curves to add the ... (diff) | |
| download | inkscape-c8ec8ac8c5a3665adf39b1a939404027395ace0e.tar.gz inkscape-c8ec8ac8c5a3665adf39b1a939404027395ace0e.zip | |
update to latest 2geom. fixes bezier curve casts.
(bzr r10050)
Diffstat (limited to 'src/2geom/numeric')
| -rw-r--r-- | src/2geom/numeric/fitting-model.h | 17 |
1 files changed, 9 insertions, 8 deletions
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 <unsigned degree> +class LFMBezierCurveN + : public LinearFittingModel< double, Point, BezierCurveN<degree> > { 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<degree> & 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<degree>(bx, by); } private: |