[GRASS-SVN] r71608 - grass/branches/releasebranch_7_2/raster/r.stream.extract

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Oct 29 08:39:41 PDT 2017


Author: mmetz
Date: 2017-10-29 08:39:41 -0700 (Sun, 29 Oct 2017)
New Revision: 71608

Modified:
   grass/branches/releasebranch_7_2/raster/r.stream.extract/main.c
Log:
r.stream.extract: remove problematic infinity as default answer for input TYPE_DOUBLE option (backport trunk r71607)

Modified: grass/branches/releasebranch_7_2/raster/r.stream.extract/main.c
===================================================================
--- grass/branches/releasebranch_7_2/raster/r.stream.extract/main.c	2017-10-29 15:38:41 UTC (rev 71607)
+++ grass/branches/releasebranch_7_2/raster/r.stream.extract/main.c	2017-10-29 15:39:41 UTC (rev 71608)
@@ -110,7 +110,6 @@
 	_("If accumulation is larger than d8cut, SFD is used instead of MFD."
 	  " Applies only if no accumulation map is given.");
     input.d8cut->required = NO;
-    input.d8cut->answer = "infinity";
     input.d8cut->type = TYPE_DOUBLE;
 
     input.mont_exp = G_define_option();
@@ -192,7 +191,7 @@
 	G_fatal_error(_("Threshold must be > 0 but is %f"), threshold);
 
     /* d8cut */
-    if (strcmp(input.d8cut->answer, "infinity") == 0) {
+    if (!input.d8cut->answer) {
 	d8cut = DBL_MAX;
     }
     else {



More information about the grass-commit mailing list