]> granicus.if.org Git - graphviz/commitdiff
cgraph - g->proto->n ==> NULL
authorellson <devnull@localhost>
Mon, 20 Oct 2008 18:57:02 +0000 (18:57 +0000)
committerellson <devnull@localhost>
Mon, 20 Oct 2008 18:57:02 +0000 (18:57 +0000)
lib/common/emit.c

index 5e9046797aecc214e986c95c3d1581565f3a08b9..e7464260536dc1fe037c14bd284794ff5e7fa50b 100644 (file)
@@ -1936,9 +1936,13 @@ static void init_gvc(GVC_t * gvc, graph_t * g)
     gvc->bb = GD_bb(g);
 
     /* clusters have peripheries */
+#ifndef WITH_CGRAPH
     G_peripheries = agfindattr(g, "peripheries");
-
     G_penwidth = agfindattr(g, "penwidth");
+#else
+    G_peripheries = agattr(g, AGRAPH,"peripheries",(char*)0);
+    G_penwidth = agattr(g, AGRAPH,"penwidth",(char*)0);
+#endif
 
     /* default font */
 #ifndef WITH_CGRAPH
@@ -1947,9 +1951,9 @@ static void init_gvc(GVC_t * gvc, graph_t * g)
     gvc->defaultfontsize = late_double(g->proto->n,
                 N_fontsize, DEFAULT_FONTSIZE, MIN_FONTSIZE);
 #else
-    gvc->defaultfontname = late_nnstring(g->proto->n,
+    gvc->defaultfontname = late_nnstring(NULL,
                 N_fontname, DEFAULT_FONTNAME);
-    gvc->defaultfontsize = late_double(g->proto->n,
+    gvc->defaultfontsize = late_double(NULL,
                 N_fontsize, DEFAULT_FONTSIZE, MIN_FONTSIZE);
 #endif