Remove erroneous svn:executable properties

Add svn:ignore properties
Convert to ANSI C (C89)
Use strcmp instead of strcoll
Read data as CELL (using map's quant rules) rather than using C typecast
Add ->options to qcname=
Fix formatting
Miscellaneous cleanup


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33574 15284696-431f-4ddb-bdfa-cd5b030d7da7

imagery/i.albedo/main.c

@@ -34,67 +34,51 @@ double bb_alb_modis(double redchan, double nirchan, double chan3,
 int main(int argc, char *argv[])
 {
     struct Cell_head cellhd;	/*region+header info */
-
-    char *mapset;		/*mapset name */
-
     int nrows, ncols;
-
     int row, col;
-
     struct GModule *module;
-
     struct Option *input, *output;
-
     struct Flag *flag1, *flag2, *flag3;
-
     struct Flag *flag4, *flag5, *flag6;
-
     struct History history;	/*metadata */
-
     struct Colors colors;	/*Color rules */
 
-	/************************************/
+    /************************************/
     /* FMEO Declarations**************** */
     char *name;			/*input raster name */
-
     char *result;		/*output raster name */
-
     /*File Descriptors */
     int nfiles;
-
     int infd[MAXFILES];
-
     int outfd;
-
     char **names;
-
     char **ptr;
-
-    int ok;
-
     int i = 0, j = 0;
-
     int modis = 0, aster = 0, avhrr = 0, landsat = 0;
-
     void *inrast[MAXFILES];
-
     unsigned char *outrast;
-
     int data_format;		/* 0=double  1=float  2=32bit signed int  5=8bit unsigned int (ie text) */
-
     RASTER_MAP_TYPE in_data_type[MAXFILES];	/* 0=numbers  1=text */
-
     RASTER_MAP_TYPE out_data_type = DCELL_TYPE;
 
-	/************************************/
+    /************************************/
+    int peak1, peak2, peak3;
+    int i_peak1, i_peak2, i_peak3;
 
-	/************************************/
+    int bottom1a, bottom1b;
+    int bottom2a, bottom2b;
+    int bottom3a, bottom3b;
+    int i_bottom1a, i_bottom1b;
+    int i_bottom2a, i_bottom2b;
+    int i_bottom3a, i_bottom3b;
+
+    /************************************/
     int histogram[100];
 
     /* Albedo correction coefficients*** */
     double a, b;
 
-	/************************************/
+    /************************************/
 
     G_gisinit(argv[0]);
 
@@ -115,39 +99,37 @@ int main(int argc, char *argv[])
     /* Define the different flags */
 
     flag1 = G_define_flag();
-    flag1->key = _('m');
+    flag1->key = 'm';
     flag1->description = _("Modis (7 input bands:1,2,3,4,5,6,7)");
 
     flag2 = G_define_flag();
-    flag2->key = _('n');
+    flag2->key = 'n';
     flag2->description = _("NOAA AVHRR (2 input bands:1,2)");
 
     flag3 = G_define_flag();
-    flag3->key = _('l');
+    flag3->key = 'l';
     flag3->description = _("Landsat (6 input bands:1,2,3,4,5,7)");
 
     flag4 = G_define_flag();
-    flag4->key = _('a');
+    flag4->key = 'a';
     flag4->description = _("Aster (6 input bands:1,3,5,6,8,9)");
 
     flag5 = G_define_flag();
-    flag5->key = _('c');
+    flag5->key = 'c';
     flag5->description =
 	_("Albedo dry run to calculate some water to beach/sand/desert stretching, a kind of simple atmospheric correction. Agressive mode (Landsat).");
 
     flag6 = G_define_flag();
-    flag6->key = _('d');
+    flag6->key = 'd';
     flag6->description =
 	_("Albedo dry run to calculate some water to beach/sand/desert stretching, a kind of simple atmospheric correction. Soft mode (Modis).");
 
     /* FMEO init nfiles */
     nfiles = 1;
 
-	/********************/
     if (G_parser(argc, argv))
 	exit(-1);
 
-    ok = 1;
     names = input->answers;
     ptr = input->answers;
 
@@ -158,80 +140,60 @@ int main(int argc, char *argv[])
     landsat = (flag3->answer);
     aster = (flag4->answer);
 
-	/***************************************************/
-    if (G_legal_filename(result) < 0) {
+    if (G_legal_filename(result) < 0)
 	G_fatal_error(_("[%s] is an illegal name"), result);
-    }
-
-	/***************************************************/
 
-	/***************************************************/
     for (; *ptr != NULL; ptr++) {
 	if (nfiles >= MAXFILES)
-	    G_fatal_error(_("%s - too many ETa files. Only %d allowed"),
-			  G_program_name(), MAXFILES);
+	    G_fatal_error(_("too many ETa files. Only %d allowed"), MAXFILES);
 	name = *ptr;
-	/* find map in mapset */
-	mapset = G_find_cell2(name, "");
-	if (mapset == NULL) {
-	    G_fatal_error(_("cell file [%s] not found"), name);
-	    ok = 0;
-	}
-	if (!ok) {
-	    continue;
-	}
-	infd[nfiles] = G_open_cell_old(name, mapset);
-	if (infd[nfiles] < 0) {
-	    ok = 0;
+
+	infd[nfiles] = G_open_cell_old(name, "");
+	if (infd[nfiles] < 0)
 	    continue;
-	}
+
 	/* Allocate input buffer */
-	in_data_type[nfiles] = G_raster_map_type(name, mapset);
-	if ((infd[nfiles] = G_open_cell_old(name, mapset)) < 0) {
+	in_data_type[nfiles] = G_raster_map_type(name, "");
+	if ((infd[nfiles] = G_open_cell_old(name, "")) < 0)
 	    G_fatal_error(_("Cannot open cell file [%s]"), name);
-	}
-	if ((G_get_cellhd(name, mapset, &cellhd)) < 0) {
+
+	if ((G_get_cellhd(name, "", &cellhd)) < 0)
 	    G_fatal_error(_("Cannot read file header of [%s]"), name);
-	}
+
 	inrast[nfiles] = G_allocate_raster_buf(in_data_type[nfiles]);
 	nfiles++;
     }
     nfiles--;
-    if (nfiles <= 1) {
+    if (nfiles <= 1)
 	G_fatal_error(_("The min specified input map is two (that is NOAA AVHRR)"));
-    }
 
-	/***************************************************/
     /* Allocate output buffer, use input map data_type */
     nrows = G_window_rows();
     ncols = G_window_cols();
     outrast = G_allocate_raster_buf(out_data_type);
 
     /* Create New raster files */
-    if ((outfd = G_open_raster_new(result, 1)) < 0) {
+    if ((outfd = G_open_raster_new(result, 1)) < 0)
 	G_fatal_error(_("Could not open <%s>"), result);
-    }
+
     /*START ALBEDO HISTOGRAM STRETCH */
     /*This is correcting contrast for water/sand */
     /*A poor man's atmospheric correction... */
-    for (i = 0; i < 100; i++) {
+    for (i = 0; i < 100; i++)
 	histogram[i] = 0;
-    }
+
     if (flag5->answer || flag6->answer) {
 	DCELL de;
-
 	DCELL d[MAXFILES];
 
-		/****************************/
 	/* Process pixels histogram */
 	for (row = 0; row < nrows; row++) {
 	    G_percent(row, nrows, 2);
 	    /* read input map */
 	    for (i = 1; i <= nfiles; i++) {
-		if ((G_get_raster_row
-		     (infd[i], inrast[i], row, in_data_type[i])) < 0) {
+		if ((G_get_raster_row(
+			 infd[i], inrast[i], row, in_data_type[i])) < 0)
 		    G_fatal_error(_("Could not read from <%s>"), name);
-		}
 	    }
 	    /*process the data */
 	    for (col = 0; col < ncols; col++) {
@@ -275,9 +237,6 @@ int main(int argc, char *argv[])
 	    }
 	}
 	G_message("Histogram of Albedo\n");
-	int peak1, peak2, peak3;
-
-	int i_peak1, i_peak2, i_peak3;
 
 	peak1 = 0;
 	peak2 = 0;
@@ -308,17 +267,6 @@ int main(int argc, char *argv[])
 		}
 	    }
 	}
-	int bottom1a, bottom1b;
-
-	int bottom2a, bottom2b;
-
-	int bottom3a, bottom3b;
-
-	int i_bottom1a, i_bottom1b;
-
-	int i_bottom2a, i_bottom2b;
-
-	int i_bottom3a, i_bottom3b;
 
 	bottom1a = 100000;
 	bottom1b = 100000;
@@ -391,20 +339,17 @@ int main(int argc, char *argv[])
     }				/*END OF FLAG1 */
     /* End of processing histogram */
 
-	/*******************/
     /* Process pixels */
     for (row = 0; row < nrows; row++) {
 	DCELL de;
-
 	DCELL d[MAXFILES];
 
 	G_percent(row, nrows, 2);
 	/* read input map */
 	for (i = 1; i <= nfiles; i++) {
-	    if ((G_get_raster_row(infd[i], inrast[i], row, in_data_type[i])) <
-		0) {
+	    if ((G_get_raster_row(
+		     infd[i], inrast[i], row, in_data_type[i])) < 0)
 		G_fatal_error(_("Could not read from <%s>"), name);
-	    }
 	}
 	/*process the data */
 	for (col = 0; col < ncols; col++) {

imagery/i.qc.modis/main.c

@@ -14,105 +14,79 @@
  *   	    	 for details.
  * 
  *****************************************************************************/
-     
-    
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
 #include <grass/glocale.h>
-    
+
     /* 250m Products (MOD09Q) */ 
 int qc250a(unsigned int pixel);
-
 int qc250b(unsigned int pixel);
-
 int qc250c(unsigned int pixel, int bandno);
-
 int qc250d(unsigned int pixel);
-
 int qc250e(unsigned int pixel);
-
 int qc250f(unsigned int pixel);
 
 
     /* 500m Products (MOD09A) */ 
 int qc500a(long int pixel);
-
 int qc500c(long int pixel, int bandno);
-
 int qc500d(long int pixel);
-
 int qc500e(long int pixel);
 
 int main(int argc, char *argv[]) 
 {
     struct Cell_head cellhd;	/*region+header info */
-
-    char *mapset;		/*mapset name */
-
     int nrows, ncols;
-
     int row, col;
-
     char *qcflag;		/*Switch for particular index */
-
     struct GModule *module;
-
     struct Option *input1, *input2, *input_band, *output;
-
-    struct Flag *flag1, *flag2;
-
+    struct Flag *flag1;
     struct History history;	/*metadata */
-
     struct Colors colors;	/*Color rules */
 
-    
 
-	/************************************/ 
-	/* FMEO Declarations**************** */ 
-    char *name;			/*input raster name */
 
+    /************************************/ 
+    /* FMEO Declarations**************** */ 
     char *result;		/*output raster name */
 
-    
-	/*File Descriptors */ 
-    int infd;
 
+    /*File Descriptors */ 
+    int infd;
     int outfd;
-
     char *qcchan;
-
     int bandno;
-
-    int i = 0, j = 0;
-
-    void *inrast;
-
-    CELL * outrast;
+    CELL *inrast;
+    CELL *outrast;
     RASTER_MAP_TYPE data_type_output = CELL_TYPE;
-    RASTER_MAP_TYPE data_type_qcchan;
-    
 
-	/************************************/ 
-	G_gisinit(argv[0]);
+
+    /************************************/ 
+    G_gisinit(argv[0]);
     module = G_define_module();
     module->keywords = _("QC, Quality Control, surface reflectance, Modis");
     module->description =
 	_("Extract quality control parameters from Modis QC layers");
-    
-	/* Define the different options */ 
-	input1 = G_define_option();
+
+    /* Define the different options */ 
+    input1 = G_define_option();
     input1->key = _("qcname");
     input1->type = TYPE_STRING;
     input1->required = YES;
     input1->gisprompt = _("Name of QC type to extract");
-    input1->description =
-	_("Name of QC: modland_qa_bits, cloud, data_quality, atcorr, adjcorr, diff_orbit_from_500m");
+    input1->description = _("Name of QC");
+    input1->options = "adjcorr,atcorr,cloud,data_quality,diff_orbit_from_500m,modland_qa_bits";
     input1->answer = _("modland_qa_bits");
+
     input2 = G_define_standard_option(G_OPT_R_INPUT);
     input2->description =
 	_("Name of the surface reflectance QC layer [bit array]");
+
     input_band = G_define_option();
     input_band->key = "band";
     input_band->type = TYPE_INTEGER;
@@ -120,202 +94,135 @@ int main(int argc, char *argv[])
     input_band->gisprompt = "old,value";
     input_band->description =
 	_("Band number of Modis product 250m=[1,2],500m=[1-7]");
+
     output = G_define_standard_option(G_OPT_R_OUTPUT);
     output->key = _("output");
     output->description =
 	_("Name of the output QC type classification layer");
     output->answer = _("qc");
+
     flag1 = G_define_flag();
     flag1->key = 'A';
     flag1->description =
 	_("QC for MOD09A product @ 500m instead of default MOD09Q@250m");
-    
 
-	/********************/ 
-	if (G_parser(argc, argv))
+
+    /********************/ 
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
+
     qcflag = input1->answer;
     qcchan = input2->answer;
-    if (input_band->answer) {
+    if (input_band->answer)
 	bandno = atoi(input_band->answer);
-    }
+
     result = output->answer;
-    
 
-	/***************************************************/ 
-	if ((!strcoll(qcflag, "cloud") && flag1->answer) || 
-	    (!strcoll(qcflag, "diff_orbit_from_500m") && flag1->answer)) {
-	G_fatal_error("Those flags cannot work with MOD09A @ 500m products");
-    }
-    if (!strcoll(qcflag, "data_quality")) {
+    if ((!strcmp(qcflag, "cloud") && flag1->answer) || 
+	(!strcmp(qcflag, "diff_orbit_from_500m") && flag1->answer))
+	G_fatal_error(_("Those flags cannot work with MOD09A @ 500m products"));
+
+    if (!strcmp(qcflag, "data_quality")) {
 	if (bandno < 1 || bandno > 7)
-	    G_fatal_error("band number out of allowed range [1-7]");
+	    G_fatal_error(_("band number out of allowed range [1-7]"));
 	if (!flag1->answer && bandno > 2)
-	    G_fatal_error("250m band number is out of allowed range [1,2]");
+	    G_fatal_error(_("250m band number is out of allowed range [1,2]"));
     }
-    
 
-	/***************************************************/ 
-	mapset = G_find_cell2(qcchan, "");
-    if (mapset == NULL) {
-	G_fatal_error(_("cell file [%s] not found"), qcchan);
-    }
-    data_type_qcchan = G_raster_map_type(qcchan, mapset);
-    if ((infd = G_open_cell_old(qcchan, mapset)) < 0)
+    if ((infd = G_open_cell_old(qcchan, "")) < 0)
 	G_fatal_error(_("Cannot open cell file [%s]"), qcchan);
-    if (G_get_cellhd(qcchan, mapset, &cellhd) < 0)
+
+    if (G_get_cellhd(qcchan, "", &cellhd) < 0)
 	G_fatal_error(_("Cannot read file header of [%s]"), qcchan);
-    inrast = G_allocate_raster_buf(data_type_qcchan);
-    
 
-	/***************************************************/ 
-	G_debug(3, "number of rows %d", cellhd.rows);
+    inrast = G_allocate_c_raster_buf();
+
+    G_debug(3, "number of rows %d", cellhd.rows);
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast = G_allocate_raster_buf(data_type_output);
-    
-	/* Create New raster files */ 
-	if ((outfd = G_open_raster_new(result, data_type_output)) < 0)
+    outrast = G_allocate_c_raster_buf();
+
+    /* Create New raster files */ 
+    if ((outfd = G_open_raster_new(result, data_type_output)) < 0)
 	G_fatal_error(_("Could not open <%s>"), result);
-    
-	/* Process pixels */ 
-	for (row = 0; row < nrows; row++)
-	 {
+
+    /* Process pixels */ 
+    for (row = 0; row < nrows; row++)
+    {
 	CELL c;
 	unsigned int qc250chan;
-
 	CELL qc500chan;
 	G_percent(row, nrows, 2);
-	if (G_get_raster_row(infd, inrast, row, data_type_qcchan) < 0)
+	if (G_get_c_raster_row(infd, inrast, row) < 0)
 	    G_fatal_error(_("Could not read from <%s>"), qcchan);
-	
-	    /*process the data */ 
-	    for (col = 0; col < ncols; col++)
-	     {
-	    switch (data_type_qcchan) {
-	    case CELL_TYPE:
-		c = (int)((CELL *) inrast)[col];
-		break;
-	    case FCELL_TYPE:
-		c = (int)((FCELL *) inrast)[col];
-		break;
-	    case DCELL_TYPE:
-		c = (int)((DCELL *) inrast)[col];
-		break;
-	    }
-	    if (flag1->answer) {
-		
-		    /* This is a MOD09A@500m product, QC layer is 32-bit */ 
-		    qc500chan = c;
-	    }
-	    else {
-		
-		    /* This is a MOD09A@250m product, QC layer is 16-bit */ 
-		    qc250chan = (unsigned int)((CELL *) inrast)[col];
-	    } if (G_is_c_null_value(&c)) {
+
+	/*process the data */ 
+	for (col = 0; col < ncols; col++)
+	{
+	    c = inrast[col];
+
+	    if (flag1->answer)
+		/* This is a MOD09A@500m product, QC layer is 32-bit */ 
+		qc500chan = c;
+	    else
+		/* This is a MOD09A@250m product, QC layer is 16-bit */ 
+		qc250chan = (unsigned int) c;
+
+	    if (G_is_c_null_value(&c))
 		G_set_c_null_value(&outrast[col], 1);
-	    }
-	    else {
-		
-		    /*calculate modland QA bits extraction  */ 
-		    if (!strcoll(qcflag, "modland_qa_bits")) {
-		    if (flag1->answer) {
-			
-			    /* 500m product */ 
-			    c = qc500a(qc500chan);
-		    }
-		    else {
-			
-			    /* 250m product */ 
-			    c = qc250a(qc250chan);
-		    }
-		    outrast[col] = c;
-		}
+	    else if (!strcmp(qcflag, "modland_qa_bits")) {
+		/*calculate modland QA bits extraction  */ 
+		if (flag1->answer)
+		    c = qc500a(qc500chan);
 		else
-		    
-			/*calculate cloud state  */ 
-		    if (!strcoll(qcflag, "cloud")) {
-		    
-			/* ONLY 250m product! */ 
-			c = qc250b(qc250chan);
-		    outrast[col] = c;
-		}
-		else
-		    
-			/*calculate modland QA bits extraction  */ 
-		    if (!strcoll(qcflag, "data_quality")) {
-		    if (flag1->answer) {
-			
-			    /* 500m product */ 
-			    c = qc500c(qc500chan, bandno);
-		    }
-		    else {
-			
-			    /* 250m product */ 
-			    c = qc250c(qc250chan, bandno);
-		    }
-		    outrast[col] = c;
-		}
-		else
-		    
-			/*calculate atmospheric correction flag  */ 
-		    if (!strcoll(qcflag, "atcorr")) {
-		    if (flag1->answer) {
-			
-			    /* 500m product */ 
-			    c = qc500d(qc500chan);
-		    }
-		    else {
-			
-			    /* 250m product */ 
-			    c = qc250d(qc250chan);
-		    }
-		    outrast[col] = c;
-		}
+		    c = qc250a(qc250chan);
+	    }
+	    else if (!strcmp(qcflag, "cloud"))
+		/*calculate cloud state  */ 
+		/* ONLY 250m product! */ 
+		c = qc250b(qc250chan);
+	    else if (!strcmp(qcflag, "data_quality")) {
+		/*calculate modland QA bits extraction  */ 
+		if (flag1->answer)
+		    c = qc500c(qc500chan, bandno);
 		else
-		    
-			/*calculate adjacency correction flag  */ 
-		    if (!strcoll(qcflag, "adjcorr")) {
-		    if (flag1->answer) {
-			
-			    /* 500m product */ 
-			    c = qc500e(qc500chan);
-		    }
-		    else {
-			
-			    /* 250m product */ 
-			    c = qc250e(qc250chan);
-		    }
-		    outrast[col] = c;
-		}
+		    c = qc250c(qc250chan, bandno);
+	    }
+	    else if (!strcmp(qcflag, "atcorr")) {
+		/*calculate atmospheric correction flag  */ 
+		if (flag1->answer)
+		    c = qc500d(qc500chan);
 		else
-		    
-			/*calculate different orbit from 500m flag  */ 
-		    if (!strcoll(qcflag, "diff_orbit_from_500m")) {
-		    
-			/* ONLY 250m product! */ 
-			c = qc250f(qc500chan);
-		    outrast[col] = c;
-		}
-		else {
-		    
-			/* Signal user that the flag name is badly written */ 
-			/* therefore not understood by the application */ 
-			G_fatal_error
-			("Unknown flag name, please check spelling");
-		}
+		    c = qc250d(qc250chan);
 	    }
+	    else if (!strcmp(qcflag, "adjcorr")) {
+		/*calculate adjacency correction flag  */ 
+		if (flag1->answer)
+		    c = qc500e(qc500chan);
+		else
+		    c = qc250e(qc250chan);
 	    }
-	if (G_put_raster_row(outfd, outrast, data_type_output) < 0)
-	    G_fatal_error(_("Cannot write to output raster file"));
+	    else if (!strcmp(qcflag, "diff_orbit_from_500m"))
+		/*calculate different orbit from 500m flag  */ 
+		/* ONLY 250m product! */ 
+		c = qc250f(qc500chan);
+	    else
+		G_fatal_error(_("Unknown flag name, please check spelling"));
+
+	    outrast[col] = c;
 	}
+
+	if (G_put_c_raster_row(outfd, outrast) < 0)
+	    G_fatal_error(_("Cannot write to output raster file"));
+    }
+
     G_free(inrast);
     G_close_cell(infd);
     G_free(outrast);
     G_close_cell(outfd);
-    
-	/* Color from -1.0 to +1.0 in grey */ 
-	G_init_colors(&colors);
+
+    /* Color from -1.0 to +1.0 in grey */ 
+    G_init_colors(&colors);
     G_add_color_rule(0, 0, 0, 0, 10, 255, 255, 255, &colors);
     G_short_history(result, "raster", &history);
     G_command_history(&history);