diff --git a/src/snapped-curve.h b/src/snapped-curve.h
index 28908c42ffddd103b344bcd6db666a588e8d2303..8414c10eb8839889159816787351637d909e5622 100644 (file)
--- a/src/snapped-curve.h
+++ b/src/snapped-curve.h
{\r
public:\r
SnappedCurve();\r
- SnappedCurve(NR::Point const &snapped_point, NR::Coord const &snapped_distance, NR::Coord const &snapped_tolerance, bool const &always_snap, Geom::Curve const *curve);\r
+ SnappedCurve(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, Geom::Coord const &snapped_tolerance, bool const &always_snap, bool const &fully_constrained, Geom::Curve const *curve);\r
~SnappedCurve();\r
- Inkscape::SnappedPoint intersect(SnappedCurve const &curve, NR::Point const &p) const; //intersect with another SnappedCurve\r
- \r
+ Inkscape::SnappedPoint intersect(SnappedCurve const &curve, Geom::Point const &p, Geom::Matrix dt2doc) const; //intersect with another SnappedCurve\r
+\r
private:\r
Geom::Curve const *_curve;\r
};\r
}\r
\r
bool getClosestCurve(std::list<Inkscape::SnappedCurve> const &list, Inkscape::SnappedCurve &result);\r
-bool getClosestIntersectionCS(std::list<Inkscape::SnappedCurve> const &list, NR::Point const &p, Inkscape::SnappedPoint &result);\r
+bool getClosestIntersectionCS(std::list<Inkscape::SnappedCurve> const &list, Geom::Point const &p, Inkscape::SnappedPoint &result, Geom::Matrix dt2doc);\r
\r
\r
#endif /* !SEEN_SNAPPEDCURVE_H */\r