diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-01 01:42:13 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-03-01 01:42:13 +0000 |
| commit | 145f815859ba21f45e67d315e52f360f029355c7 (patch) | |
| tree | 54448bc60a94415f63f7b6f46296c8d5e2ac58a6 /src/2geom/circle.cpp | |
| parent | Improve fill rule and add mass option (diff) | |
| parent | type in commit r14664 (diff) | |
| download | inkscape-145f815859ba21f45e67d315e52f360f029355c7.tar.gz inkscape-145f815859ba21f45e67d315e52f360f029355c7.zip | |
update to trunk
(bzr r14648.1.3)
Diffstat (limited to 'src/2geom/circle.cpp')
| -rw-r--r-- | src/2geom/circle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/2geom/circle.cpp b/src/2geom/circle.cpp index 553981a72..934a8d3ab 100644 --- a/src/2geom/circle.cpp +++ b/src/2geom/circle.cpp @@ -144,7 +144,7 @@ bool Circle::contains(Circle const &other) const bool Circle::intersects(Line const &l) const { // http://mathworld.wolfram.com/Circle-LineIntersection.html - Coord dr = l.versor().length(); + Coord dr = l.vector().length(); Coord r = _radius; Coord D = cross(l.initialPoint(), l.finalPoint()); Coord delta = r*r * dr*dr - D*D; @@ -163,9 +163,9 @@ bool Circle::intersects(Circle const &other) const std::vector<ShapeIntersection> Circle::intersect(Line const &l) const { // http://mathworld.wolfram.com/Circle-LineIntersection.html - Coord dr = l.versor().length(); - Coord dx = l.versor().x(); - Coord dy = l.versor().y(); + Coord dr = l.vector().length(); + Coord dx = l.vector().x(); + Coord dy = l.vector().y(); Coord D = cross(l.initialPoint() - _center, l.finalPoint() - _center); Coord delta = _radius*_radius * dr*dr - D*D; |