2Geom sync - initial commit

(bzr r14059.2.1)

1 files changed, 5 insertions, 6 deletions

diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp
index 2c74af6d6..a681ad473 100644
--- a/src/live_effects/lpe-taperstroke.cpp
+++ b/src/live_effects/lpe-taperstroke.cpp
@@ -14,7 +14,6 @@
 #include "live_effects/lpe-taperstroke.h"
 
 #include <2geom/path.h>
-#include <2geom/shape.h>
 #include <2geom/path.h>
 #include <2geom/circle.h>
 #include <2geom/sbasis-to-bezier.h>
@@ -193,7 +192,7 @@ Piecewise<D2<SBasis> > stretch_along(Piecewise<D2<SBasis> > pwd2_in, Geom::Path
 Geom::PathVector LPETaperStroke::doEffect_path(Geom::PathVector const& path_in)
 {
     Geom::Path first_cusp = return_at_first_cusp(path_in[0]);
-    Geom::Path last_cusp = return_at_first_cusp(path_in[0].reverse());
+    Geom::Path last_cusp = return_at_first_cusp(path_in[0].reversed());
 
     bool zeroStart = false; // [distance from start taper knot -> start of path] == 0
     bool zeroEnd = false; // [distance from end taper knot -> end of path] == 0
@@ -317,7 +316,7 @@ Geom::PathVector LPETaperStroke::doEffect_path(Geom::PathVector const& path_in)
     
     if (!metInMiddle) {
         // append the inside outline of the path (against direction)
-        throwaway_path = half_outline(pathv_out[1].reverse(), fabs(line_width)/2., miter_limit, static_cast<LineJoinType>(join_type.get_value()));
+        throwaway_path = half_outline(pathv_out[1].reversed(), fabs(line_width)/2., miter_limit, static_cast<LineJoinType>(join_type.get_value()));
         
         if (!Geom::are_near(real_path.finalPoint(), throwaway_path.initialPoint()) && real_path.size() >= 1) {
             real_path.appendNew<Geom::LineSegment>(throwaway_path.initialPoint());
@@ -486,7 +485,7 @@ void KnotHolderEntityAttachBegin::knot_set(Geom::Point const &p, Geom::Point con
     Geom::Path p_in = return_at_first_cusp(pathv[0]);
     pwd2.concat(p_in.toPwSb());
 
-    double t0 = nearest_point(s, pwd2);
+    double t0 = nearest_time(s, pwd2);
     lpe->attach_start.param_set_value(t0);
 
     // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating.
@@ -511,10 +510,10 @@ void KnotHolderEntityAttachEnd::knot_set(Geom::Point const &p, Geom::Point const
         return;
     }
     Geom::PathVector pathv = lpe->pathvector_before_effect;
-    Geom::Path p_in = return_at_first_cusp(pathv[0].reverse());
+    Geom::Path p_in = return_at_first_cusp(pathv[0].reversed());
     Piecewise<D2<SBasis> > pwd2 = p_in.toPwSb();
     
-    double t0 = nearest_point(s, pwd2);
+    double t0 = nearest_time(s, pwd2);
     lpe->attach_end.param_set_value(t0);
 
     sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true);