From: erg <devnull@localhost>
Date: Mon, 5 Nov 2007 21:33:36 +0000 (+0000)
Subject: Back out code change moving setting of color=black for points
X-Git-Tag: LAST_LIBGRAPH~32^2~5075
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a7f4a0d2d79678e03941fa457cc1e2c810e4207;p=graphviz

Back out code change moving setting of color=black for points
from special code in fillColor() to init_point(). Although the
change made cleaner code, it also causes color=black to appear
for points in dot output.
---

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index 728a3182c..be393827f 100644
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -258,11 +258,13 @@ char *findFill(node_t * n)
 	/* for backward compatibilty, default fill is same as pen */
 	color = late_nnstring(n, N_color, "");
 	if (!color[0]) {
+	    if (ND_shape(n) == point_desc) {
+		color = "black";
+	    }
 #ifdef WITH_CODEGENS
-	    if (Output_lang == MIF) color = "black";
-	    else
+	    else if (Output_lang == MIF) color = "black";
 #endif
-	    color = DEFAULT_FILL;
+	    else color = DEFAULT_FILL;
 	}
     }
     return color;
@@ -1521,7 +1523,6 @@ static void poly_gencode(GVJ_t * job, node_t * n)
 static void point_init(node_t * n)
 {
     textlabel_t *p;
-    char* color;
 
     if (!point_desc) {
 	shape_desc *ptr;
@@ -1554,9 +1555,6 @@ static void point_init(node_t * n)
     } else
 	ND_width(n) = ND_height(n) = DEF_POINT;
 
-    color = late_nnstring(n, N_color, "");
-    if (!color[0])
-	agsafeset(n, "color", "black", "");
     poly_init(n);
 }