From: ellson <devnull@localhost>
Date: Sat, 21 May 2005 03:27:22 +0000 (+0000)
Subject: always set color, don't assume color was left at default color
X-Git-Tag: LAST_LIBGRAPH~32^2~7541
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b574c48e4e8822ee6b9086e6b8ddbe6e74cd46ef;p=graphviz

always set color, don't assume color was left at default color
---

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 903ced29d..c9d92f49a 100644
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -831,6 +831,7 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
 		        gvrender_set_pencolor(job, color);
 		        gvrender_set_fillcolor(job, color);
 		    } else {
+		        gvrender_set_pencolor(job, DEFAULT_COLOR);
 		        gvrender_set_fillcolor(job, DEFAULT_COLOR);
 		    }
 		}
@@ -865,6 +866,7 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
 		    gvrender_set_pencolor(job, color);
 		    gvrender_set_fillcolor(job, color);
 	        } else {
+		    gvrender_set_pencolor(job, DEFAULT_COLOR);
 		    gvrender_set_fillcolor(job, DEFAULT_COLOR);
 	        }
 	    }
@@ -893,10 +895,6 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
 	    }
 	}
     }
-    if (ED_active(e)) {
-	gvrender_set_pencolor(job, DEFAULT_COLOR);
-	gvrender_set_fillcolor(job, DEFAULT_COLOR);
-    }
     xdemitState = EMIT_LABEL;
     if (ED_label(e)) {
 	emit_label(job, ED_label(e), (void *) e);
diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index a25ce7b91..2e36aee26 100644
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -250,6 +250,8 @@ void pencolor(GVJ_t * job, node_t * n)
     color = late_nnstring(n, N_color, "");
     if (color[0])
 	gvrender_set_pencolor(job, color);
+    else
+	gvrender_set_pencolor(job, DEFAULT_COLOR);
 }
 
 static