[GRASS-SVN] r48590 - grass/trunk/raster/r.report

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-01 14:08:04 -0700 (Sat, 01 Oct 2011)
New Revision: 48590

Modified:
   grass/trunk/raster/r.report/global.h
   grass/trunk/raster/r.report/main.c
   grass/trunk/raster/r.report/parse.c
   grass/trunk/raster/r.report/stats.c
Log:
fix r48589


Modified: grass/trunk/raster/r.report/global.h
===================================================================
--- grass/trunk/raster/r.report/global.h	2011-10-01 20:59:22 UTC (rev 48589)
+++ grass/trunk/raster/r.report/global.h	2011-10-01 21:08:04 UTC (rev 48590)
@@ -54,7 +54,6 @@
 extern int use_formfeed;
 extern int nlines;
 extern int with_headers;
-extern int verbose;
 extern int e_format;
 extern int no_nulls;
 extern int no_nulls_all;

Modified: grass/trunk/raster/r.report/main.c
===================================================================
--- grass/trunk/raster/r.report/main.c	2011-10-01 20:59:22 UTC (rev 48589)
+++ grass/trunk/raster/r.report/main.c	2011-10-01 21:08:04 UTC (rev 48590)
@@ -3,14 +3,15 @@
  *
  * MODULE:       r.report
  * AUTHOR(S):    Michael Shapiro, CERL (original contributor)
- *               Roberto Flor <flor itc.it>, Jachym Cepicky <jachym les-ejk.cz>, 
+ *               Roberto Flor <flor itc.it>
+ *               Jachym Cepicky <jachym les-ejk.cz>, 
  *               Jan-Oliver Wagner <jan intevation.de>
- * PURPOSE:      
- * COPYRIGHT:    (C) 1999-2006 by the GRASS Development Team
+ * PURPOSE:      Reports statistics for raster map(s).
+ * COPYRIGHT:    (C) 1999-2006, 2011 by the GRASS Development Team
  *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
+ *               This program is free software under the GNU General
+ *               Public License (>=v2). Read the file COPYING that
+ *               comes with GRASS for details.
  *
  *****************************************************************************/
 

Modified: grass/trunk/raster/r.report/parse.c
===================================================================
--- grass/trunk/raster/r.report/parse.c	2011-10-01 20:59:22 UTC (rev 48589)
+++ grass/trunk/raster/r.report/parse.c	2011-10-01 21:08:04 UTC (rev 48590)
@@ -155,7 +155,6 @@
 
     use_formfeed = flags.f->answer;
     with_headers = !flags.h->answer;
-    verbose = !flags.q->answer;
     e_format = flags.e->answer;
     no_nulls = flags.n->answer;
     no_nulls_all = flags.N->answer;

Modified: grass/trunk/raster/r.report/stats.c
===================================================================
--- grass/trunk/raster/r.report/stats.c	2011-10-01 20:59:22 UTC (rev 48589)
+++ grass/trunk/raster/r.report/stats.c	2011-10-01 21:08:04 UTC (rev 48590)
@@ -28,7 +28,7 @@
 	argv[argc++] = "-acr";
 
 	/* if (!masking) argv[argc++] = "-m"; */
-	if (!verbose)
+	if (G_verbose() == G_verbose_min())
 	    argv[argc++] = "--quiet";
 
 	if (no_nulls)