[Olena-patches] olena: olena-2.0-762-g8caa6a0 Replace meyer_wst with watershed::flooding.

* apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc: Here. --- milena/ChangeLog | 6 ++++++ milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9d24f2c..8f33654 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-08-29 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Replace meyer_wst with watershed::flooding. + + * apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc: Here. + +2013-08-29 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Convert remaining Milena code to mln_trace. * doc/examples/devel/facade.cc.raw, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc index 97b731c..d69959e 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc @@ -43,7 +43,7 @@ #include <mln/core/image/complex_neighborhoods.hh> #include <mln/morpho/closing/area.hh> -#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/watershed/flooding.hh> #include <mln/math/pi.hh> #include <mln/math/max.hh> @@ -160,7 +160,7 @@ int main(int argc, char* argv[]) wst_val_t nbasins; typedef mln::unsigned_2complex_image3df wst_ima_t; wst_ima_t wshed = - mln::morpho::meyer_wst(closed_ima, adj_edges_nbh, nbasins); + mln::morpho::watershed::flooding(closed_ima, adj_edges_nbh, nbasins); std::cout << "nbasins = " << nbasins << std::endl; // Label polygons (i.e., propagate labels from edges to polygons). -- 1.7.10.4