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

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-01-24 01:34:26 -0800 (Thu, 24 Jan 2013)
New Revision: 54765

Modified:
   grass/branches/releasebranch_6_4/raster/r.watershed/ram/do_cum.c
   grass/branches/releasebranch_6_4/raster/r.watershed/seg/do_cum.c
Log:
r.watershed: fix bug in SFD

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-01-24 08:29:10 UTC (rev 54764)
+++ grass/branches/releasebranch_6_4/raster/r.watershed/ram/do_cum.c	2013-01-24 09:34:26 UTC (rev 54765)
@@ -25,7 +25,7 @@
 	this_index = astar_pts[killer];
 	aspect = asp[this_index];
 	seg_index_rc(alt_seg, this_index, &r, &c);
-	if (aspect) {
+	if (aspect > 0) {
 	    dr = r + asp_r[ABS(aspect)];
 	    dc = c + asp_c[ABS(aspect)];
 	}
@@ -149,9 +149,9 @@
 	seg_index_rc(alt_seg, this_index, &r, &c);
 	FLAG_SET(worked, r, c);
 	aspect = asp[this_index];
-	if (aspect) {
-	    dr = r + asp_r[ABS(aspect)];
-	    dc = c + asp_c[ABS(aspect)];
+	if (aspect > 0) {
+	    dr = r + asp_r[aspect];
+	    dc = c + asp_c[aspect];
 	}
 	else
 	    dr = dc = -1;

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-01-24 08:29:10 UTC (rev 54764)
+++ grass/branches/releasebranch_6_4/raster/r.watershed/seg/do_cum.c	2013-01-24 09:34:26 UTC (rev 54765)
@@ -29,9 +29,9 @@
 	r = point.r;
 	c = point.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;