Fix infinite loop as reported in bug #365034

[inkscape.git] / src / livarot / PathConversion.cpp

diff --git a/src/livarot/PathConversion.cpp b/src/livarot/PathConversion.cpp
index 16717e5bdcfd1382a6fb6815b01edaffec15f1f3..bf1e9c5c972d50c8eb25a2282299b92689b36592 100644 (file)
--- a/src/livarot/PathConversion.cpp
+++ b/src/livarot/PathConversion.cpp
@@ -439,7 +439,7 @@ void Path::Convert(NRRectL *area, double treshhold)
             curP = 0;
             curX[0] = curX[1] = 0;
         }
-        
+
         last_point_relation = POINT_RELATION_TO_AREA(curX, area);
         lastMoveTo = AddPoint(curX, true);
     }
@@ -464,7 +464,7 @@ void Path::Convert(NRRectL *area, double treshhold)
                 nextX = nData->p;
                 lastMoveTo = AddPoint(nextX, true);
                 descr_cmd[curP]->associated = lastMoveTo;
-                
+
                 last_point_relation = POINT_RELATION_TO_AREA(nextX, area);
                 start_elimination = false;
 
@@ -545,7 +545,7 @@ void Path::Convert(NRRectL *area, double treshhold)
                 } else {
                     start_elimination = false;
                 }
-                
+
                 if (!replace) {
                     RecCubicTo(curX, nData->start, nextX, nData->end, treshhold, 8);
                     descr_cmd[curP]->associated = AddPoint(nextX,false);
@@ -742,7 +742,7 @@ void Path::ConvertEvenLines(double treshhold)
                     Geom::Point nexcur;
                     nexcur = nextX - curX;
                     const double segL = Geom::L2(nexcur);
-                    if ( segL > treshhold ) {
+                    if ( (segL > treshhold) && (treshhold > 0) ) {
                         for (double i = treshhold; i < segL; i += treshhold) {
                             Geom::Point nX;
                             nX = (segL - i) * curX + i * nextX;
@@ -772,7 +772,7 @@ void Path::ConvertEvenLines(double treshhold)
                 nextX = nData->p;
                 Geom::Point nexcur = nextX - curX;
                 const double segL = L2(nexcur);
-                if ( segL > treshhold ) {
+                if ( (segL > treshhold) && (treshhold > 0)) {
                     for (double i = treshhold; i < segL; i += treshhold) {
                         Geom::Point nX = ((segL - i) * curX + i * nextX) / segL;
                         AddPoint(nX);