Browse code

merged c89633 from trunk

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_14/madman/Rpacks/Rgraphviz@89760 bc3139a8-67e5-0310-9ffc-ced21a209358

Kasper D. Hansen authored on 01/05/2014 03:49:47
Showing3 changed files

... ...
@@ -2,13 +2,26 @@ Package: Rgraphviz
2 2
 Title: Provides plotting capabilities for R graph objects
3 3
 Description: Interfaces R with the AT and T graphviz library for
4 4
         plotting R graph objects from the graph package.
5
-Version: 2.8.0
6
-Author: Jeff Gentry, Li Long, Robert Gentleman, Seth Falcon, Florian
7
-        Hahne, Deepayan Sarkar, Kasper Daniel Hansen
8
-Maintainer: Kasper Daniel Hansen <khansen@jhsph.edu>
9
-Depends: R (>= 2.6.0), methods, utils, graph, grid
10
-Imports: stats4, graphics, grDevices
11
-Suggests: RUnit, BiocGenerics, XML
5
+Version: 2.8.1
6
+Authors@R: c(person(c("Kasper", "Daniel"), "Hansen", role = c("cre", "aut"),
7
+                    email = "kasperdanielhansen@gmail.com"),
8
+             person("Jeff", "Gentry", role = "aut"),
9
+             person("Li", "Long", role = "aut"),
10
+             person("Robert", "Gentleman", role = "aut"),
11
+             person("Seth", "Falcon", role = "aut"),
12
+             person("Florian", "Hahne", role = "aut"),
13
+             person("Deepayan", "Sarkar", role = "aut"))
14
+Depends: R (>= 2.6.0),
15
+	 methods,
16
+	 utils,
17
+	 graph,
18
+	 grid
19
+Imports: stats4,
20
+	 graphics,
21
+	 grDevices
22
+Suggests: RUnit,
23
+	  BiocGenerics,
24
+	  XML
12 25
 SystemRequirements: optionally Graphviz (>= 2.16)
13 26
 GraphvizDetails: Graphviz 2.28.0
14 27
 License: EPL
... ...
@@ -2,6 +2,17 @@
2 2
 \title{Rgraphviz News}
3 3
 \encoding{UTF-8}
4 4
 
5
+\section{Version 2.8.x}{
6
+  \itemize{
7
+    \item Fixed a bug in the C code of Graphviz which manifests itself
8
+    when the following options are given to GCC
9
+    "-Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2",
10
+    this is the case for Ubuntu 12.04.
11
+    Reported by Vladimir Zhurov <vzhurov2@uwo.ca>, Venkat Seshan
12
+    <veseshan@gmail.com> and Chong Tang <tangc3@unr.edu>.
13
+  }
14
+}
15
+
5 16
 \section{Version 2.7.x}{
6 17
   \itemize{
7 18
     \item Fixed include statements in Graphviz code.
... ...
@@ -1520,7 +1520,7 @@ emitGraph (FILE* fp, maze* mp, int n_edges, route* route_list, epair_t es[])
1520 1520
     absbb.LL.x = absbb.LL.y = MAXDOUBLE;
1521 1521
     absbb.UR.x = absbb.UR.y = -MAXDOUBLE;
1522 1522
 
1523
-    fprintf (fp, prolog2);
1523
+    fprintf (fp, "%s", prolog2);
1524 1524
     fprintf (fp, "%d %d translate\n", TRANS, TRANS);
1525 1525
 
1526 1526
     fputs ("0 0 1 setrgbcolor\n", fp);