merge from trunk (r12224)

(bzr r11668.1.60)

2 files changed, 2 insertions, 25 deletions

diff --git a/src/live_effects/lpe-dynastroke.cpp b/src/live_effects/lpe-dynastroke.cpp
index a5295d269..30ca5e2d6 100644
--- a/src/live_effects/lpe-dynastroke.cpp
+++ b/src/live_effects/lpe-dynastroke.cpp
@@ -26,30 +26,6 @@
 
 namespace Inkscape {
 namespace LivePathEffect {
-
-//----------------------------------------------------------
-//--- TODO: Test this and move to 2Geom --------------------
-//----------------------------------------------------------
-
-static
-std::vector<double> 
-find_corners (Geom::Piecewise<Geom::D2<Geom::SBasis> > const &m){
-    using namespace Geom;
-    std::vector<double> output = std::vector<double>();
-    Piecewise<D2<SBasis> > v = derivative(m);
-    for (unsigned i=0; i<m.size()-1; i++){
-        if ( m.segs[i].at1() == m.segs[i+1].at0() && 
-             v.segs[i].at1() != v.segs[i+1].at0()){
-            output.push_back(m.cuts[i+1]);
-        }
-    }
-    return output;
-}
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-//----------------------------------------------------------
-
 //TODO: growfor/fadefor can be expressed in unit of width.
 //TODO: make round/sharp end choices independant for start and end.
 //TODO: define more styles like in calligtool.
diff --git a/src/live_effects/lpe-recursiveskeleton.cpp b/src/live_effects/lpe-recursiveskeleton.cpp
index 452139344..ac571d963 100644
--- a/src/live_effects/lpe-recursiveskeleton.cpp
+++ b/src/live_effects/lpe-recursiveskeleton.cpp
@@ -91,7 +91,8 @@ LPERecursiveSkeleton::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > co
             double scaling = (uskeleton.domain().extent() - toffset)/pattBndsX->extent();
 
             // TODO investigate why pattWidth is not being used:
-            double pattWidth = pattBndsX->extent() * scaling;
+            // - Doesn't appear to have been used anywhere in bzr history (Alex V: 2013-03-16)
+            // double pattWidth = pattBndsX->extent() * scaling;
 
             if (scaling != 1.0) {
                 x*=scaling;