Fix cgraph code in dot related to virtual nodes. In particular, avoid calling agsubno...

virtual node.

diff --git a/lib/dotgen/cluster.c b/lib/dotgen/cluster.c
index 1b49308f312bf19a417390c91f83f1fc385640a3..70343f4ebbc6cd88b63f3b76d4edc0815e4c9a37 100644 (file)
--- a/lib/dotgen/cluster.c
+++ b/lib/dotgen/cluster.c
@@ -286,10 +286,9 @@ merge_ranks(graph_t * subg)
 #ifndef WITH_CGRAPH
            v->graph = subg->root;
 #else /* WITH_CGRAPH */
-//         agraphof(v) = agroot(subg);
-               agsubnode(subg, v, 1);
-
-
+       /* real nodes automatically have v->root = root graph */
+           if (ND_node_type(v) == VIRTUAL)
+               v->root = root;
 #endif /* WITH_CGRAPH */
            delete_fast_node(subg, v);
            fast_node(agroot(subg), v);

diff --git a/lib/dotgen/fastgr.c b/lib/dotgen/fastgr.c
index 2eb380fac67c66e4023d1e30ad1d70a6625f50b8..dd1e9c928cb232ab8be7a21bb962ea16a95eba43 100644 (file)
--- a/lib/dotgen/fastgr.c
+++ b/lib/dotgen/fastgr.c
@@ -254,7 +254,6 @@ node_t *virtual_node(graph_t * g)
 #else /* WITH_CGRAPH */
 //  agnameof(n) = "virtual";
     AGTYPE(n) = AGNODE;
-    n->root = g;
     n->base.data = NEW(Agnodeinfo_t);
     n->root = g;
 #endif /* WITH_CGRAPH */