https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Géraud <thierry.geraud@lrde.epita.fr> Fix some details in morpho and labeling. * mln/morpho/erosion.hh (erosion_on_function_, erosion_on_set_): Change 'has' to 'owns_'. * mln/morpho/dilation.hh (dilation_on_function_, dilation_on_set_): Likewise. * mln/labeling/regional_minima.hh (regional_minima_functor): Fix initialization of 'attr'; use the proper command instead of ctor call. * mln/labeling/regional_maxima.hh: Likewise. labeling/regional_maxima.hh | 4 ++-- labeling/regional_minima.hh | 4 ++-- morpho/dilation.hh | 4 ++-- morpho/erosion.hh | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) Index: mln/morpho/erosion.hh --- mln/morpho/erosion.hh (revision 1967) +++ mln/morpho/erosion.hh (working copy) @@ -76,7 +76,7 @@ for_all(p) { min.init(); - for_all(q) if (input.has(q)) + for_all(q) if (input.owns_(q)) min.take(input(q)); output(p) = min; } @@ -103,7 +103,7 @@ output = clone(input); for_all(p) if (input(p)) - for_all(q) if (input.has(q)) + for_all(q) if (input.owns_(q)) if (! input(q)) { output(p) = false; @@ -115,7 +115,7 @@ initialize(output, input); for_all(p) { - for_all(q) if (input.has(q)) + for_all(q) if (input.owns_(q)) if (! input(q)) break; // If there was no break (so q is not valid) then Index: mln/morpho/dilation.hh --- mln/morpho/dilation.hh (revision 1967) +++ mln/morpho/dilation.hh (working copy) @@ -117,7 +117,7 @@ for_all(p) { max.init(); - for_all(q) if (input.has(q)) + for_all(q) if (input.owns_(q)) max.take(input(q)); output(p) = max.to_result(); } @@ -140,7 +140,7 @@ mln_qiter(W) q(win, p); for_all(p) if (!input(p)) - for_all(q) if (input.has(q)) + for_all(q) if (input.owns_(q)) if (input(q)) { output(p) = true; Index: mln/labeling/regional_minima.hh --- mln/labeling/regional_minima.hh (revision 1967) +++ mln/labeling/regional_minima.hh (working copy) @@ -104,9 +104,9 @@ regional_minima_functor(const I_& input, const N_& nbh) : input(input), nbh(nbh), - s(level::sort_psites_increasing(input)), - attr(input.domain()) + s(level::sort_psites_increasing(input)) { + initialize(attr, input); } }; Index: mln/labeling/regional_maxima.hh --- mln/labeling/regional_maxima.hh (revision 1967) +++ mln/labeling/regional_maxima.hh (working copy) @@ -105,9 +105,9 @@ regional_maxima_functor(const I_& input, const N_& nbh) : input(input), nbh(nbh), - s(level::sort_psites_decreasing(input)), - attr(input.domain()) + s(level::sort_psites_decreasing(input)) { + initialize(attr, input); } };