https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Fix morphological erosion implementation based on pixters. * mln/core/dpoints_pixter.hh (dpoints_fwd_pixter<I>::next_): Don't update member value_ptr_ when the pixter is invalid. * mln/morpho/erosion.hh, mln/morpho/erosion.spe.hh: Fix indentation. Aesthetic chnanges. core/dpoints_pixter.hh | 1 + morpho/erosion.hh | 8 +++----- morpho/erosion.spe.hh | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) Index: mln/core/dpoints_pixter.hh --- mln/core/dpoints_pixter.hh (revision 1773) +++ mln/core/dpoints_pixter.hh (working copy) @@ -211,6 +211,7 @@ dpoints_fwd_pixter<I>::next_() { ++i_; + if (is_valid()) this->value_ptr_ += offset_[i_]; } Index: mln/morpho/erosion.hh --- mln/morpho/erosion.hh (revision 1773) +++ mln/morpho/erosion.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 @@ -28,10 +28,8 @@ #ifndef MLN_MORPHO_EROSION_HH # define MLN_MORPHO_EROSION_HH -/*! \file mln/morpho/erosion.hh - * - * \brief Morphological erosion. - */ +/// \file mln/morpho/erosion.hh +/// \brief Morphological erosion. # include <mln/morpho/includes.hh> Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 1773) +++ mln/morpho/erosion.spe.hh (working copy) @@ -88,11 +88,13 @@ namespace generic { // Fwd decl. + // Implementation is in mln/morpho/erosion.hh. template <typename I, typename W> mln_concrete(I) erosion_on_function_(const I& input, const W& win); // Fwd decl. + // Implementation is in mln/morpho/erosion.hh. template <typename I, typename W> mln_concrete(I) erosion_on_set_(const I& input, const W& win);