URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-02-28 Frederic Bour <bour@lrde.epita.fr> Correct references to mln::morpho::closing_... and opening_... * mln/accu/height.hh, * mln/accu/volume.hh, * mln/morpho/all.hh, * mln/morpho/essential.hh: Replace mln::morpho::closing_ by mln::morpho::closing:: * tests/morpho/Makefile.am: Removed old tests * tests/morpho/complex_image_wst.cc, * tests/morpho/lena_line_graph_image_wst1.cc, * tests/morpho/meyer_wst_long.cc: Correct references. --- mln/accu/height.hh | 5 +++-- mln/accu/volume.hh | 5 +++-- mln/morpho/all.hh | 4 ++-- mln/morpho/essential.hh | 4 ++-- tests/morpho/Makefile.am | 3 --- tests/morpho/complex_image_wst.cc | 4 ++-- tests/morpho/lena_line_graph_image_wst1.cc | 4 ++-- tests/morpho/meyer_wst_long.cc | 4 ++-- 8 files changed, 16 insertions(+), 17 deletions(-) Index: trunk/milena/tests/morpho/meyer_wst_long.cc =================================================================== --- trunk/milena/tests/morpho/meyer_wst_long.cc (revision 3443) +++ trunk/milena/tests/morpho/meyer_wst_long.cc (revision 3444) @@ -40,7 +40,7 @@ #include <mln/value/label_16.hh> #include <mln/morpho/gradient.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/convert/to_window.hh> @@ -65,7 +65,7 @@ image2d<int_u8> grad = morpho::gradient(input, c4().win()), - clo = morpho::closing_area(grad, c4(), 200); + clo = morpho::closing::area(grad, c4(), 200); // Perform a Watershed Transform. typedef value::label_16 L; Index: trunk/milena/tests/morpho/complex_image_wst.cc =================================================================== --- trunk/milena/tests/morpho/complex_image_wst.cc (revision 3443) +++ trunk/milena/tests/morpho/complex_image_wst.cc (revision 3444) @@ -51,7 +51,7 @@ #include <mln/norm/l2.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/convert/to.hh> @@ -197,7 +197,7 @@ `-----------------*/ // Currently, does nothing (lambda = 1). - dist_ima_t closed_dist_ima = morpho::closing_area(dist_ima, nbh, 1); + dist_ima_t closed_dist_ima = morpho::closing::area(dist_ima, nbh, 1); /*------. | WST. | Index: trunk/milena/tests/morpho/Makefile.am =================================================================== --- trunk/milena/tests/morpho/Makefile.am (revision 3443) +++ trunk/milena/tests/morpho/Makefile.am (revision 3444) @@ -28,9 +28,6 @@ line_graph_image_morpho \ meyer_wst \ meyer_wst_long \ - opening_area \ - opening_height \ - opening_volume \ rank_filter \ skeleton_constrained \ thinning Index: trunk/milena/tests/morpho/lena_line_graph_image_wst1.cc =================================================================== --- trunk/milena/tests/morpho/lena_line_graph_image_wst1.cc (revision 3443) +++ trunk/milena/tests/morpho/lena_line_graph_image_wst1.cc (revision 3444) @@ -68,7 +68,7 @@ #include <mln/util/graph.hh> #include <mln/morpho/gradient.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/value/int_u8.hh> @@ -109,7 +109,7 @@ // Simplify the input image. image2d<input_val_t> work(input.domain()); - work = morpho::closing_area(gradient, c4(), 10); + work = morpho::closing::area(gradient, c4(), 10); /*-------------. | Line graph. | Index: trunk/milena/mln/accu/volume.hh =================================================================== --- trunk/milena/mln/accu/volume.hh (revision 3443) +++ trunk/milena/mln/accu/volume.hh (revision 3444) @@ -38,8 +38,8 @@ The class mln/accu/volume is not a general-purpose accumulator; it is used to implement volume-based connected filters. - \see mln::morpho::closing_volume - \see mln::morpho::opening_volume + \see mln::morpho::closing::volume + \see mln::morpho::opening::volume */ # include <mln/accu/internal/base.hh> @@ -69,6 +69,7 @@ /// root pixel. See mln::morpho::closing_volume and /// mln::morpho::opening_volume for actual uses of this /// accumulator. + /// FIXME: Replaced by mln::morpho::attribute::volume typedef util::pix<I> argument; /// The value type associated to the pixel type. typedef typename argument::value value; Index: trunk/milena/mln/accu/height.hh =================================================================== --- trunk/milena/mln/accu/height.hh (revision 3443) +++ trunk/milena/mln/accu/height.hh (revision 3444) @@ -38,8 +38,8 @@ The class mln/accu/height is not a general-purpose accumulator; it is used to implement height-based connected filters. - \see mln::morpho::closing_height - \see mln::morpho::opening_height + \see mln::morpho::closing::height + \see mln::morpho::opening::height */ # include <mln/accu/internal/base.hh> @@ -69,6 +69,7 @@ /// root pixel. See mln::morpho::closing_height and /// mln::morpho::opening_height for actual uses of this /// accumulator. + /// FIXME: Replaced by mln::morpho::attribute::height typedef util::pix<I> argument; /// The value type associated to the pixel type. typedef typename argument::value value; Index: trunk/milena/mln/morpho/all.hh =================================================================== --- trunk/milena/mln/morpho/all.hh (revision 3443) +++ trunk/milena/mln/morpho/all.hh (revision 3444) @@ -57,6 +57,7 @@ # include <mln/morpho/closing.hh> +# include <mln/morpho/closing/all.hh> # include <mln/morpho/complementation.hh> # include <mln/morpho/contrast.hh> # include <mln/morpho/dilation.hh> @@ -69,9 +70,8 @@ # include <mln/morpho/meyer_wst.hh> # include <mln/morpho/min.hh> # include <mln/morpho/minus.hh> -# include <mln/morpho/opening_area.hh> -# include <mln/morpho/opening_attribute.hh> # include <mln/morpho/opening.hh> +# include <mln/morpho/opening/all.hh> # include <mln/morpho/plus.hh> # include <mln/morpho/Rd.hh> # include <mln/morpho/rank_filter.hh> Index: trunk/milena/mln/morpho/essential.hh =================================================================== --- trunk/milena/mln/morpho/essential.hh (revision 3443) +++ trunk/milena/mln/morpho/essential.hh (revision 3444) @@ -41,8 +41,8 @@ # include <mln/morpho/includes.hh> # include <mln/morpho/laplacian.hh> # include <mln/morpho/meyer_wst.hh> -# include <mln/morpho/opening_area.hh> -# include <mln/morpho/opening_attribute.hh> +# include <mln/morpho/opening/area.hh> +# include <mln/morpho/opening/attribute.hh> # include <mln/morpho/opening.hh> # include <mln/morpho/rank_filter.hh> # include <mln/morpho/top_hat.hh>