* apps/constrained-connectivity/constrained-connectivity.cc: Here.
---
milena/ChangeLog | 6 ++++++
.../constrained-connectivity/constrained-connectivity.cc | 10 +++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index a11c82d..1d143cb 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Catch up with the new interface of the topological watershed.
+
+ * apps/constrained-connectivity/constrained-connectivity.cc: Here.
+
2010-05-11 Roland Levillain <roland(a)lrde.epita.fr>
Have the topological WST be more generic.
diff --git a/milena/apps/constrained-connectivity/constrained-connectivity.cc
b/milena/apps/constrained-connectivity/constrained-connectivity.cc
index 3dab1dc..d6ad094 100644
--- a/milena/apps/constrained-connectivity/constrained-connectivity.cc
+++ b/milena/apps/constrained-connectivity/constrained-connectivity.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE)
//
// This file is part of Olena.
//
@@ -164,11 +164,11 @@ int main(int argc, char* argv[])
This requires some changes in the topological WST implementation,
to make its component tree structure compatible with
morpho::tree::data. */
- typedef p_array<tree_t::site> sites_t;
- sites_t sites = data::sort_psites_decreasing(w);
- morpho::tree::data<w_t, sites_t> t(w, sites, world::inter_pixel::e2e());
+ typedef p_array<tree_t::psite> psites_t;
+ psites_t psites = data::sort_psites_decreasing(w);
+ morpho::tree::data<w_t, psites_t> t(w, psites, world::inter_pixel::e2e());
- // Create initial images for min and max values on sites (not components).
+ // Create initial images for min and max values on psites (not components).
mln_ch_value_(w_t, accu::stat::min<int_u8>) init_min_val;
initialize (init_min_val, w);
mln_ch_value_(w_t, accu::stat::max<int_u8>) init_max_val;
--
1.7.10.4
Show replies by date