[GRASS-SVN] r68852 - grass-addons/grass7/raster/r.geomorphon

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-07-04 04:25:26 -0700 (Mon, 04 Jul 2016)
New Revision: 68852

Modified:
   grass-addons/grass7/raster/r.geomorphon/geom.c
   grass-addons/grass7/raster/r.geomorphon/main.c
   grass-addons/grass7/raster/r.geomorphon/memory.c
Log:
r.geomorphon: fixed unused variables; shadowed declaration to be fixed

Modified: grass-addons/grass7/raster/r.geomorphon/geom.c
===================================================================
--- grass-addons/grass7/raster/r.geomorphon/geom.c	2016-07-04 10:18:05 UTC (rev 68851)
+++ grass-addons/grass7/raster/r.geomorphon/geom.c	2016-07-04 11:25:26 UTC (rev 68852)
@@ -1,5 +1,5 @@
 #include "local_proto.h"
-static double dirs[8] = { 0.7854, 0., 5.4978, 4.7124, 3.9270, 3.1416, 2.3562, 1.5708 };	/* radians */
+/* static double dirs[8] = { 0.7854, 0., 5.4978, 4.7124, 3.9270, 3.1416, 2.3562, 1.5708 };*/	/* radians */
 static double sins[8] = { 0.7071067812, 0, -0.7071067812, -1, -0.7071067812, 0, 0.7071067812, 1 };	/* sinus */
 static double coss[8] = { 0.7071067812, 1, 0.7071067812, 0, -0.7071067812, -1, -0.7071067812, 0 };	/* cosinus */
 
@@ -19,7 +19,6 @@
     unsigned int code = 10000, tmp_code, rev_code = 10000, tmp_rev_code;
     int power = 1;
     int i, j, k;
-    int res;
 
     for (i = 0; i < 8; i++) {
 	pattern[i] = value % 3;

Modified: grass-addons/grass7/raster/r.geomorphon/main.c
===================================================================
--- grass-addons/grass7/raster/r.geomorphon/main.c	2016-07-04 10:18:05 UTC (rev 68851)
+++ grass-addons/grass7/raster/r.geomorphon/main.c	2016-07-04 11:25:26 UTC (rev 68852)
@@ -88,9 +88,9 @@
 
     struct History history;
 
-    int i, j, n;
+    int i;
     int meters = 0, multires = 0, extended = 0;	/* flags */
-    int row, cur_row, col, radius;
+    int row, cur_row, col;
     int pattern_size;
     double max_resolution;
     char prefix[20];
@@ -310,7 +310,6 @@
 	PATTERN *pattern;
 	PATTERN patterns[4];
 	void *pointer_buf;
-	int formA, formB, formC;
 	double search_dist = search_distance;
 	double skip_dist = skip_distance;
 	double flat_dist = flat_distance;
@@ -487,7 +486,7 @@
 	if (opt_output[o_range]->answer)
 	    write_contrast_colors(opt_output[o_range]->answer);
 
-	G_done_msg("");
+	G_done_msg(" ");
 	exit(EXIT_SUCCESS);
     }				/* end of multiresolution */
 

Modified: grass-addons/grass7/raster/r.geomorphon/memory.c
===================================================================
--- grass-addons/grass7/raster/r.geomorphon/memory.c	2016-07-04 10:18:05 UTC (rev 68851)
+++ grass-addons/grass7/raster/r.geomorphon/memory.c	2016-07-04 11:25:26 UTC (rev 68852)
@@ -4,10 +4,8 @@
 {
 
     int row, col;
-    int fd;
     char *mapset;
     struct Cell_head cellhd;
-    int bufsize;
     void *tmp_buf;
 
     mapset = (char *)G_find_raster2(rast->elevname, "");
@@ -72,7 +70,7 @@
     int i;
     int col;
     void *tmp_buf;
-    FCELL *tmp_elev_buf, *slope_tmp, *aspect_tmp;
+    FCELL *tmp_elev_buf;
 
     tmp_buf = Rast_allocate_buf(elevation.raster_type);
     tmp_elev_buf = elevation.elev[0];
@@ -128,7 +126,7 @@
 int write_contrast_colors(char *raster)
 {
     struct Colors colors;
-    struct Categories cats;
+    /* struct Categories cats; */
 
     FCOLORS fcolors[9] = {	/* colors for positive openness */
 	{-2500, 0, 0, 50, NULL},