update (and optimize) get_nearest_position and get_point calls

diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 153abe4affe58a0d8027f8d1a495fdbfc171c537..3d583b70950e2959efe7c8b6bdd466b369549558 100644 (file)
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -115,12 +115,16 @@ void Inkscape::ObjectSnapper::_snapPaths(Inkscape::SnappedPoint &s,
         NR::Matrix const i2doc = sp_item_i2doc_affine(*i);
         NR::Point const p_it = p_doc * i2doc.inverse();
 
+        Path *livarot_path = Path_for_item(*i, true, true);
+        if (livarot_path)
+            livarot_path->ConvertWithBackData(0.01);
+
         /* Look for the nearest position on this SPItem to our snap point */
-        NR::Maybe<Path::cut_position> const o = get_nearest_position_on_Path(*i, p_it);
+        NR::Maybe<Path::cut_position> const o = get_nearest_position_on_Path(livarot_path, p_it);
         if (o != NR::Nothing() && o.assume().t >= 0 && o.assume().t <= 1) {
 
             /* Convert the nearest point back to desktop coordinates */
-            NR::Point const o_it = get_point_on_Path(*i, o.assume().piece, o.assume().t);
+            NR::Point const o_it = get_point_on_Path(livarot_path, o.assume().piece, o.assume().t);
             NR::Point const o_dt = desktop->doc2dt(o_it * i2doc);
 
             NR::Coord const dist = NR::L2(o_dt - p);
@@ -128,6 +132,8 @@ void Inkscape::ObjectSnapper::_snapPaths(Inkscape::SnappedPoint &s,
                 s = SnappedPoint(o_dt, dist);
             }
         }
+
+        delete livarot_path;
     }
 
 }