From: Tobias Oetiker <tobi@oetiker.ch>
Date: Tue, 10 May 2005 06:06:49 +0000 (+0000)
Subject: I guess the pdf entities want to be escaped chars not just control caracters with... 
X-Git-Tag: 1.2.6~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=730a092fc2353b33eae2ca68e16ba47ff91524be;p=thirdparty%2Frrdtool-1.x.git

I guess the pdf entities want to be escaped chars not just control caracters with a prepended backslash ...


git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@535 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index 33621bf0..9322e9eb 100644
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.5  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.6  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd_gfx.c  graphics wrapper for rrdtool
   **************************************************************************/
@@ -1399,7 +1399,7 @@ int       gfx_render_svg (gfx_canvas_t *canvas,
 "   \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n"
 "<!--\n"
 "   SVG file created by\n"
-"        RRDtool 1.2.5 Tobias Oetiker, http://tobi.oetiker.ch\n"
+"        RRDtool 1.2.6 Tobias Oetiker, http://tobi.oetiker.ch\n"
 "\n"
 "   The width/height attributes in the outhermost svg node\n"
 "   are just default sizes for the browser which is used\n"
@@ -1567,7 +1567,7 @@ static int eps_prologue(eps_state *state)
   gfx_node_t *node;
   fputs(
     "%!PS-Adobe-3.0 EPSF-3.0\n"
-    "%%Creator: RRDtool 1.2.5 Tobias Oetiker, http://tobi.oetiker.ch\n"
+    "%%Creator: RRDtool 1.2.6 Tobias Oetiker, http://tobi.oetiker.ch\n"
     /* can't like weird chars here */
     "%%Title: (RRDtool output)\n"
     "%%DocumentData: Clean7Bit\n"
@@ -1933,11 +1933,17 @@ static void pdf_put_string_contents(pdf_buffer *buf, const char *text)
 	    case '(':
 	    case ')':
 	    case '\\':
+		pdf_puts(buf, "\\");
+		pdf_put(buf, p, 1);
+		break;
 	    case '\n':
+		pdf_puts(buf, "\\n");
+		break;
 	    case '\r':
+		pdf_puts(buf, "\\r");
+		break;
 	    case '\t':
-		pdf_puts(buf, "\\");
-		pdf_put(buf, (char)ch, 1);
+		pdf_puts(buf, "\\t");
 		break;
 	    default:
 		if (ch >= 126 || ch < 32) {
@@ -2235,7 +2241,7 @@ static void pdf_init_document(pdf_state *state)
 
 static void pdf_setup_document(pdf_state *state)
 {
-  const char *creator = "RRDtool 1.2.5 Tobias Oetiker, http://tobi.oetiker.ch";
+  const char *creator = "RRDtool 1.2.6 Tobias Oetiker, http://tobi.oetiker.ch";
   /* all objects created by now, so init code can reference them */
   /* HEADER */
   pdf_puts(&state->pdf_header, "%PDF-1.3\n");