[GRASS-SVN] r56964 - grass/trunk/raster/r.volume

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-07-01 17:14:13 -0700 (Mon, 01 Jul 2013)
New Revision: 56964

Modified:
   grass/trunk/raster/r.volume/centroids.c
   grass/trunk/raster/r.volume/main.c
Log:
sync max cat datatype, note sites_list fixme, drop unneeded message

Modified: grass/trunk/raster/r.volume/centroids.c
===================================================================
--- grass/trunk/raster/r.volume/centroids.c	2013-07-01 18:46:38 UTC (rev 56963)
+++ grass/trunk/raster/r.volume/centroids.c	2013-07-02 00:14:13 UTC (rev 56964)
@@ -28,14 +28,14 @@
 {				/* Highest positive cat number in map layer */
     CELL *cell_buf, v;
     int i, adjusted, numb, left, right;
-    int *count;
+    long int *count;
     int row, col, rows, cols;
 
     adjusted = 0;
 
     cell_buf = Rast_allocate_c_buf();
     /* space to accumulate counts */
-    count = (int *)G_malloc((max + 1) * sizeof(int));
+    count = (long int *)G_malloc((max + 1) * sizeof(long int));
 
     /* zero the count totals */
     for (i = 1; i <= max; i++) {

Modified: grass/trunk/raster/r.volume/main.c
===================================================================
--- grass/trunk/raster/r.volume/main.c	2013-07-01 18:46:38 UTC (rev 56963)
+++ grass/trunk/raster/r.volume/main.c	2013-07-02 00:14:13 UTC (rev 56964)
@@ -152,7 +152,6 @@
     cols = window.cols;
 
     /* now get the data -- first pass */
-    G_message("Complete ...");
     for (row = 0; row < rows; row++) {
 	G_percent(row, rows, 2);
 	Rast_get_c_row(fd_data, data_buf, row);
@@ -183,6 +182,7 @@
 
     /* got everything, now do output */
     if (*site_list) {
+	/* FIXME: convert to modern vector points map metadata */
 	char desc[GNAME_MAX * 2 + 40];
 
 	site_info.form = NULL;