From: Emden R. Gansner <erg@alum.mit.edu>
Date: Thu, 15 May 2014 13:05:32 +0000 (-0400)
Subject: Remove WITH_CGRAPH use
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b01c242cfd10a316c12199ad0a6de247a702af4;p=graphviz

Remove WITH_CGRAPH use
---

diff --git a/dot.demo/demo.c b/dot.demo/demo.c
index 60369b67c..29b873a39 100644
--- a/dot.demo/demo.c
+++ b/dot.demo/demo.c
@@ -34,17 +34,10 @@ 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 bd07299ca..7dee30b32 100644
--- a/dot.demo/example.c
+++ b/dot.demo/example.c
@@ -8,11 +8,7 @@ int main(int argc, char **argv)
     Agnode_t *n, *m;
     Agedge_t *e;
 
-#ifdef NO_LAYOUT_OR_RENDERING
-#ifndef WITH_CGRAPH
-    aginit();
-#endif
-#else
+#ifndef NO_LAYOUT_OR_RENDERING
     /* set up a graphviz context - but only once even for multiple graphs */
     static GVC_t *gvc;
 
@@ -21,17 +17,10 @@ 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 e84488557..932e03ff5 100644
--- a/dot.demo/neatopack.c
+++ b/dot.demo/neatopack.c
@@ -28,11 +28,7 @@ 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 1517c6ef9..a8f8efab9 100644
--- a/dot.demo/simple.c
+++ b/dot.demo/simple.c
@@ -25,11 +25,7 @@ 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");