Просмотр исходного кода

sync max cat datatype, note sites_list fixme, drop unneeded message

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@56964 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 11 лет назад
Родитель
Сommit
9406f7aaf6
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      raster/r.volume/centroids.c
  2. 1 1
      raster/r.volume/main.c

+ 2 - 2
raster/r.volume/centroids.c

@@ -28,14 +28,14 @@ int centroids(int fd,		/* File descriptor of map layer to process */
 {				/* 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++) {

+ 1 - 1
raster/r.volume/main.c

@@ -152,7 +152,6 @@ int main(int argc, char *argv[])
     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 @@ int main(int argc, char *argv[])
 
     /* 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;