[GRASS-SVN] r33260 - in grass/trunk/lib: cairodriver pngdriver psdriver

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-09-04 13:57:33 -0400 (Thu, 04 Sep 2008)
New Revision: 33260

Modified:
   grass/trunk/lib/cairodriver/Graph.c
   grass/trunk/lib/pngdriver/Graph_set.c
   grass/trunk/lib/psdriver/Graph_set.c
Log:
Change G_message() to G_verbose_message()


Modified: grass/trunk/lib/cairodriver/Graph.c
===================================================================
--- grass/trunk/lib/cairodriver/Graph.c	2008-09-04 17:56:11 UTC (rev 33259)
+++ grass/trunk/lib/cairodriver/Graph.c	2008-09-04 17:57:33 UTC (rev 33260)
@@ -167,10 +167,10 @@
     if (do_read && access(ca.file_name, 0) != 0)
 	do_read = 0;
 
-    G_message(_("cairo: collecting to file: %s"),
-	      ca.file_name);
-    G_message(_("GRASS_WIDTH=%d, GRASS_HEIGHT=%d"),
-	     ca.width, ca.height);
+    G_verbose_message(_("cairo: collecting to file: %s"),
+		      ca.file_name);
+    G_verbose_message(_("GRASS_WIDTH=%d, GRASS_HEIGHT=%d"),
+		      ca.width, ca.height);
     
     if (do_read && do_map)
 	map_file();

Modified: grass/trunk/lib/pngdriver/Graph_set.c
===================================================================
--- grass/trunk/lib/pngdriver/Graph_set.c	2008-09-04 17:56:11 UTC (rev 33259)
+++ grass/trunk/lib/pngdriver/Graph_set.c	2008-09-04 17:57:33 UTC (rev 33260)
@@ -21,6 +21,7 @@
 #endif
 
 #include <grass/gis.h>
+#include <grass/glocale.h>
 #include "pngdriver.h"
 
 struct png_state png;
@@ -68,8 +69,8 @@
     p = getenv("GRASS_TRUECOLOR");
     png.true_color = !p || strcmp(p, "FALSE") != 0;
 
-    G_message("PNG: GRASS_TRUECOLOR status: %s",
-	      png.true_color ? "TRUE" : "FALSE");
+    G_verbose_message(_("PNG: GRASS_TRUECOLOR status: %s"),
+		      png.true_color ? "TRUE" : "FALSE");
 
     p = getenv("GRASS_PNG_MAPPED");
     do_map = p && strcmp(p, "TRUE") == 0;
@@ -113,9 +114,9 @@
 	    png.background = get_color(255, 255, 255, png.has_alpha ? 255 : 0);
     }
 
-    G_message
-	("PNG: collecting to file: %s,\n     GRASS_WIDTH=%d, GRASS_HEIGHT=%d",
-	 png.file_name, png.width, png.height);
+    G_verbose_message(_("PNG: collecting to file <%s>"), png.file_name);
+    G_verbose_message(_("GRASS_WIDTH=%d, GRASS_HEIGHT=%d"),
+		      png.file_name, png.width, png.height);
 
     if (do_read && do_map)
 	map_file();

Modified: grass/trunk/lib/psdriver/Graph_set.c
===================================================================
--- grass/trunk/lib/psdriver/Graph_set.c	2008-09-04 17:56:11 UTC (rev 33259)
+++ grass/trunk/lib/psdriver/Graph_set.c	2008-09-04 17:57:33 UTC (rev 33260)
@@ -17,6 +17,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
+#include <grass/glocale.h>
 #include "psdriver.h"
 
 #define DATE_FORMAT "%c"
@@ -195,8 +196,8 @@
     p = getenv("GRASS_PS_TRAILER");
     ps.no_trailer = p && strcmp(p, "FALSE") == 0;
 
-    G_message("PS: GRASS_TRUECOLOR status: %s",
-	      ps.true_color ? "TRUE" : "FALSE");
+    G_verbose_message(_("PS: GRASS_TRUECOLOR status: %s"),
+		      ps.true_color ? "TRUE" : "FALSE");
 
     get_paper();
 
@@ -210,9 +211,9 @@
 	write_setup();
     }
 
-    G_message(
-	"PS: collecting to file: %s,\nGRASS_WIDTH=%.1f, GRASS_HEIGHT=%.1f",
-	 file_name, width, height);
+    G_verbose_message(_("PS: collecting to file <%s>"), file_name);
+    G_verbose_message(_("GRASS_WIDTH=%.1f, GRASS_HEIGHT=%.1f"),
+		      file_name, width, height);
 
     fflush(ps.outfp);