X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_gfx.c;h=8b2d77f1eeed8bcd370a7b3c9120b395eec216d6;hb=51f4f28267599da6cbe56eb26237bdf808657abf;hp=c012e5cf84df9be748ea2676090229dde2143f58;hpb=0881b8848ab8c1cb9b50db4599d4adc9391a774d;p=rrdtool.git

diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index c012e5c..8b2d77f 100644
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.12  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.13  Copyright by Tobi Oetiker, 1997-2006
  ****************************************************************************
  * rrd_gfx.c  graphics wrapper for rrdtool
   **************************************************************************/
@@ -1062,7 +1062,9 @@ static void svg_write_text(FILE *fp, const char *text)
 	text_count = mbstowcs(cstr, "Enc-Err", 6);
     p = cstr;
 #else
-    const unsigned char *p = text, ch;
+    unsigned char *p = text;
+    unsigned char *cstr;
+    char ch;
     if (!p)
 	return;
 #endif
@@ -1071,7 +1073,7 @@ static void svg_write_text(FILE *fp, const char *text)
     ch = afm_fix_osx_charset(ch); /* unsafe macro */
     switch (ch) {
     case 0:
-#ifdef HAVE_MBSTOWCS     
+#ifdef HAVE_MBSTOWCS
     free(cstr);
 #endif
     return;
@@ -1081,9 +1083,11 @@ static void svg_write_text(FILE *fp, const char *text)
     case '"': fputs(""", fp); break;
     default:
         if (ch == 32) {
+#ifdef HAVE_MBSTOWCS
             if (p <= cstr + 1 || !*p || *p == 32)
                 fputs("&#160;", fp); /* non-breaking space in unicode */
             else
+#endif
                 fputc(32, fp);
         } else if (ch < 32 || ch >= 127)
 	fprintf(fp, "&#%d;", (int)ch);
@@ -1745,7 +1749,8 @@ static void eps_write_text(eps_state *state, gfx_node_t *node)
 	text_count = mbstowcs(cstr, "Enc-Err", 6);
     p = cstr;
 #else
-    const unsigned char *p = node->text, ch;
+    const unsigned char *p = node->text;
+    unsigned char ch;
     if (!p)
 	return;
 #endif
@@ -2032,9 +2037,9 @@ static void pdf_put_string_contents_wide(pdf_buffer *buf, const afm_char *text)
 	    default:
 		if (ch > 255) {
 		    pdf_put_char(buf, '?');
-		} else if (ch >= 126 || ch < 32) {
+		} else if (ch > 125 || ch < 32) {
 		    pdf_put_char(buf, ch);
-		} else if (ch >= 0 && ch <= 255) {
+		} else {
 		    char tmp[10];
 		    snprintf(tmp, sizeof(tmp), "\\%03o", (int)ch);
 		    pdf_puts(buf, tmp);