[GRASS-SVN] r55757 - in grass/branches/releasebranch_6_4/raster/r.watershed: ram seg

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-04-13 08:06:50 -0700 (Sat, 13 Apr 2013)
New Revision: 55757

Modified:
   grass/branches/releasebranch_6_4/raster/r.watershed/ram/do_cum.c
   grass/branches/releasebranch_6_4/raster/r.watershed/seg/close_maps.c
   grass/branches/releasebranch_6_4/raster/r.watershed/seg/do_cum.c
Log:
r.watershed: sync skipping edge cells

Modified: grass/branches/releasebranch_6_4/raster/r.watershed/ram/do_cum.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.watershed/ram/do_cum.c	2013-04-13 15:04:56 UTC (rev 55756)
+++ grass/branches/releasebranch_6_4/raster/r.watershed/ram/do_cum.c	2013-04-13 15:06:50 UTC (rev 55757)
@@ -26,8 +26,8 @@
 	aspect = asp[this_index];
 	seg_index_rc(alt_seg, this_index, &r, &c);
 	if (aspect > 0) {
-	    dr = r + asp_r[ABS(aspect)];
-	    dc = c + asp_c[ABS(aspect)];
+	    dr = r + asp_r[aspect];
+	    dc = c + asp_c[aspect];
 	}
 	else
 	    dr = dc = -1;

Modified: grass/branches/releasebranch_6_4/raster/r.watershed/seg/close_maps.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.watershed/seg/close_maps.c	2013-04-13 15:04:56 UTC (rev 55756)
+++ grass/branches/releasebranch_6_4/raster/r.watershed/seg/close_maps.c	2013-04-13 15:06:50 UTC (rev 55757)
@@ -139,7 +139,7 @@
 	G_write_colors(asp_name, this_mapset, &colors);
     }
     cseg_close(&asp);
-    /* visual ouput no longer needed */
+    /* visual output no longer needed */
     if (dis_flag) {
 	if (bas_thres <= 0)
 	    bas_thres = 60;

Modified: grass/branches/releasebranch_6_4/raster/r.watershed/seg/do_cum.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.watershed/seg/do_cum.c	2013-04-13 15:04:56 UTC (rev 55756)
+++ grass/branches/releasebranch_6_4/raster/r.watershed/seg/do_cum.c	2013-04-13 15:06:50 UTC (rev 55757)
@@ -165,9 +165,9 @@
 	c = point.c;
 	bseg_put(&worked, &one, r, c);
 	cseg_get(&asp, &asp_val, r, c);
-	if (asp_val) {
-	    dr = r + asp_r[ABS(asp_val)];
-	    dc = c + asp_c[ABS(asp_val)];
+	if (asp_val > 0) {
+	    dr = r + asp_r[asp_val];
+	    dc = c + asp_c[asp_val];
 	}
 	else
 	    dr = dc = -1;