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

[svn_grass at osgeo.org]

Author: mmetz
Date: 2010-12-17 07:17:21 -0800 (Fri, 17 Dec 2010)
New Revision: 44627

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:
always mark as processed

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	2010-12-17 15:14:07 UTC (rev 44626)
+++ grass/branches/releasebranch_6_4/raster/r.watershed/ram/do_cum.c	2010-12-17 15:17:21 UTC (rev 44627)
@@ -146,6 +146,7 @@
 	G_percent(killer, do_points, 1);
 	this_index = astar_pts[killer];
 	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)];
@@ -359,7 +360,6 @@
 		if (er_flag && !is_swale)
 		    slope_length(r, c, r_max, c_max);
 	    }
-	    FLAG_SET(worked, r, c);
 	}
     }
     if (workedon)

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	2010-12-17 15:14:07 UTC (rev 44626)
+++ grass/branches/releasebranch_6_4/raster/r.watershed/seg/do_cum.c	2010-12-17 15:17:21 UTC (rev 44627)
@@ -163,6 +163,7 @@
 	first_cum = point.nxt;
 	r = point.r;
 	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)];
@@ -377,7 +378,6 @@
 		if (er_flag && !is_swale)
 		    slope_length(r, c, r_max, c_max);
 	    }
-	    bseg_put(&worked, &one, r, c);
 	}
     }
     G_percent(count, do_points, 1);	/* finish it */