update to trunk

(bzr r13645.1.106)

7 files changed, 12 insertions, 21 deletions

diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index a5bb1741c..ab7ba6b4e 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -3,7 +3,6 @@ set(live_effects_SRC
 	lpe-angle_bisector.cpp
 	lpe-attach-path.cpp
 	lpe-bendpath.cpp
-	lpe-boolops.cpp
 	lpe-bounding-box.cpp
 	lpe-bspline.cpp
 	lpe-circle_3pts.cpp
@@ -81,7 +80,6 @@ set(live_effects_SRC
 	lpe-angle_bisector.h
 	lpe-attach-path.h
 	lpe-bendpath.h
-	lpe-boolops.h
 	lpe-bounding-box.h
 	lpe-bspline.h
 	lpe-circle_3pts.h
diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp
index 6ce912bcb..f90d67d4e 100644
--- a/src/live_effects/lpe-powerstroke.cpp
+++ b/src/live_effects/lpe-powerstroke.cpp
@@ -49,7 +49,7 @@ static boost::optional<Point> intersection_point( Point const & origin_a, Point
 {
     Coord denom = cross(vector_a, vector_b);
     if (!are_near(denom,0.)){
-        Coord t = (cross(origin_b, vector_a) + cross(origin_b, vector_b)) / denom;
+        Coord t = (cross(vector_b, origin_a) + cross(origin_b, vector_b)) / denom;
         return origin_a + t * vector_a;
     }
     return boost::none;
diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp
index 573c8a2fd..d9de6e77f 100644
--- a/src/live_effects/lpeobject-reference.cpp
+++ b/src/live_effects/lpeobject-reference.cpp
@@ -43,14 +43,7 @@ LPEObjectReference::~LPEObjectReference(void)
 bool LPEObjectReference::_acceptObject(SPObject * const obj) const
 {
     if (IS_LIVEPATHEFFECT(obj)) {
-        SPObject * const owner = getOwner();
-        /* Refuse references to us or to an ancestor. */
-        for ( SPObject *iter = owner ; iter ; iter = iter->parent ) {
-            if ( iter == obj ) {
-                return false;
-            }
-        }
-        return true;
+        return URIReference::_acceptObject(obj);
     } else {
         return false;
     }
diff --git a/src/live_effects/parameter/path-reference.cpp b/src/live_effects/parameter/path-reference.cpp
index a76fb1b32..42589b050 100644
--- a/src/live_effects/parameter/path-reference.cpp
+++ b/src/live_effects/parameter/path-reference.cpp
@@ -22,7 +22,7 @@ bool PathReference::_acceptObject(SPObject * const obj) const
             return false;
         }
         // TODO: check whether the referred path has this LPE applied, if so: deny deny deny!
-        return true;
+        return URIReference::_acceptObject(obj);
     } else {
         return false;
     }
diff --git a/src/live_effects/spiro-converters.cpp b/src/live_effects/spiro-converters.cpp
index 3c7bdf99e..f116d5256 100644
--- a/src/live_effects/spiro-converters.cpp
+++ b/src/live_effects/spiro-converters.cpp
@@ -64,7 +64,11 @@ ConverterSPCurve::curveto(double x1, double y1, double x2, double y2, double x3,
 }

 

 

-

+ConverterPath::ConverterPath(Geom::Path &path)

+    : _path(path)

+{

+    _path.setStitching(true);

+}

 

 void

 ConverterPath::moveto(double x, double y, bool is_open)

diff --git a/src/live_effects/spiro-converters.h b/src/live_effects/spiro-converters.h
index 83f6ebbc3..90855d2d6 100644
--- a/src/live_effects/spiro-converters.h
+++ b/src/live_effects/spiro-converters.h
@@ -25,7 +25,7 @@ class ConverterSPCurve : public ConverterBase {
 public:
     ConverterSPCurve(SPCurve &curve)
         : _curve(curve)
-    {} ;
+    {}
 
     virtual void moveto(double x, double y, bool is_open);
     virtual void lineto(double x, double y);
@@ -45,9 +45,7 @@ private:
  */
 class ConverterPath : public ConverterBase {
 public:
-    ConverterPath(Geom::Path &path)
-        : _path(path)
-    {} ;
+    ConverterPath(Geom::Path &path);
 
     virtual void moveto(double x, double y, bool is_open);
     virtual void lineto(double x, double y);
diff --git a/src/live_effects/spiro.h b/src/live_effects/spiro.h
index 0d85da74b..066b44ca8 100644
--- a/src/live_effects/spiro.h
+++ b/src/live_effects/spiro.h
@@ -25,11 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #define INKSCAPE_SPIRO_H
 
 #include "live_effects/spiro-converters.h"
+#include <2geom/forward.h>
 
 class SPCurve;
-namespace Geom {
-    class Path;
-}
 
 namespace Spiro {
 
@@ -53,4 +51,4 @@ double get_knot_th(const spiro_seg *s, int i);
 
 } // namespace Spiro
 
-#endif // INKSCAPE_SPIRO_H
\ No newline at end of file
+#endif // INKSCAPE_SPIRO_H