https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Make morpho erosion test compile. * mln/core/internal/dpoints_base.hh (site, psite, dpsite): Remove these typedefs; they were inherited twice in window concrete classes, causing ambiguities. * mln/win/rectangle2d.hh: Likewise; useless. * mln/morpho/erosion.spe.hh (border): De-activate calls. * mln/morpho/erosion.hh: Fix missing initialize. * mln/morpho/includes.hh (border): De-activate include. (has_neighborhood): De-activate include; this part of code is soon obsolete. core/internal/dpoints_base.hh | 10 ---------- morpho/erosion.hh | 4 +++- morpho/erosion.spe.hh | 20 ++++++++++---------- morpho/includes.hh | 8 ++++---- win/rectangle2d.hh | 6 ------ 5 files changed, 17 insertions(+), 31 deletions(-) Index: mln/core/internal/dpoints_base.hh --- mln/core/internal/dpoints_base.hh (revision 2264) +++ mln/core/internal/dpoints_base.hh (working copy) @@ -56,16 +56,6 @@ { public: - /// Dpsite associated type. - typedef D dpsite; - - /// Psite associated type. - typedef mln_psite(D) psite; - - /// Site associated type. - typedef mln_site(D) site; - - /// Forward site iterator associated type. typedef dpsites_fwd_piter<E> fwd_qiter; Index: mln/win/rectangle2d.hh --- mln/win/rectangle2d.hh (revision 2264) +++ mln/win/rectangle2d.hh (working copy) @@ -60,12 +60,6 @@ struct rectangle2d : public internal::window_base< dpoint2d, rectangle2d >, public internal::dpoints_base_< dpoint2d, rectangle2d > { - typedef internal::dpoints_base_< dpoint2d, rectangle2d > super_; - - typedef super_::site site; - typedef super_::psite psite; - typedef super_::dpsite dpsite; - /*! \brief Constructor. * * \param[in] height Height of the rectangle2d. Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2264) +++ mln/morpho/erosion.spe.hh (working copy) @@ -89,10 +89,10 @@ typedef mln_concrete(I) O; const I& input = exact(input_); const W& win = exact(win_); - O output; + O output; initialize(output, input); - border::fill(input, mln_max(mln_value(I))); +// border::fill(input, mln_max(mln_value(I))); mln_pixter(const I) p(input); mln_pixter(O) o(output); @@ -120,10 +120,10 @@ typedef mln_concrete(I) O; const I& input = exact(input_); const W& win = exact(win_); - O output; + O output; initialize(output, input); - border::fill(input, true); +// border::fill(input, true); mln_pixter(const I) p(input); mln_pixter(O) p_out(output); @@ -153,7 +153,7 @@ const W& win = exact(win_); O output; - border::fill(input, true); +// border::fill(input, true); output = clone(input); mln_piter(I) p(input.domain()); @@ -182,7 +182,7 @@ const W& win = exact(win_); O output; - border::fill(input, true); +// border::fill(input, true); output = clone(input); mln_pixter(const I) p(input); @@ -445,15 +445,15 @@ trait::image::kind::logic)::value == true) if (mlc_equal(mln_trait_image_speed(I)(), trait::image::speed::fastest)::value == true) - impl::erosion_on_set_fastest(input, win); + return impl::erosion_on_set_fastest(input, win); else - impl::generic::erosion_on_set(input, win); + return impl::generic::erosion_on_set(input, win); else if (mlc_equal(mln_trait_image_speed(I)(), trait::image::speed::fastest)::value == true) - impl::erosion_on_function_fastest(input, win); + return impl::erosion_on_function_fastest(input, win); else - impl::generic::erosion_on_function(input, win); + return impl::generic::erosion_on_function(input, win); } } // end of namespace mln::morpho::internal Index: mln/morpho/erosion.hh --- mln/morpho/erosion.hh (revision 2264) +++ mln/morpho/erosion.hh (working copy) @@ -100,9 +100,11 @@ const I& input = exact(input_); const W& win = exact(win_); + mln_concrete(I) output; + initialize(output, input); + mln_piter(I) p(input.domain()); mln_qiter(W) q(win, p); - mln_concrete(I) output; for_all(p) { for_all(q) if (input.has(q)) Index: mln/morpho/includes.hh --- mln/morpho/includes.hh (revision 2264) +++ mln/morpho/includes.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -31,6 +31,8 @@ /*! \file mln/morpho/includes.hh * * \brief Basic list of includes for all files in mln/morpho/. + * + * \todo Re-activate the border/all include when ready. */ @@ -38,8 +40,6 @@ # include <mln/core/concept/window.hh> # include <mln/core/concept/neighborhood.hh> -# include <mln/metal/has_neighborhood.hh> - # include <mln/value/ops.hh> # include <mln/accu/min.hh> @@ -54,7 +54,7 @@ # include <mln/level/fill.hh> # include <mln/test/positive.hh> -# include <mln/border/all.hh> +// # include <mln/border/all.hh> # include <mln/geom/sym.hh> # include <mln/set/inter.hh>