From 7201350d40601daaa99930be2554c5811eba23b0 Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Fri, 20 Jan 2017 18:52:27 +0100
Subject: Fix bug 1657591. Crash on ungrouping in v0.92. A unnecesary call to
 update path effect hook the crash, not sure why but this call is unnecesary
 so I remove it

Fixed bugs:
  - https://launchpad.net/bugs/1657591

(bzr r15424)
---
 src/live_effects/lpe-patternalongpath.cpp | 1 -
 src/live_effects/parameter/vector.cpp     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/live_effects')

diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index c1853ef22..f404afe17 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -264,7 +264,6 @@ LPEPatternAlongPath::transform_multiply(Geom::Affine const& postmul, bool set)
         pattern.param_transform_multiply(postmul, set);
         pattern.write_to_SVG();
     }
-    sp_lpe_item_update_patheffect (sp_lpe_item, false, true);
 }
 
 void
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index aa16a2b98..55b4d4b32 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -116,7 +116,7 @@ VectorParam::set_and_write_new_values(Geom::Point const &new_origin, Geom::Point
 void
 VectorParam::param_transform_multiply(Geom::Affine const& postmul, bool /*set*/)
 {
-        set_and_write_new_values( origin * postmul, vector * postmul.withoutTranslation() );
+    set_and_write_new_values( origin * postmul, vector * postmul.withoutTranslation() );
 }
 
 
-- 
cgit v1.2.3


From 8884e1097b5b5c11d9653ff1c9e4d9148fa579dd Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Fri, 20 Jan 2017 19:07:28 +0100
Subject: Fix bug 1622388. Insane memory leak and crash with pattern along path

Fixed bugs:
  - https://launchpad.net/bugs/1622388

(bzr r15425)
---
 src/live_effects/lpe-patternalongpath.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/live_effects')

diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index f404afe17..966e9020e 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -11,6 +11,7 @@
 #include <2geom/bezier-to-sbasis.h>
 
 #include "knotholder.h"
+#include <cmath>
 #include <algorithm>
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
@@ -161,7 +162,7 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
         //        spacing.param_set_range(-pattBndsX.extent()*.9, Geom::infinity());
         //    }
 
-        y0+=noffset;
+        y0 += noffset;
 
         std::vector<Geom::Piecewise<Geom::D2<Geom::SBasis> > > paths_in;
         paths_in = split_at_discontinuities(pwd2_in);
@@ -197,7 +198,7 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
                     
                 case PAPCT_REPEATED_STRETCHED:
                     // if uskeleton is closed:
-                    if(path_i.segs.front().at0() == path_i.segs.back().at1()){
+                    if (are_near(path_i.segs.front().at0(), path_i.segs.back().at1())){
                         nbCopies = std::max(1, static_cast<int>(std::floor((uskeleton.domain().extent() - toffset)/(pattBndsX->extent()+xspace))));
                         pattBndsX = Interval(pattBndsX->min(),pattBndsX->max()+xspace);
                         scaling = (uskeleton.domain().extent() - toffset)/(((double)nbCopies)*pattBndsX->extent());
@@ -213,11 +214,13 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
                     return pwd2_in;
             };
             
+            //Ceil to 6 decimals
+            scaling = ceil(scaling * 1000000) / 1000000;
             double pattWidth = pattBndsX->extent() * scaling;
             
-            x*=scaling;
+            x *= scaling;
             if ( scale_y_rel.get_value() ) {
-                y*=(scaling * prop_scale);
+                y *= prop_scale * scaling;
             } else {
                 y *= prop_scale;
             }
@@ -235,7 +238,7 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
                 offs+=pattWidth;
             }
         }
-        if (fuse_tolerance > 0){        
+        if (fuse_tolerance > 0){
             pre_output = fuse_nearby_ends(pre_output, fuse_tolerance);
             for (unsigned i=0; i<pre_output.size(); i++){
                 output.concat(pre_output[i]);
-- 
cgit v1.2.3


From 208465e82f5563f6b2c7821dc41ed186bf61b87e Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Sat, 21 Jan 2017 17:02:50 +0100
Subject: Fixes typos in strings. Some typos in Inkscape 0.92 LPE UI

Fixed bugs:
  - https://launchpad.net/bugs/1622731

(bzr r15427)
---
 src/live_effects/lpe-perspective-envelope.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/live_effects')

diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp
index e0dac0687..18b5b724d 100644
--- a/src/live_effects/lpe-perspective-envelope.cpp
+++ b/src/live_effects/lpe-perspective-envelope.cpp
@@ -379,7 +379,7 @@ LPEPerspectiveEnvelope::newWidget()
                         hbox_down_handles->pack_start(*widg, true, true, 2);
                     }
                     if (tip) {
-                        widg->set_tooltip_text(*tip);
+                        widg->set_tooltip_markup(*tip);
                     } else {
                         widg->set_tooltip_text("");
                         widg->set_has_tooltip(false);
-- 
cgit v1.2.3