diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2008-12-30 18:19:04 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2008-12-30 18:19:04 +0000 |
| commit | c59557d2dc0fd9f2a0945e776e90b1db3ee25ff7 (patch) | |
| tree | b495e65d27d7cb350a786db5bc2661b07ee48ebc | |
| parent | Remove utest. (diff) | |
| download | inkscape-c59557d2dc0fd9f2a0945e776e90b1db3ee25ff7.tar.gz inkscape-c59557d2dc0fd9f2a0945e776e90b1db3ee25ff7.zip | |
Remove some obsolete from_2geom() calls
(bzr r7043)
| -rw-r--r-- | src/object-snapper.cpp | 2 | ||||
| -rw-r--r-- | src/snap.cpp | 2 | ||||
| -rw-r--r-- | src/snapped-curve.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index b43d13e20..c03a7c288 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -491,7 +491,7 @@ void Inkscape::ObjectSnapper::_snapPaths(SnappedConstraints &sc, if (!being_edited || (c1 && c2)) { Geom::Coord const dist = Geom::distance(sp_doc, p_doc); if (dist < getSnapperTolerance()) { - sc.curves.push_back(Inkscape::SnappedCurve(from_2geom(sp_dt), dist, getSnapperTolerance(), getSnapperAlwaysSnap(), false, curve)); + sc.curves.push_back(Inkscape::SnappedCurve(sp_dt, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), false, curve)); } } } diff --git a/src/snap.cpp b/src/snap.cpp index ac2f1321c..a6c4b8729 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -204,7 +204,7 @@ Geom::Point SnapManager::multipleOfGridPitch(Geom::Point const &t) const // will use the grid snapper. Simply snapping the value t to the grid will do, but // only if the origin of the grid is at (0,0). If it's not then compensate for this // in the translation t - Geom::Point const t_offset = from_2geom(t) + grid->origin; + Geom::Point const t_offset = t + grid->origin; SnappedConstraints sc; // Only the first three parameters are being used for grid snappers snapper->freeSnap(sc, Inkscape::SnapPreferences::SNAPPOINT_NODE, t_offset, TRUE, Geom::OptRect(), NULL, NULL); diff --git a/src/snapped-curve.cpp b/src/snapped-curve.cpp index fa2d561cd..50bc83648 100644 --- a/src/snapped-curve.cpp +++ b/src/snapped-curve.cpp @@ -86,7 +86,7 @@ Inkscape::SnappedPoint Inkscape::SnappedCurve::intersect(SnappedCurve const &cur // TODO: Investigate whether it is possible to use document coordinates everywhere // in the snapper code. Only the mouse position should be in desktop coordinates, I guess. // All paths are already in document coords and we are certainly not going to change THAT. - return SnappedPoint(from_2geom(best_p), Inkscape::SNAPTARGET_PATH_INTERSECTION, primaryDist, primaryC->getTolerance(), primaryC->getAlwaysSnap(), true, true, + return SnappedPoint(best_p, Inkscape::SNAPTARGET_PATH_INTERSECTION, primaryDist, primaryC->getTolerance(), primaryC->getAlwaysSnap(), true, true, secondaryDist, secondaryC->getTolerance(), secondaryC->getAlwaysSnap()); } |
