diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2011-08-21 10:15:37 +0000 |
|---|---|---|
| committer | Johan Engelen <goejendaagh@zonnet.nl> | 2011-08-21 10:15:37 +0000 |
| commit | 3091b61045fd1196591cf3befbff45441dd5a4a8 (patch) | |
| tree | 99ccee0e0cfc36221966a0d9d840da609c82605a /src | |
| parent | DBUS. Merging lp:~joakim-verona/inkscape/dbus-fixes changes. (diff) | |
| download | inkscape-3091b61045fd1196591cf3befbff45441dd5a4a8.tar.gz inkscape-3091b61045fd1196591cf3befbff45441dd5a4a8.zip | |
fix copy edit bug in axislinesegment
Fixed bugs:
- https://launchpad.net/bugs/813829
(bzr r10560)
Diffstat (limited to 'src')
| -rw-r--r-- | src/2geom/hvlinesegment.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/2geom/hvlinesegment.h b/src/2geom/hvlinesegment.h index 05252468e..d2b9d6310 100644 --- a/src/2geom/hvlinesegment.h +++ b/src/2geom/hvlinesegment.h @@ -1,4 +1,4 @@ -/** +/** * \file * \brief Horizontal and vertical line segment *//* @@ -96,14 +96,13 @@ public: } virtual Point pointAt(Coord t) const { if ( t < 0 || t > 1 ) - THROW_RANGEERROR("HLineSegment: Time value out of range"); - Coord x = initialPoint()[axis] + t * (finalPoint()[axis] - initialPoint()[axis]); - Point ret(x, initialPoint()[other_axis]); + THROW_RANGEERROR("AxisLineSegment: Time value out of range"); + Point ret = initialPoint() + t * (finalPoint() - initialPoint()); return ret; } virtual Coord valueAt(Coord t, Dim2 d) const { if ( t < 0 || t > 1 ) - THROW_RANGEERROR("HLineSegment: Time value out of range"); + THROW_RANGEERROR("AxisLineSegment: Time value out of range"); if (d != axis) return initialPoint()[other_axis]; return initialPoint()[axis] + t * (finalPoint()[axis] - initialPoint()[axis]); } @@ -111,8 +110,8 @@ public: std::vector<Point> result; result.push_back(pointAt(t)); if (n > 0) { - Coord x = finalPoint()[axis] - initialPoint()[axis]; - result.push_back( Point(x, 0) ); + Point der = finalPoint() - initialPoint(); + result.push_back( der ); } if (n > 1) { /* higher order derivatives are zero, |