[Olena-patches] 3416: Various small fixes.

* doc/tutorial/samples/win-create-1.cc: fix ref output. * doc/tutorial/tutorial.tex: change chapter alias. * mln/core/image/extension_val.hh: fix wrong prototype of extended_with routine. * mln/morpho/elementary/laplacian.hh, * mln/debug/println_with_border.spe.hh: update comments. * mln/io/dump/load.hh: add missing assertion. * mln/registration/all.hh: remove not existing included header. * mln/registration/icp.hh: add missing to_vec. * mln/transform/internal/closest_point_functor.hh: add missing includes. --- milena/ChangeLog | 23 ++++++++++++++++++++ milena/doc/tutorial/samples/win-create-1.cc | 4 +- milena/doc/tutorial/tutorial.tex | 4 +- milena/mln/core/image/extension_val.hh | 9 +++---- milena/mln/debug/println_with_border.spe.hh | 10 ++++---- milena/mln/io/dump/load.hh | 1 + milena/mln/morpho/elementary/laplacian.hh | 11 ++++----- milena/mln/registration/all.hh | 1 - milena/mln/registration/icp.hh | 2 +- .../transform/internal/closest_point_functor.hh | 2 + 10 files changed, 45 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 58919f4..53827ae 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,28 @@ 2009-02-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Various small fixes. + + * doc/tutorial/samples/win-create-1.cc: fix ref output. + + * doc/tutorial/tutorial.tex: change chapter alias. + + * mln/core/image/extension_val.hh: fix wrong prototype of + extended_with routine. + + * mln/morpho/elementary/laplacian.hh, + * mln/debug/println_with_border.spe.hh: update comments. + + * mln/io/dump/load.hh: add missing assertion. + + * mln/registration/all.hh: remove not existing included header. + + * mln/registration/icp.hh: add missing to_vec. + + * mln/transform/internal/closest_point_functor.hh: add missing + includes. + +2009-02-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Do not use mln_VAR in tests. * tests/core/routine/extend.cc, diff --git a/milena/doc/tutorial/samples/win-create-1.cc b/milena/doc/tutorial/samples/win-create-1.cc index 92c962c..b6d6e89 100644 --- a/milena/doc/tutorial/samples/win-create-1.cc +++ b/milena/doc/tutorial/samples/win-create-1.cc @@ -5,9 +5,9 @@ int main() // \{ window2d win; - win.insert(-1, 0); - win.insert( 0, -1); win.insert(-1, -1); + win.insert(-1, 0); + win.insert(-1, 1); // \} } diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index f610437..267d0e2 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -326,7 +326,7 @@ $$ - \backslash subpage imamemmgmt - \backslash subpage basicops - \backslash subpage graphandima -- \backslash subpage functions +- \backslash subpage funs - \backslash subpage arithmops - \backslash subpage mathtools - \backslash subpage debugtools @@ -2377,7 +2377,7 @@ Output: %==================================== \newpage \clearpage -\doxychapter{functions}{Functions} +\doxychapter{funs}{Functions} FIXME write it diff --git a/milena/mln/core/image/extension_val.hh b/milena/mln/core/image/extension_val.hh index 45f1926..9dbfadc 100644 --- a/milena/mln/core/image/extension_val.hh +++ b/milena/mln/core/image/extension_val.hh @@ -268,15 +268,14 @@ namespace mln target = static_cast<V>(model.extension()); } - template <typename I, typename J> - extension_ima<I,J> - extended_with(Image<I>& ima, const Image<J> ext) + template <typename I> + extension_val<I> + extended_with(Image<I>& ima, const mln_value(I)& val) { mlc_not_equal(mln_trait_image_ext_domain(I), trait::image::ext_domain::none)::check(); mln_precondition(exact(ima).is_valid()); - mln_precondition(exact(ext).is_valid()); - extension_ima<I,J> tmp(exact(ima), exact(ext)); + extension_val<I> tmp(exact(ima), val); return tmp; } diff --git a/milena/mln/debug/println_with_border.spe.hh b/milena/mln/debug/println_with_border.spe.hh index 825deb3..4c822d3 100644 --- a/milena/mln/debug/println_with_border.spe.hh +++ b/milena/mln/debug/println_with_border.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +// (LRDE) // // 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 +29,9 @@ #ifndef MLN_DEBUG_PRINTLN_WITH_BORDER_SPE_HH # define MLN_DEBUG_PRINTLN_WITH_BORDER_SPE_HH -/*! \file mln/debug/println_with_border_spe.hh - * - * \brief Specializations for mln::debug::println_with_border. - */ +/// \file mln/debug/println_with_border_spe.hh +/// +/// Specializations for mln::debug::println_with_border. # ifndef MLN_DEBUG_PRINTLN_WITH_BORDER_HH # error "Forbidden inclusion of *.spe.hh" diff --git a/milena/mln/io/dump/load.hh b/milena/mln/io/dump/load.hh index 21d6534..bc6a051 100644 --- a/milena/mln/io/dump/load.hh +++ b/milena/mln/io/dump/load.hh @@ -89,6 +89,7 @@ namespace mln mln_concrete(I) result(box<P>(pmin, pmax)); initialize(ima, result); + mln_assertion(exact(ima).is_valid()); } diff --git a/milena/mln/morpho/elementary/laplacian.hh b/milena/mln/morpho/elementary/laplacian.hh index 974504c..0b2ad4e 100644 --- a/milena/mln/morpho/elementary/laplacian.hh +++ b/milena/mln/morpho/elementary/laplacian.hh @@ -29,12 +29,11 @@ #ifndef MLN_MORPHO_ELEMENTARY_LAPLACIAN_HH # define MLN_MORPHO_ELEMENTARY_LAPLACIAN_HH -/*! \file mln/morpho/elementary/laplacian.hh - * - * \brief Morphological elementary laplacian. - * - * \todo Handle the set case? - */ +/// \file mln/morpho/elementary/laplacian.hh +/// +/// Morphological elementary laplacian. +/// +/// \todo Handle the set case? # include <mln/morpho/elementary/gradient_internal.hh> # include <mln/morpho/elementary/gradient_external.hh> diff --git a/milena/mln/registration/all.hh b/milena/mln/registration/all.hh index bb4e18e..5d4c5f7 100644 --- a/milena/mln/registration/all.hh +++ b/milena/mln/registration/all.hh @@ -46,7 +46,6 @@ namespace mln # include <mln/registration/get_rot.hh> # include <mln/registration/get_rtransf.hh> # include <mln/registration/icp.hh> -# include <mln/registration/multiscale.hh> # include <mln/registration/registration.hh> #endif // ! MLN_REGISTRATION_ALL_HH diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index d484f5c..a5ad215 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -650,7 +650,7 @@ namespace mln image3d<value::rgb8> tmp_ = duplicate(debug); mln_piter(p_array<P>) p_dbg(P_); for_all(p_dbg) - tmp_(qR_old.rotate(p_dbg) + qT_old) = literal::green; + tmp_(qR_old.rotate(p_dbg.to_vec()) + qT_old) = literal::green; std::ostringstream ss; ss << "tmp_0"; if (k < 10) diff --git a/milena/mln/transform/internal/closest_point_functor.hh b/milena/mln/transform/internal/closest_point_functor.hh index 098c994..5cbac15 100644 --- a/milena/mln/transform/internal/closest_point_functor.hh +++ b/milena/mln/transform/internal/closest_point_functor.hh @@ -32,7 +32,9 @@ /// /// Closest point functor. +# include <mln/core/site_set/p_array.hh> # include <mln/core/macros.hh> +# include <mln/data/fill.hh> # include <mln/trait/ch_value.hh> namespace mln -- 1.5.6.5