From: Emden Gansner <erg@research.att.com>
Date: Wed, 27 Feb 2013 18:34:01 +0000 (-0500)
Subject: Modify demo files to work with libcgraph
X-Git-Tag: LAST_LIBGRAPH~32^2~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cc4da5861aa3ccf48104a323ce06f49c333dc84;p=graphviz

Modify demo files to work with libcgraph
---

diff --git a/dot.demo/demo.c b/dot.demo/demo.c
index 6f6326bb4..60369b67c 100644
--- a/dot.demo/demo.c
+++ b/dot.demo/demo.c
@@ -34,10 +34,17 @@ int main(int argc, char **argv)
     gvParseArgs(gvc, argc, argv);
 
     /* Create a simple digraph */
+#ifdef WITH_CGRAPH
+    g = agopen("g", Agdirected, 0);
+    n = agnode(g, "n", 1);
+    m = agnode(g, "m", 1);
+    e = agedge(g, n, m, 0, 1);
+#else
     g = agopen("g", AGDIGRAPH);
     n = agnode(g, "n");
     m = agnode(g, "m");
     e = agedge(g, n, m);
+#endif
 
     /* Set an attribute - in this case one that affects the visible rendering */
     agsafeset(n, "color", "red", "");
diff --git a/dot.demo/example.c b/dot.demo/example.c
index 11a711f2b..bd07299ca 100644
--- a/dot.demo/example.c
+++ b/dot.demo/example.c
@@ -7,10 +7,11 @@ int main(int argc, char **argv)
     Agraph_t *g;
     Agnode_t *n, *m;
     Agedge_t *e;
-    Agsym_t *a;
 
 #ifdef NO_LAYOUT_OR_RENDERING
+#ifndef WITH_CGRAPH
     aginit();
+#endif
 #else
     /* set up a graphviz context - but only once even for multiple graphs */
     static GVC_t *gvc;
@@ -20,10 +21,17 @@ int main(int argc, char **argv)
 #endif
 
     /* Create a simple digraph */
+#ifdef WITH_CGRAPH
+    g = agopen("g", Agdirected, 0);
+    n = agnode(g, "n", 1);
+    m = agnode(g, "m", 1);
+    e = agedge(g, n, m, 0, 1);
+#else
     g = agopen("g", AGDIGRAPH);
     n = agnode(g, "n");
     m = agnode(g, "m");
     e = agedge(g, n, m);
+#endif
 
     /* Set an attribute - in this case one that affects the visible rendering */
     agsafeset(n, "color", "red", "");
diff --git a/dot.demo/neatopack.c b/dot.demo/neatopack.c
index 62b9190e7..e84488557 100644
--- a/dot.demo/neatopack.c
+++ b/dot.demo/neatopack.c
@@ -28,7 +28,11 @@ int main (int argc, char* argv[])
         fp = fopen(argv[1], "r");
     else
         fp = stdin;
+#ifdef WITH_CGRAPH
+    g = agread(fp, 0);
+#else
     g = agread(fp);
+#endif
 
     cc = ccomps(g, &ncc, (char*)0);
 
diff --git a/dot.demo/simple.c b/dot.demo/simple.c
index 1000f4574..1517c6ef9 100644
--- a/dot.demo/simple.c
+++ b/dot.demo/simple.c
@@ -25,7 +25,11 @@ int main(int argc, char **argv)
 	fp = fopen(argv[1], "r");
     else
 	fp = stdin;
+#ifdef WITH_CGRAPH
+    g = agread(fp, 0);
+#else
     g = agread(fp);
+#endif
 
     gvLayout(gvc, g, "dot");