https://svn.lrde.epita.fr/svn/oln/trunk/milena
Index: ChangeLog
from Thierry Geraud <thierry.geraud(a)lrde.epita.fr>
Fix a graph test.
* tests/core/image/graph_image.cc: Fix.
graph_image.cc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Index: tests/core/image/graph_image.cc
--- tests/core/image/graph_image.cc (revision 2994)
+++ tests/core/image/graph_image.cc (working copy)
@@ -185,11 +185,10 @@
mln_assertion(ima(p) == i++);
typedef graph_elt_window<util::graph, fsite_t> win_t;
- typedef neighb<win_t> neigh_t;
+ win_t win;
{
// Window - Forward iteration
- win_t win;
mln_qiter_(win_t) q(win, p);
for_all (p)
{
@@ -202,7 +201,6 @@
{
// Window - Backward iteration
- win_t win;
mln_bkd_qiter_(win_t) q(win, p);
for_all (p)
{
@@ -213,10 +211,13 @@
}
}
+ typedef neighb<win_t> neigh_t;
+
{
// Neighborhood - Forward iteration
- neigh_t neigh(win_t());
+ neigh_t neigh(win);
mln_niter_(neigh_t) n(neigh, p);
+
for_all (p)
{
std::cout << "neighbors of " << p << " ("
<< ima(p) << "), " << std::endl;
@@ -230,7 +231,7 @@
{
// Neighborhood - Backward iteration
- neigh_t neigh(win_t());
+ neigh_t neigh(win);
mln_bkd_niter_(neigh_t) n(neigh, p);
for_all (p)
{