Markus N wrote: > ... since Hamish currently backports more from dev6, I'll > postpone RC3 for some hours or whatever suitable.
thanks, I'm done for now, but there's one outstanding difference between relbr64 and devbr6 for r.watershed that MarkusM might have a look at (see below). I mostly focused on display/ and raster/ where most of my changes are. scripts/ and ps/ should be ok. I tried to just focus on either bugs or simple changes which were made long long ago so have had tons of testing already. Using kdiff3 I notice a few differences in the DB drivers, I think some extra driver closings and debug experiments were put into devbr6 for testing zombie dbf.exe errors in WinGrass. It's probably still worth comparing the two builds on wingrass to see if they actually help -- aka it will be good to know what commit definitively fixes it as opposed to guessing that it might be ok now. A number or nviz diffs exist too, maybe should be looked at at some point by the authors. (seems to be Tcl 8.6 api updates, +) kompare/kdiff3/meld were all a bit annoying to set up with regex filters to avoid $Date$, OBJ.*, .svn/, dist.*, etc., I should write down some notes in the wiki while it's still fresh in my mind, but it's too late for today. -->so I'm go for RC3 as soon as r.watershed gets looked at. regards, Hamish --- https://trac.osgeo.org/grass/changeset/54765 https://trac.osgeo.org/grass/changeset/54766 a current diff on raster/r.watershed/ram/do_cum.c, the first one just seems to be a speedup, the second changes behavior. --- relbr_6_4/raster/r.watershed/ram/do_cum.c 2013-02-20 17:45:31.877625578 +1300 +++ grass65/raster/r.watershed/ram/do_cum.c 2013-04-12 17:52:36.990693417 +1200 @@ -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; @@ -149,9 +149,9 @@ seg_index_rc(alt_seg, this_index, &r, &c); FLAG_SET(worked, r, c); aspect = asp[this_index]; - if (aspect > 0) { - dr = r + asp_r[aspect]; - dc = c + asp_c[aspect]; + if (aspect) { + dr = r + asp_r[ABS(aspect)]; + dc = c + asp_c[ABS(aspect)]; } else dr = dc = -1; _______________________________________________ grass-dev mailing list grass-dev@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/grass-dev