]> granicus.if.org Git - graphviz/commitdiff
fix problem with cluster default pencolor
authorellson <devnull@localhost>
Tue, 15 Aug 2006 14:41:11 +0000 (14:41 +0000)
committerellson <devnull@localhost>
Tue, 15 Aug 2006 14:41:11 +0000 (14:41 +0000)
lib/common/emit.c

index 2aab96936cd9de0828a77d9e914f97731aba3dd0..dee3464ed2d38bb5c7b3b11b3b340674c0d37d3f 100644 (file)
@@ -2341,10 +2341,10 @@ void emit_clusters(GVJ_t * job, Agraph_t * g, int flags)
            if (((color = agget(sg, "fillcolor")) != 0) && color[0])
                fillcolor = color;
        }
+       if (!pencolor) pencolor = DEFAULT_COLOR;
+       if (!fillcolor) fillcolor = DEFAULT_FILL;
         B2BF(GD_bb(sg), BF);
        if (istyle & ROUNDED) {
-           if (!pencolor) pencolor = DEFAULT_COLOR;
-           if (!fillcolor) fillcolor = DEFAULT_FILL;
            if (late_int(sg, G_peripheries, 1, 0) || filled) {
                AF[0] = BF.LL;
                AF[1] = BF.UR;
@@ -2356,10 +2356,8 @@ void emit_clusters(GVJ_t * job, Agraph_t * g, int flags)
            }
        }
        else {
-           if (pencolor)
-               gvrender_set_pencolor(job, pencolor);
-           if (fillcolor)
-               gvrender_set_fillcolor(job, fillcolor);
+           gvrender_set_pencolor(job, pencolor);
+           gvrender_set_fillcolor(job, fillcolor);
            if (late_int(sg, G_peripheries, 1, 0))
                gvrender_box(job, BF, filled);
            else if (filled) {