From b7c026006efcc5461dcef0f3c9a5e1b87d162d3d Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Wed, 2 Apr 2014 17:33:37 -0400
Subject: Hopefully remove the last of the exception throwing with certain path
 effects

(bzr r13090.1.43)
---
 src/live_effects/pathoutlineprovider.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/live_effects/pathoutlineprovider.cpp')

diff --git a/src/live_effects/pathoutlineprovider.cpp b/src/live_effects/pathoutlineprovider.cpp
index ad39a7416..56f741417 100644
--- a/src/live_effects/pathoutlineprovider.cpp
+++ b/src/live_effects/pathoutlineprovider.cpp
@@ -250,17 +250,21 @@ void extrapolate_curves(Geom::Path& path_builder, Geom::Curve* cbc1, Geom::Curve
             }
             Geom::EllipticalArc *arc0 = circle1.arc(cbc1->finalPoint(), 0.5*(cbc1->finalPoint()+sol), sol, true);
             Geom::EllipticalArc *arc1 = circle2.arc(sol, 0.5*(sol+endPt), endPt, true);
+            try {
+                if (arc0) {
+                    path_builder.append (arc0->toSBasis());
+                    delete arc0;
+                    arc0 = NULL;
+                }
 
-            if (arc0) {
-                path_builder.append (arc0->toSBasis());
-                delete arc0;
-                arc0 = NULL;
-            }
-
-            if (arc1) {
-                path_builder.append (arc1->toSBasis());
-                delete arc1;
-                arc1 = NULL;
+                if (arc1) {
+                    path_builder.append (arc1->toSBasis());
+                    delete arc1;
+                    arc1 = NULL;
+                }
+            } catch (std::exception ex) {
+                printf("Exception occured, probably NaN or infinite valued points: %s\n", ex.what());
+                path_builder.appendNew<Geom::LineSegment>(endPt);
             }
         } else {
             boost::optional <Geom::Point> p = intersection_point (cbc1->finalPoint(), tang1,
-- 
cgit v1.2.3