From: Emden R. Gansner <erg@alum.mit.edu>
Date: Fri, 25 Jul 2014 17:10:36 +0000 (-0400)
Subject: Fix of curved edge problem - bug 2471
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e190e47aa70124a8ef5ac4719e4f0c2730de5bb6;p=graphviz

Fix of curved edge problem - bug 2471
---

diff --git a/lib/dotgen/dotsplines.c b/lib/dotgen/dotsplines.c
index 1fc615730..5a72699e7 100644
--- a/lib/dotgen/dotsplines.c
+++ b/lib/dotgen/dotsplines.c
@@ -269,12 +269,6 @@ static void _dot_splines(graph_t * g, int normalize)
 	if (GD_has_labels(g->root) & EDGE_LABEL) {
 	    agerr (AGWARN, "edge labels with splines=curved not supported in dot - use xlabels\n");
 	}
-	for (n = agfstnode (g); n; n = agnxtnode(g, n)) {
-	    for (e = agfstout(g, n); e; e = agnxtout(g,e)) {
-		makeStraightEdge(g, e, et, &sinfo);
-	    }
-	}
-	goto finish;
     } 
 #ifdef ORTHO
     if (et == ET_ORTHO) {
@@ -418,7 +412,10 @@ static void _dot_splines(graph_t * g, int normalize)
 		break;
 	}
 
-	if (agtail(e0) == aghead(e0)) {
+	if (et == ET_CURVED) {
+	    makeStraightEdges (g, edges+ind, cnt, et, &sinfo);
+	}
+	else if (agtail(e0) == aghead(e0)) {
 	    int b, sizey, r;
 	    n = agtail(e0);
 	    r = ND_rank(n);