[GRASS-SVN] r56246 - grass-addons/grass7/raster/r.area
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue May 14 01:58:44 PDT 2013
Author: neteler
Date: 2013-05-14 01:58:43 -0700 (Tue, 14 May 2013)
New Revision: 56246
Modified:
grass-addons/grass7/raster/r.area/main.c
Log:
r.area: proper indentation with tools/grass_indent.sh
Modified: grass-addons/grass7/raster/r.area/main.c
===================================================================
--- grass-addons/grass7/raster/r.area/main.c 2013-05-14 01:27:21 UTC (rev 56245)
+++ grass-addons/grass7/raster/r.area/main.c 2013-05-14 08:58:43 UTC (rev 56246)
@@ -3,7 +3,7 @@
* MODULE: r.area
* AUTHOR(S): Jarek Jasiewicz <jarekj amu.edu.pl>
* PURPOSE: Calculate area of clumped areas. Remove areas smaller than
- * given treshold.
+ * given treshold.
*
* COPYRIGHT: (C) 1999-2010 by the GRASS Development Team
*
@@ -24,131 +24,132 @@
int main(int argc, char *argv[])
{
- struct GModule *module;
- struct Option *input,
- *output,
- *par_treshold;
- struct Flag *flag_binary;
-
- struct Cell_head cellhd;
- struct Range range;
- struct History history;
+ struct GModule *module;
+ struct Option *input, *output, *par_treshold;
+ struct Flag *flag_binary;
- char *mapset;
- int nrows, ncols;
- int binary, treshold;
- int row, col;
- int infd, outfd;
- CELL *in_buf;
- CELL *out_buf;
- CELL c_min, c_max;
- int *ncells;
- int i;
-
- G_gisinit(argv[0]);
-
- input = G_define_standard_option(G_OPT_R_INPUT);
- input->description = _("Map created with r.clump");
-
- output = G_define_standard_option(G_OPT_R_OUTPUT);
- output->description = _("Map with area size (in cells)");
-
- par_treshold = G_define_option(); /* input stream mask file - optional */
- par_treshold->key = "treshold";
- par_treshold->type = TYPE_INTEGER;
- par_treshold->answer = "0";
- par_treshold->description = _("Remove areas lower than (0 for none):");
-
- flag_binary=G_define_flag();
- flag_binary->key = 'b';
- flag_binary->description = _("Binary output");
-
+ struct Cell_head cellhd;
+ struct Range range;
+ struct History history;
- if (G_parser(argc, argv))
+ char *mapset;
+ int nrows, ncols;
+ int binary, treshold;
+ int row, col;
+ int infd, outfd;
+ CELL *in_buf;
+ CELL *out_buf;
+ CELL c_min, c_max;
+ int *ncells;
+ int i;
+
+ G_gisinit(argv[0]);
+
+ input = G_define_standard_option(G_OPT_R_INPUT);
+ input->description = _("Map created with r.clump");
+
+ output = G_define_standard_option(G_OPT_R_OUTPUT);
+ output->description = _("Map with area size (in cells)");
+
+ par_treshold = G_define_option(); /* input stream mask file - optional */
+ par_treshold->key = "treshold";
+ par_treshold->type = TYPE_INTEGER;
+ par_treshold->answer = "0";
+ par_treshold->description = _("Remove areas lower than (0 for none):");
+
+ flag_binary = G_define_flag();
+ flag_binary->key = 'b';
+ flag_binary->description = _("Binary output");
+
+
+ if (G_parser(argc, argv))
exit(EXIT_FAILURE);
-
-
- treshold = atof(par_treshold->answer);
- binary = (flag_binary->answer != 0);
- mapset = (char*)G_find_raster2(input->answer, "");
-
- if (mapset == NULL)
+
+
+ treshold = atof(par_treshold->answer);
+ binary = (flag_binary->answer != 0);
+ mapset = (char *)G_find_raster2(input->answer, "");
+
+ if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), input->answer);
-
- infd = Rast_open_old(input->answer, mapset);
- Rast_get_cellhd(input->answer, mapset, &cellhd);
-
- if (Rast_map_type(input->answer, mapset) != CELL_TYPE)
- G_fatal_error(_("<%s> is not of type CELL, probably not crated with r.clump"), input->answer);
-
- Rast_init_range(&range);
- Rast_read_range(input->answer,mapset,&range);
- Rast_get_range_min_max(&range, &c_min, &c_max);
-
- in_buf = Rast_allocate_c_buf();
-
- nrows = Rast_window_rows();
- ncols = Rast_window_cols();
+ infd = Rast_open_old(input->answer, mapset);
+ Rast_get_cellhd(input->answer, mapset, &cellhd);
- ncells=G_calloc(c_max+1,sizeof(int));
- G_message(_("Reading..."));
- for (row = 0; row < nrows; row++) {
- G_percent(row, nrows, 2);
- Rast_get_row(infd, in_buf, row, CELL_TYPE);
+ if (Rast_map_type(input->answer, mapset) != CELL_TYPE)
+ G_fatal_error(_("<%s> is not of type CELL, probably not crated with r.clump"),
+ input->answer);
- for (col = 0; col < ncols; col++) {
- if(!Rast_is_c_null_value(&in_buf[col])) {
- if(in_buf[col]<c_min || in_buf[col] > c_max)
- G_fatal_error(_("Value at row %d, col %d out of range: %d"),row,col,in_buf[col]);
- ncells[in_buf[col]]++;
- }
- }
- } /* end for row */
-
- if(treshold) {
- for (i=1;i<c_max;++i)
- if(ncells[i]<treshold)
- ncells[i]=-1;
- }
-
- if(binary) {
- for (i=1;i<c_max;++i)
- ncells[i]= ncells[i]<treshold ? -1 : 1;
- }
-
- outfd = Rast_open_new(output->answer, CELL_TYPE);
- out_buf = Rast_allocate_c_buf();
+ Rast_init_range(&range);
+ Rast_read_range(input->answer, mapset, &range);
+ Rast_get_range_min_max(&range, &c_min, &c_max);
- G_message(_("Writing..."));
- for (row = 0; row < nrows; row++) {
- G_percent(row, nrows, 2);
-
+ in_buf = Rast_allocate_c_buf();
+
+ nrows = Rast_window_rows();
+ ncols = Rast_window_cols();
+
+ ncells = G_calloc(c_max + 1, sizeof(int));
+
+ G_message(_("Reading..."));
+ for (row = 0; row < nrows; row++) {
+ G_percent(row, nrows, 2);
Rast_get_row(infd, in_buf, row, CELL_TYPE);
-
- for (col = 0; col < ncols; col++) {
- if(Rast_is_c_null_value(&in_buf[col]) || ncells[in_buf[col]]==-1)
- if(binary)
- out_buf[col]=0;
- else
- Rast_set_c_null_value(&out_buf[col],1);
- else
- out_buf[col] = ncells[in_buf[col]];
- }
- Rast_put_row(outfd, out_buf, CELL_TYPE);
- } /* end for row */
-
- G_free(ncells);
- G_free(in_buf);
- Rast_close(infd);
- G_free(out_buf);
- Rast_close(outfd);
- Rast_short_history(output->answer, "raster", &history);
- Rast_command_history(&history);
- Rast_write_history(output->answer, &history);
-
- G_message(_("Done!"));
- exit(EXIT_SUCCESS);
+ for (col = 0; col < ncols; col++) {
+ if (!Rast_is_c_null_value(&in_buf[col])) {
+ if (in_buf[col] < c_min || in_buf[col] > c_max)
+ G_fatal_error(_("Value at row %d, col %d out of range: %d"),
+ row, col, in_buf[col]);
+ ncells[in_buf[col]]++;
+ }
+ }
+ } /* end for row */
+
+ if (treshold) {
+ for (i = 1; i < c_max; ++i)
+ if (ncells[i] < treshold)
+ ncells[i] = -1;
+ }
+
+ if (binary) {
+ for (i = 1; i < c_max; ++i)
+ ncells[i] = ncells[i] < treshold ? -1 : 1;
+ }
+
+ outfd = Rast_open_new(output->answer, CELL_TYPE);
+ out_buf = Rast_allocate_c_buf();
+
+ G_message(_("Writing..."));
+ for (row = 0; row < nrows; row++) {
+ G_percent(row, nrows, 2);
+
+ Rast_get_row(infd, in_buf, row, CELL_TYPE);
+
+ for (col = 0; col < ncols; col++) {
+ if (Rast_is_c_null_value(&in_buf[col]) ||
+ ncells[in_buf[col]] == -1)
+ if (binary)
+ out_buf[col] = 0;
+ else
+ Rast_set_c_null_value(&out_buf[col], 1);
+ else
+ out_buf[col] = ncells[in_buf[col]];
+ }
+ Rast_put_row(outfd, out_buf, CELL_TYPE);
+ } /* end for row */
+
+ G_free(ncells);
+ G_free(in_buf);
+ Rast_close(infd);
+ G_free(out_buf);
+ Rast_close(outfd);
+
+ Rast_short_history(output->answer, "raster", &history);
+ Rast_command_history(&history);
+ Rast_write_history(output->answer, &history);
+
+ G_message(_("Done!"));
+ exit(EXIT_SUCCESS);
}
More information about the grass-commit
mailing list