[Olena-patches] [PATCH 09/31] Have apps/statues/ catch up with Milena's current interface.

* apps/statues/mesh-complex-max-curv-segm.cc, * apps/statues/mesh-complex-segm.cc, * apps/statues/mesh-segm.cc, * apps/statues/mesh-skel.cc: Adjust to the current interface of mln::morpho::closing::area. --- milena/ChangeLog | 10 ++++++++++ milena/apps/statues/mesh-complex-max-curv-segm.cc | 4 ++-- milena/apps/statues/mesh-complex-segm.cc | 4 ++-- milena/apps/statues/mesh-segm.cc | 7 +++---- milena/apps/statues/mesh-skel.cc | 7 +++---- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3609d23..e83522a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-05-11 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Have apps/statues/ catch up with Milena's current interface. + + * apps/statues/mesh-complex-max-curv-segm.cc, + * apps/statues/mesh-complex-segm.cc, + * apps/statues/mesh-segm.cc, + * apps/statues/mesh-skel.cc: + Adjust to the current interface of mln::morpho::closing::area. + +2009-05-11 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + * doc/.gitignore: Add headers.stamp. 2009-04-16 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; diff --git a/milena/apps/statues/mesh-complex-max-curv-segm.cc b/milena/apps/statues/mesh-complex-max-curv-segm.cc index 37d4fbb..389f977 100644 --- a/milena/apps/statues/mesh-complex-max-curv-segm.cc +++ b/milena/apps/statues/mesh-complex-max-curv-segm.cc @@ -39,7 +39,7 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/math/max.hh> @@ -131,7 +131,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input = mln::morpho::closing_area(input, adj_edges_nbh, lambda); + ima_t closed_input = mln::morpho::closing::area(input, adj_edges_nbh, lambda); /*------. | WST. | diff --git a/milena/apps/statues/mesh-complex-segm.cc b/milena/apps/statues/mesh-complex-segm.cc index ab049fc..c4a6dd0 100644 --- a/milena/apps/statues/mesh-complex-segm.cc +++ b/milena/apps/statues/mesh-complex-segm.cc @@ -39,7 +39,7 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/literal/white.hh> @@ -106,7 +106,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input = mln::morpho::closing_area(input, adj_edges_nbh, lambda); + ima_t closed_input = mln::morpho::closing::area(input, adj_edges_nbh, lambda); /*------. | WST. | diff --git a/milena/apps/statues/mesh-segm.cc b/milena/apps/statues/mesh-segm.cc index 46391a1..e24fe6b 100644 --- a/milena/apps/statues/mesh-segm.cc +++ b/milena/apps/statues/mesh-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -46,7 +46,7 @@ #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include "io.hh" @@ -173,8 +173,7 @@ int main(int argc, char* argv[]) typedef mln::line_graph_elt_neighborhood<mln::point3d> nbh_t; nbh_t nbh; - ima_t closed_lg_ima (lg_ima.domain()); - mln::morpho::closing_area(lg_ima, nbh, lambda, closed_lg_ima); + ima_t closed_lg_ima = mln::morpho::closing::area(lg_ima, nbh, lambda); /*------. | WST. | diff --git a/milena/apps/statues/mesh-skel.cc b/milena/apps/statues/mesh-skel.cc index c4fd0f2..4b2d002 100644 --- a/milena/apps/statues/mesh-skel.cc +++ b/milena/apps/statues/mesh-skel.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -46,7 +46,7 @@ #include <mln/core/image/graph_image.hh> #include <mln/core/image/graph_elt_neighborhood.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/labeling/regional_minima.hh> #include "io.hh" @@ -155,8 +155,7 @@ int main(int argc, char* argv[]) typedef mln::graph_elt_neighborhood<mln::point3d> nbh_t; nbh_t nbh; - ima_t closed_g_ima (g_ima.domain()); - mln::morpho::closing_area(g_ima, nbh, lambda, closed_g_ima); + ima_t closed_g_ima = mln::morpho::closing::area(g_ima, nbh, lambda); /*------------------. | Regional minima. | -- 1.6.1.2