https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Fix missing updates in mln data guards. * mln/data/paste.spe.hh, * mln/data/fill_with_image.hh, * mln/data/fill_with_value.spe.hh, * mln/data/fill.hh, * mln/data/fill_with_image.spe.hh, * mln/data/paste.hh, * mln/data/fill_with_value.hh: Fix guards. * mln/morpho/tree/compute_attribute_image.hh: Disambiguate. * mln/morpho/tree/data.hh (f): New overload. data/fill.hh | 6 +++--- data/fill_with_image.hh | 6 +++--- data/fill_with_image.spe.hh | 10 +++++----- data/fill_with_value.hh | 6 +++--- data/fill_with_value.spe.hh | 10 +++++----- data/paste.hh | 6 +++--- data/paste.spe.hh | 10 +++++----- morpho/tree/compute_attribute_image.hh | 4 ++-- morpho/tree/data.hh | 5 +++++ 9 files changed, 34 insertions(+), 29 deletions(-) Index: mln/data/paste.spe.hh --- mln/data/paste.spe.hh (revision 3077) +++ mln/data/paste.spe.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_LEVEL_PASTE_SPE_HH -# define MLN_LEVEL_PASTE_SPE_HH +#ifndef MLN_DATA_PASTE_SPE_HH +# define MLN_DATA_PASTE_SPE_HH /*! \file mln/data/paste.spe.hh * @@ -34,9 +34,9 @@ * */ -# ifndef MLN_LEVEL_PASTE_HH +# ifndef MLN_DATA_PASTE_HH # error "Forbidden inclusion of *.spe.hh" -# endif // ! MLN_LEVEL_PASTE_HH +# endif // ! MLN_DATA_PASTE_HH # include <mln/core/pixel.hh> # include <mln/data/fill_with_value.hh> @@ -284,4 +284,4 @@ # endif // ! MLN_INCLUDE_ONLY -#endif // ! MLN_LEVEL_PASTE_HH +#endif // ! MLN_DATA_PASTE_HH Index: mln/data/fill_with_image.hh --- mln/data/fill_with_image.hh (revision 3077) +++ mln/data/fill_with_image.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_LEVEL_FILL_WITH_IMAGE_HH -# define MLN_LEVEL_FILL_WITH_IMAGE_HH +#ifndef MLN_DATA_FILL_WITH_IMAGE_HH +# define MLN_DATA_FILL_WITH_IMAGE_HH /*! \file mln/data/fill_with_image.hh * @@ -137,4 +137,4 @@ } // end of namespace mln -#endif // ! MLN_LEVEL_FILL_WITH_IMAGE_HH +#endif // ! MLN_DATA_FILL_WITH_IMAGE_HH Index: mln/data/fill_with_value.spe.hh --- mln/data/fill_with_value.spe.hh (revision 3077) +++ mln/data/fill_with_value.spe.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_LEVEL_FILL_WITH_VALUE_SPE_HH -# define MLN_LEVEL_FILL_WITH_VALUE_SPE_HH +#ifndef MLN_DATA_FILL_WITH_VALUE_SPE_HH +# define MLN_DATA_FILL_WITH_VALUE_SPE_HH /// \file mln/data/fill_with_value.spe.hh /// Specializations for mln::data::fill_with_value. /// -# ifndef MLN_LEVEL_FILL_WITH_VALUE_HH +# ifndef MLN_DATA_FILL_WITH_VALUE_HH # error "Forbidden inclusion of *.spe.hh" -# endif // ! MLN_LEVEL_FILL_WITH_VALUE_HH +# endif // ! MLN_DATA_FILL_WITH_VALUE_HH # include <mln/data/memset_.hh> @@ -217,4 +217,4 @@ # endif // ! MLN_INCLUDE_ONLY -#endif // ! MLN_LEVEL_FILL_WITH_VALUE_SPE_HH +#endif // ! MLN_DATA_FILL_WITH_VALUE_SPE_HH Index: mln/data/fill.hh --- mln/data/fill.hh (revision 3077) +++ mln/data/fill.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_LEVEL_FILL_HH -# define MLN_LEVEL_FILL_HH +#ifndef MLN_DATA_FILL_HH +# define MLN_DATA_FILL_HH /*! \file mln/data/fill.hh * @@ -155,4 +155,4 @@ } // end of namespace mln -#endif // ! MLN_LEVEL_FILL_HH +#endif // ! MLN_DATA_FILL_HH Index: mln/data/fill_with_image.spe.hh --- mln/data/fill_with_image.spe.hh (revision 3077) +++ mln/data/fill_with_image.spe.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_LEVEL_FILL_WITH_IMAGE_SPE_HH -# define MLN_LEVEL_FILL_WITH_IMAGE_SPE_HH +#ifndef MLN_DATA_FILL_WITH_IMAGE_SPE_HH +# define MLN_DATA_FILL_WITH_IMAGE_SPE_HH /*! \file mln/data/fill_with_image.spe.hh * @@ -34,9 +34,9 @@ * */ -# ifndef MLN_LEVEL_FILL_WITH_IMAGE_HH +# ifndef MLN_DATA_FILL_WITH_IMAGE_HH # error "Forbidden inclusion of *.spe.hh" -# endif // ! MLN_LEVEL_FILL_WITH_IMAGE_HH +# endif // ! MLN_DATA_FILL_WITH_IMAGE_HH # include <mln/data/memcpy_.hh> # include <mln/data/fill_with_value.hh> @@ -284,4 +284,4 @@ # endif // ! MLN_INCLUDE_ONLY -#endif // ! MLN_LEVEL_FILL_WITH_IMAGE_HH +#endif // ! MLN_DATA_FILL_WITH_IMAGE_HH Index: mln/data/paste.hh --- mln/data/paste.hh (revision 3077) +++ mln/data/paste.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_LEVEL_PASTE_HH -# define MLN_LEVEL_PASTE_HH +#ifndef MLN_DATA_PASTE_HH +# define MLN_DATA_PASTE_HH /*! \file mln/data/paste.hh * @@ -148,4 +148,4 @@ -#endif // ! MLN_LEVEL_PASTE_HH +#endif // ! MLN_DATA_PASTE_HH Index: mln/data/fill_with_value.hh --- mln/data/fill_with_value.hh (revision 3077) +++ mln/data/fill_with_value.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_LEVEL_FILL_WITH_VALUE_HH -# define MLN_LEVEL_FILL_WITH_VALUE_HH +#ifndef MLN_DATA_FILL_WITH_VALUE_HH +# define MLN_DATA_FILL_WITH_VALUE_HH /// \file mln/data/fill_with_value.hh /// @@ -139,4 +139,4 @@ } // end of namespace mln -#endif // ! MLN_LEVEL_FILL_WITH_VALUE_HH +#endif // ! MLN_DATA_FILL_WITH_VALUE_HH Index: mln/morpho/tree/compute_attribute_image.hh --- mln/morpho/tree/compute_attribute_image.hh (revision 3077) +++ mln/morpho/tree/compute_attribute_image.hh (working copy) @@ -93,7 +93,7 @@ // few accumulators, e.g., for accu::rank which has the 'k' // attribute. A a = exact(a_); - data::fill(acc, a); + mln::data::fill(acc, a); } { // Initialize every attribute with the corresponding pixel. @@ -122,7 +122,7 @@ typedef typename T::function I; mln_ch_value(I, mln_result(A)) output; initialize(output, acc); - data::fill(output, acc); + mln::data::fill(output, acc); trace::exiting("morpho::tree::compute_attribute_image"); return output; Index: mln/morpho/tree/data.hh --- mln/morpho/tree/data.hh (revision 3077) +++ mln/morpho/tree/data.hh (working copy) @@ -144,6 +144,11 @@ return f_; } + mln_rvalue(I) f(const mln_psite(I)& p) const + { + return f_(p); + } + protected: const I& f_;