[GRASS-SVN] r47667 - grass/branches/develbranch_6/raster/r.terraflow

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-08-16 00:36:22 -0700 (Tue, 16 Aug 2011)
New Revision: 47667

Modified:
   grass/branches/develbranch_6/raster/r.terraflow/grass2str.h
   grass/branches/develbranch_6/raster/r.terraflow/main.cc
Log:
backport of r47664 and r47665

Modified: grass/branches/develbranch_6/raster/r.terraflow/grass2str.h
===================================================================
--- grass/branches/develbranch_6/raster/r.terraflow/grass2str.h	2011-08-16 07:36:11 UTC (rev 47666)
+++ grass/branches/develbranch_6/raster/r.terraflow/grass2str.h	2011-08-16 07:36:22 UTC (rev 47667)
@@ -141,9 +141,9 @@
   /* close map files */
   G_close_cell (infd);
 
-  G_debug(3, "nrows=%d   ncols=%d    stream_len()=%d", nrows, ncols,
+  G_debug(3, "nrows=%d   ncols=%d    stream_len()=%"PRI_OFF_T, nrows, ncols,
 		str->stream_len());  
-  assert(nrows * ncols == str->stream_len());
+  assert((off_t) nrows * ncols == str->stream_len());
   rt_stop(rt);
   stats->recordTime("reading raster map", rt);
 

Modified: grass/branches/develbranch_6/raster/r.terraflow/main.cc
===================================================================
--- grass/branches/develbranch_6/raster/r.terraflow/main.cc	2011-08-16 07:36:11 UTC (rev 47666)
+++ grass/branches/develbranch_6/raster/r.terraflow/main.cc	2011-08-16 07:36:22 UTC (rev 47667)
@@ -175,7 +175,7 @@
   if (strcmp(d8cut->answer, "infinity") == 0) {
     opt->d8cut = MAX_ACCU;
   } else {
-    opt->d8cut = atoi(d8cut->answer);
+    opt->d8cut = atof(d8cut->answer);
   }
 
   opt->mem = atoi(mem->answer);