[GRASS-SVN] r61340 - in grass/branches/releasebranch_7_0: . raster/r.terraflow

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-07-22 14:17:40 -0700 (Tue, 22 Jul 2014)
New Revision: 61340

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/raster/r.terraflow/main.cpp
Log:
r.terraflow: long ints for number of elements (#1421) (trunk, r59505)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60219,60278,60610,60807,60835,60936-60937,61275,61288,61290,61292,61294,61301
   + /grass/trunk:59505,60219,60278,60610,60807,60835,60936-60937,61275,61288,61290,61292,61294,61301

Modified: grass/branches/releasebranch_7_0/raster/r.terraflow/main.cpp
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.terraflow/main.cpp	2014-07-22 21:06:51 UTC (rev 61339)
+++ grass/branches/releasebranch_7_0/raster/r.terraflow/main.cpp	2014-07-22 21:17:40 UTC (rev 61340)
@@ -405,14 +405,14 @@
   maxneed =  2*maxneed; /* need 2*N to sort */
 
   G_message( "total elements=%ld, nodata elements=%ld",
-		(long)nrows*ncols, nodata_count);
+		(long)nrows * ncols, nodata_count);
   G_message( "largest temporary files: ");
-  G_message( "\t\t FILL: %s [%d elements, %dB each]",
+  G_message( "\t\t FILL: %s [%ld elements, %dB each]",
 		  formatNumber(buf, fillmaxsize),
-		  nrows * ncols, sizeof(waterWindowType));
+		  (long)nrows * ncols, sizeof(waterWindowType));
   G_message( "\t\t FLOW: %s [%ld elements, %dB each]",
 		  formatNumber(buf, flowmaxsize),
-		  (long)(nrows * ncols - nodata_count), sizeof(sweepItem));
+		  (long)nrows * ncols - nodata_count, sizeof(sweepItem));
   G_message( "Will need at least %s space available in %s",
 		  formatNumber(buf, maxneed),  	  /* need 2*N to sort */
 		  getenv(STREAM_TMPDIR));