[GRASS-SVN] r40167 - grass/branches/releasebranch_6_4/raster/r.in.xyz

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-12-30 22:35:23 -0500 (Wed, 30 Dec 2009)
New Revision: 40167

Modified:
   grass/branches/releasebranch_6_4/raster/r.in.xyz/description.html
   grass/branches/releasebranch_6_4/raster/r.in.xyz/main.c
Log:
   (merge from trunk)
better warn about memory use with extended stats;
error msg instead of segfault if zrange= is empty;
more accurate status message


Modified: grass/branches/releasebranch_6_4/raster/r.in.xyz/description.html
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.in.xyz/description.html	2009-12-31 02:57:49 UTC (rev 40166)
+++ grass/branches/releasebranch_6_4/raster/r.in.xyz/description.html	2009-12-31 03:35:23 UTC (rev 40167)
@@ -51,7 +51,10 @@
 and coeff_var</em> will use more.
 
 The aggregate functions <em>median, percentile, skewness</em> and
-<em>trimmed mean</em> will also use more memory.
+<em>trimmed mean</em> will use even more memory and may not be appropriate
+for use with arbitrarily large input files<!-- without a small value for percent= -->.
+<!-- explained: memory use for regular stats will be based solely on region size,
+ but for the aggregate fns it will also depend on the number of data points. (?) -->
 
 <p>
 

Modified: grass/branches/releasebranch_6_4/raster/r.in.xyz/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.in.xyz/main.c	2009-12-31 02:57:49 UTC (rev 40166)
+++ grass/branches/releasebranch_6_4/raster/r.in.xyz/main.c	2009-12-31 03:35:23 UTC (rev 40167)
@@ -297,7 +297,10 @@
 
     /* parse zrange */
     do_zfilter = FALSE;
-    if (zrange_opt->answer != NULL) {	/* should this be answerS ? */
+    if (zrange_opt->answer != NULL) {
+	if (zrange_opt->answers[0] == NULL)
+	    G_fatal_error(_("Invalid zrange"));
+
 	sscanf(zrange_opt->answers[0], "%lf", &zrange_min);
 	sscanf(zrange_opt->answers[1], "%lf", &zrange_max);
 	do_zfilter = TRUE;
@@ -515,7 +518,7 @@
     /* allocate memory for a single row of output data */
     raster_row = G_allocate_raster_buf(rtype);
 
-    G_message(_("Scanning data ..."));
+    G_message(_("Reading data ..."));
 
     count_total = 0;