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

[svn_grass at osgeo.org]

Author: hamish
Date: 2014-03-28 17:12:48 -0700 (Fri, 28 Mar 2014)
New Revision: 59507

Modified:
   grass/branches/develbranch_6/raster/r.terraflow/main.cc
Log:
long ints for number of elements (#1421, merge from trunk)

Modified: grass/branches/develbranch_6/raster/r.terraflow/main.cc
===================================================================
--- grass/branches/develbranch_6/raster/r.terraflow/main.cc	2014-03-29 00:08:37 UTC (rev 59506)
+++ grass/branches/develbranch_6/raster/r.terraflow/main.cc	2014-03-29 00:12:48 UTC (rev 59507)
@@ -429,14 +429,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));