Explorar el Código

fix https://trac.osgeo.org/grass/changeset/48589

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@48590 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa hace 13 años
padre
commit
e9f9f58a36
Se han modificado 4 ficheros con 8 adiciones y 9 borrados
  1. 0 1
      raster/r.report/global.h
  2. 7 6
      raster/r.report/main.c
  3. 0 1
      raster/r.report/parse.c
  4. 1 1
      raster/r.report/stats.c

+ 0 - 1
raster/r.report/global.h

@@ -54,7 +54,6 @@ extern int masking;
 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;

+ 7 - 6
raster/r.report/main.c

@@ -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.
  *
  *****************************************************************************/
 

+ 0 - 1
raster/r.report/parse.c

@@ -155,7 +155,6 @@ int parse_command_line(int argc, char *argv[])
 
     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;

+ 1 - 1
raster/r.report/stats.c

@@ -28,7 +28,7 @@ int get_stats(void)
 	argv[argc++] = "-acr";
 
 	/* if (!masking) argv[argc++] = "-m"; */
-	if (!verbose)
+	if (G_verbose() == G_verbose_min())
 	    argv[argc++] = "--quiet";
 
 	if (no_nulls)