Browse Source

r.clump: fix reporting number of clumps when map is empty (merge from trunk, https://trac.osgeo.org/grass/changeset/62170)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@62176 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 years ago
parent
commit
7acda80247
1 changed files with 4 additions and 2 deletions
  1. 4 2
      raster/r.clump/main.c

+ 4 - 2
raster/r.clump/main.c

@@ -30,6 +30,7 @@ int main(int argc, char *argv[])
     struct Range range;
     struct Range range;
     struct History hist;
     struct History hist;
     CELL min, max;
     CELL min, max;
+    int range_return, n_clumps;
     int in_fd, out_fd;
     int in_fd, out_fd;
     char title[512];
     char title[512];
     char name[GNAME_MAX];
     char name[GNAME_MAX];
@@ -105,7 +106,7 @@ int main(int argc, char *argv[])
 	Rast_put_cell_title(OUTPUT, title);
 	Rast_put_cell_title(OUTPUT, title);
 
 
 	/* colors */
 	/* colors */
-	Rast_read_range(OUTPUT, G_mapset(), &range);
+	range_return = Rast_read_range(OUTPUT, G_mapset(), &range);
 	Rast_get_range_min_max(&range, &min, &max);
 	Rast_get_range_min_max(&range, &min, &max);
 	Rast_make_random_colors(&colr, min, max);
 	Rast_make_random_colors(&colr, min, max);
 	Rast_write_colors(OUTPUT, G_mapset(), &colr);
 	Rast_write_colors(OUTPUT, G_mapset(), &colr);
@@ -116,7 +117,8 @@ int main(int argc, char *argv[])
 	Rast_command_history(&hist);
 	Rast_command_history(&hist);
 	Rast_write_history(OUTPUT, &hist);
 	Rast_write_history(OUTPUT, &hist);
 
 
-	G_done_msg(_n("%d clump.", "%d clumps.", range.max), range.max);
+	n_clumps = range_return == 2 ? 0 : range.max;
+	G_done_msg(_n("%d clump.", "%d clumps.", n_clumps), n_clumps);
     }
     }
 
 
     exit(EXIT_SUCCESS);
     exit(EXIT_SUCCESS);