From 971ef4214070c37a0a09d7bc9e194fd94279e5c3 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sun, 17 Jun 2012 00:24:54 -0700
Subject: Removed unneeded header style filename #defines

(bzr r11503)
---
 src/live_effects/lpe-bendpath.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/live_effects/lpe-bendpath.cpp')

diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 2d6bbeb22..3732ae3ef 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -1,5 +1,3 @@
-#define INKSCAPE_LPE_BENDPATH_CPP
-
 /*
  * Copyright (C) Johan Engelen 2007 <j.b.c.engelen@utwente.nl>
  * Copyright (C) Steren Giannini 2008 <steren.giannini@gmail.com>
-- 
cgit v1.2.3


From a70c7514a9dd5fc8d5eabe486141dfd259d2ed55 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Thu, 17 Jan 2013 20:00:40 +0100
Subject: more const happiness (and removal of duplicate code in sp-object.h)

(bzr r12038)
---
 src/live_effects/lpe-bendpath.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/live_effects/lpe-bendpath.cpp')

diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 3732ae3ef..59fd145d1 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -123,7 +123,7 @@ LPEBendPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
 }
 
 void
-LPEBendPath::resetDefaults(SPItem * item)
+LPEBendPath::resetDefaults(SPItem const* item)
 {
     Effect::resetDefaults(item);
 
-- 
cgit v1.2.3


From bf58d4cb9c86682d1416c64378d1cfc8a95554e8 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Thu, 17 Jan 2013 21:02:50 +0100
Subject: const ....

(bzr r12039)
---
 src/live_effects/lpe-bendpath.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/live_effects/lpe-bendpath.cpp')

diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 59fd145d1..49660c91b 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -72,7 +72,7 @@ LPEBendPath::~LPEBendPath()
 }
 
 void
-LPEBendPath::doBeforeEffect (SPLPEItem *lpeitem)
+LPEBendPath::doBeforeEffect (SPLPEItem const* lpeitem)
 {
     // get the item bounding box
     original_bbox(lpeitem);
-- 
cgit v1.2.3


From 4847a7f261731ebbd9396d56c12244f721b006d7 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Mon, 1 Jul 2013 23:05:45 +0200
Subject: LPE bend path: fix crash on "uskeleton.cuts.back()" because of empty
 uskeleton.

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

(bzr r12398)
---
 src/live_effects/lpe-bendpath.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/live_effects/lpe-bendpath.cpp')

diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 49660c91b..eaf9fe4a6 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -94,6 +94,10 @@ LPEBendPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
         bend_path.changed = false;
     }
 
+    if (uskeleton.empty()) {
+        return pwd2_in;  /// \todo or throw an exception instead? might be better to throw an exception so that the UI can display an error message or smth
+    }
+
     D2<Piecewise<SBasis> > patternd2 = make_cuts_independent(pwd2_in);
     Piecewise<SBasis> x = vertical_pattern.get_value() ? Piecewise<SBasis>(patternd2[1]) : Piecewise<SBasis>(patternd2[0]);
     Piecewise<SBasis> y = vertical_pattern.get_value() ? Piecewise<SBasis>(patternd2[0]) : Piecewise<SBasis>(patternd2[1]);
@@ -105,9 +109,9 @@ LPEBendPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
     x-= bboxHorizontal.min();
     y-= bboxVertical.middle();
 
-  double scaling = uskeleton.cuts.back()/bboxHorizontal.extent();
+    double scaling = uskeleton.cuts.back()/bboxHorizontal.extent();
 
-  if (scaling != 1.0) {
+    if (scaling != 1.0) {
         x*=scaling;
     }
 
@@ -117,7 +121,6 @@ LPEBendPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
         if (prop_scale != 1.0) y *= prop_scale;
     }
 
-
     Piecewise<D2<SBasis> > output = compose(uskeleton,x) + y*compose(n,x);
     return output;
 }
-- 
cgit v1.2.3