[GRASS-SVN] r56392 - grass/trunk/raster/r.watershed/seg

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-05-23 13:07:48 -0700 (Thu, 23 May 2013)
New Revision: 56392

Modified:
   grass/trunk/raster/r.watershed/seg/do_cum.c
Log:
r.watershed.seg: fix edge check

Modified: grass/trunk/raster/r.watershed/seg/do_cum.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/do_cum.c	2013-05-23 20:01:55 UTC (rev 56391)
+++ grass/trunk/raster/r.watershed/seg/do_cum.c	2013-05-23 20:07:48 UTC (rev 56392)
@@ -147,6 +147,7 @@
 	    np_side = -1;
 	    r_nbr = dr;
 	    c_nbr = dc;
+#if 0
 	    for (ct_dir = 0; ct_dir < sides; ct_dir++) {
 		/* get r, c (r_nbr, c_nbr) for neighbours */
 		r_nbr = r + nextdr[ct_dir];
@@ -164,6 +165,7 @@
 			break;
 		}
 	    }
+#endif
 	    /* do not distribute flow along edges, this causes artifacts */
 	    if (FLAG_GET(af.flag, EDGEFLAG)) {
 		if (FLAG_GET(af.flag, SWALEFLAG) && af.asp > 0) {
@@ -214,6 +216,7 @@
 		is_swale = 1;
 	    }
 	    else {
+		seg_get(&aspflag, (char *)&afdown, dr, dc);
 		if (er_flag && !is_swale && !FLAG_GET(afdown.flag, RUSLEBLOCKFLAG))
 		    slope_length(r, c, dr, dc);
 	    }