From: Emden R. Gansner <erg@emdenrg.net>
Date: Mon, 11 Jan 2016 19:59:49 +0000 (-0500)
Subject: Fix edge drawing in fdp to allow other values for splines. The original code was... 
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=825a15e645b78d86a76f35d9648c24641aed19fc;p=graphviz

Fix edge drawing in fdp to allow other values for splines. The original code was written when there were only line segments and splines.
---

diff --git a/lib/fdpgen/layout.c b/lib/fdpgen/layout.c
index bba7a0064..7b333a6df 100644
--- a/lib/fdpgen/layout.c
+++ b/lib/fdpgen/layout.c
@@ -1094,7 +1094,7 @@ fdpSplines (graph_t * g)
     int trySplines = 0;
     int et = EDGE_TYPE(g);
 
-    if (et != ET_LINE) {
+    if (et > ET_ORTHO) {
 	if (et == ET_COMPOUND) {
 	    trySplines = splineEdges(g, compoundEdges, ET_SPLINE);
 	    /* When doing the edges again, accept edges done by compoundEdges */
@@ -1105,6 +1105,7 @@ fdpSplines (graph_t * g)
 	    if (HAS_CLUST_EDGE(g)) {
 		agerr(AGWARN,
 		      "splines and cluster edges not supported - using line segments\n");
+		et = ET_LINE;
 	    } else {
 		spline_edges1(g, et);
 	    }
@@ -1112,7 +1113,7 @@ fdpSplines (graph_t * g)
 	Nop = 0;
     }
     if (State < GVSPLINES)
-	spline_edges1(g, ET_LINE);
+	spline_edges1(g, et);
 }
 
 void fdp_layout(graph_t * g)