* doc/examples/trash/tuto_bis.cc, * doc/examples/trash/tuto_one.cc, * tools/area_flooding.cc: Here, by morpho::watershed::flooding. --- milena/ChangeLog | 9 +++++++++ milena/doc/examples/trash/tuto_bis.cc | 8 ++++---- milena/doc/examples/trash/tuto_one.cc | 4 ++-- milena/tools/area_flooding.cc | 7 ++++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7bdcd1a..a371d41 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2013-03-05 Roland Levillain <roland@lrde.epita.fr> + + Replace remaining uses of morpho::meyer_wst in Milena. + + * doc/examples/trash/tuto_bis.cc, + * doc/examples/trash/tuto_one.cc, + * tools/area_flooding.cc: + Here, by morpho::watershed::flooding. + 2012-07-19 Roland Levillain <roland@lrde.epita.fr> Remove references to mln/morpho/meyer_wst.hh in mln/morpho/. diff --git a/milena/doc/examples/trash/tuto_bis.cc b/milena/doc/examples/trash/tuto_bis.cc index 238f843..4f14674 100644 --- a/milena/doc/examples/trash/tuto_bis.cc +++ b/milena/doc/examples/trash/tuto_bis.cc @@ -23,7 +23,7 @@ # include <mln/data/transform.hh> # include <mln/extension/fill.hh> -# include <mln/morpho/meyer_wst.hh> +# include <mln/morpho/watershed/flooding.hh> # include <mln/morpho/gradient.hh> # include <mln/morpho/dilation.hh> @@ -176,9 +176,9 @@ int main() unsigned nbasins; - data::fill(wst, morpho::meyer_wst(edge, e2e, nbasins)); - // ^^^ - // edge -> neighboring edges + data::fill(wst, morpho::watershed::flooding(edge, e2e, nbasins)); + // ^^^ + // edge -> neighboring edges debug::println(wst); // 2 2 // 0 0 0 diff --git a/milena/doc/examples/trash/tuto_one.cc b/milena/doc/examples/trash/tuto_one.cc index d2c0b6f..1ce11bf 100644 --- a/milena/doc/examples/trash/tuto_one.cc +++ b/milena/doc/examples/trash/tuto_one.cc @@ -17,7 +17,7 @@ # include <mln/morpho/closing_area.hh> # include <mln/morpho/gradient.hh> -# include <mln/morpho/meyer_wst.hh> +# include <mln/morpho/watershed/flooding.hh> using namespace mln; @@ -74,7 +74,7 @@ void do_it(const I& ima, clo = grad; unsigned l; - mln_ch_value(I, unsigned) wst = morpho::meyer_wst(clo, nbh, l); + mln_ch_value(I, unsigned) wst = morpho::watershed::flooding(clo, nbh, l); debug::println(labeling::regional_minima(clo, nbh, l)); debug::println(wst); diff --git a/milena/tools/area_flooding.cc b/milena/tools/area_flooding.cc index 70a500e..5efbcf9 100644 --- a/milena/tools/area_flooding.cc +++ b/milena/tools/area_flooding.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -59,7 +60,7 @@ #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing/area_on_vertices.hh> #include <mln/labeling/regional_minima.hh> -#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/watershed/flooding.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> @@ -145,7 +146,7 @@ int main(int argc, char* argv[]) wst_val_t nbasins; typedef edge_image<P,wst_val_t> wshed_t; - wshed_t wshed = morpho::meyer_wst(result, nbh, nbasins); + wshed_t wshed = morpho::watershed::flooding(result, nbh, nbasins); std::cout << "nbasins = " << nbasins << std::endl; /*---------. -- 1.7.2.5