* mln/labeling/flat_zones.hh (mln::labeling::impl::generic::flat_zones) * mln/labeling/regional_maxima.hh (mln::labeling::impl::generic::regional_maxima) * mln/labeling/regional_minima.hh (mln::labeling::impl::generic::regional_minima): Catch up with the current implementation of mln::canvas::labeling as a routine. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/labeling/flat_zones.hh | 5 ++--- milena/mln/labeling/regional_maxima.hh | 7 +++---- milena/mln/labeling/regional_minima.hh | 7 +++---- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e35b296..1684e97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2008-11-19 Roland Levillain <roland@lrde.epita.fr> + Fix clients of mln::canvas::labeling. + + * mln/labeling/flat_zones.hh + (mln::labeling::impl::generic::flat_zones) + * mln/labeling/regional_maxima.hh + (mln::labeling::impl::generic::regional_maxima) + * mln/labeling/regional_minima.hh + (mln::labeling::impl::generic::regional_minima): + Catch up with the current implementation of mln::canvas::labeling + as a routine. + +2008-11-19 Roland Levillain <roland@lrde.epita.fr> + New application: surface segmentation using complex-based images. * apps/statues/mesh-complex-segm.cc: New. diff --git a/milena/mln/labeling/flat_zones.hh b/milena/mln/labeling/flat_zones.hh index 2552816..7fb32ff 100644 --- a/milena/mln/labeling/flat_zones.hh +++ b/milena/mln/labeling/flat_zones.hh @@ -113,11 +113,10 @@ namespace mln typedef flat_zones_functor<I,N,L> F; F f(exact(input), exact(nbh)); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::flat_zones"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic diff --git a/milena/mln/labeling/regional_maxima.hh b/milena/mln/labeling/regional_maxima.hh index 7ca103c..57acc1b 100644 --- a/milena/mln/labeling/regional_maxima.hh +++ b/milena/mln/labeling/regional_maxima.hh @@ -127,12 +127,11 @@ namespace mln // maxima. typedef impl::regional_maxima_functor<I,N,L> F; - F f(input, nbh); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + F f(exact(input), exact(nbh)); + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::regional_maxima"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic diff --git a/milena/mln/labeling/regional_minima.hh b/milena/mln/labeling/regional_minima.hh index bf7cd21..07ac158 100644 --- a/milena/mln/labeling/regional_minima.hh +++ b/milena/mln/labeling/regional_minima.hh @@ -132,12 +132,11 @@ namespace mln // minima. typedef impl::regional_minima_functor<I,N,L> F; - F f(input, nbh); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + F f(exact(input), exact(nbh)); + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::regional_minima"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic -- 1.5.6.5