URL: https://svn.lrde.org/svn/oln/trunk/milena ChangeLog: 2007-10-17 Simon Nivault <simon.nivault@lrde.epita.fr> Somes fixes due to a previous refactoring of mln::fun::i2v::all. * mln/core/image1d.hh, * mln/core/image2d.hh, * mln/core/image3d.hh, * mln/core/internal/dpoints_base.hh, * mln/core/point.hh, * mln/metal/vec.hh, * mln/morpho/all.hh, * tests/fun_x2x_composed.cc, * tests/fun_x2x_translation.cc, * tests/mat.cc, * tests/vec.cc: Fix. --- mln/core/image1d.hh | 6 +++--- mln/core/image2d.hh | 6 +++--- mln/core/image3d.hh | 6 +++--- mln/core/internal/dpoints_base.hh | 4 ++-- mln/core/point.hh | 4 ++-- mln/metal/vec.hh | 6 +++--- mln/morpho/all.hh | 14 ++++++++++---- tests/fun_x2x_composed.cc | 4 ++-- tests/fun_x2x_translation.cc | 4 ++-- tests/mat.cc | 6 +++--- tests/vec.cc | 6 +++--- 11 files changed, 36 insertions(+), 30 deletions(-) Index: trunk/milena/tests/fun_x2x_translation.cc =================================================================== --- trunk/milena/tests/fun_x2x_translation.cc (revision 1354) +++ trunk/milena/tests/fun_x2x_translation.cc (revision 1355) @@ -33,7 +33,7 @@ #include <iostream> #include <mln/fun/x2x/translation.hh> -#include <mln/fun/i2v/all.hh> +#include <mln/fun/i2v/all_to.hh> @@ -47,7 +47,7 @@ c = 2.9; metal::vec<3,float> vec1 = make::vec(a, b, c); - fun::x2x::translation<3,float> tr1(all(1.6)); + fun::x2x::translation<3,float> tr1(all_to(1.6)); std::cout << vec1 << std::endl; std::cout << tr1(vec1) << std::endl; Index: trunk/milena/tests/mat.cc =================================================================== --- trunk/milena/tests/mat.cc (revision 1354) +++ trunk/milena/tests/mat.cc (revision 1355) @@ -32,7 +32,7 @@ #include <iostream> -#include <mln/fun/i2v/all.hh> +#include <mln/fun/i2v/all_to.hh> #include <mln/metal/mat.hh> #include <mln/core/h_mat.hh> @@ -42,12 +42,12 @@ { using namespace mln; - metal::mat<1,3,float> m1(all(4.)); + metal::mat<1,3,float> m1(all_to(4.)); metal::mat<2,2,float> m2 = metal::mat<2,2,float>::Id; h_mat<1,float> hm1(m2); h_mat<2,float> hm2; - h_mat<3,float> hm3(all(1.5)); + h_mat<3,float> hm3(all_to(1.5)); metal::mat<4,4,float> m4 = hm3; Index: trunk/milena/tests/fun_x2x_composed.cc =================================================================== --- trunk/milena/tests/fun_x2x_composed.cc (revision 1354) +++ trunk/milena/tests/fun_x2x_composed.cc (revision 1355) @@ -35,7 +35,7 @@ #include <mln/fun/x2x/translation.hh> #include <mln/fun/x2x/rotation.hh> #include <mln/fun/x2x/composed.hh> -#include <mln/fun/i2v/all.hh> +#include <mln/fun/i2v/all_to.hh> @@ -49,7 +49,7 @@ c = 2.9; metal::vec<3,float> vec1 = make::vec(a, b, c); - fun::x2x::translation<3,float> tr(all(1.6)); + fun::x2x::translation<3,float> tr(all_to(1.6)); fun::x2x::rotation<3,float> rot(0.3, 1); std::cout << "vec : " << vec1 << std::endl; Index: trunk/milena/tests/vec.cc =================================================================== --- trunk/milena/tests/vec.cc (revision 1354) +++ trunk/milena/tests/vec.cc (revision 1355) @@ -32,7 +32,7 @@ #include <iostream> -#include <mln/fun/i2v/all.hh> +#include <mln/fun/i2v/all_to.hh> #include <mln/metal/vec.hh> #include <mln/core/h_vec.hh> @@ -42,13 +42,13 @@ { using namespace mln; - metal::vec<1,float> v1(all(4.)); + metal::vec<1,float> v1(all_to(4.)); metal::vec<2,float> v2 = make::vec(6., 2.8); h_vec<1,float> hv1; h_vec<2,float> hv2 = v2.to_h_vec(); // Immersion into homogeneous. - h_vec<3,float> hv3(all(1.5)); + h_vec<3,float> hv3(all_to(1.5)); hv3 += make::vec(0., 0., 0., 0.5); Index: trunk/milena/mln/core/point.hh =================================================================== --- trunk/milena/mln/core/point.hh (revision 1354) +++ trunk/milena/mln/core/point.hh (revision 1355) @@ -35,7 +35,7 @@ # include <mln/core/concept/point.hh> # include <mln/core/internal/coord_impl.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/metal/bool.hh> # include <mln/metal/vec.hh> @@ -267,7 +267,7 @@ } template <typename M, typename C> - const point_<M,C> point_<M,C>::origin = all(0); + const point_<M,C> point_<M,C>::origin = all_to(0); template <typename M, typename C> point_<M,C>& Index: trunk/milena/mln/core/internal/dpoints_base.hh =================================================================== --- trunk/milena/mln/core/internal/dpoints_base.hh (revision 1354) +++ trunk/milena/mln/core/internal/dpoints_base.hh (revision 1355) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/set_of.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/norm/infty.hh> @@ -103,7 +103,7 @@ template <typename D, typename E> bool dpoints_base_<D,E>::is_centered() const { - static const D origin = all(0); + static const D origin = all_to(0); return this->super_::has(origin); } Index: trunk/milena/mln/core/image1d.hh =================================================================== --- trunk/milena/mln/core/image1d.hh (revision 1354) +++ trunk/milena/mln/core/image1d.hh (revision 1355) @@ -39,7 +39,7 @@ # include <mln/border/thickness.hh> # include <mln/value/set.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/core/line_piter.hh> @@ -262,8 +262,8 @@ void data_< image1d<T> >::update_vb_() { - vb_.pmin() = b_.pmin() - dpoint1d(all(bdr_)); - vb_.pmax() = b_.pmax() + dpoint1d(all(bdr_)); + vb_.pmin() = b_.pmin() - dpoint1d(all_to(bdr_)); + vb_.pmax() = b_.pmax() + dpoint1d(all_to(bdr_)); } template <typename T> Index: trunk/milena/mln/core/image2d.hh =================================================================== --- trunk/milena/mln/core/image2d.hh (revision 1354) +++ trunk/milena/mln/core/image2d.hh (revision 1355) @@ -39,7 +39,7 @@ # include <mln/border/thickness.hh> # include <mln/value/set.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/core/line_piter.hh> @@ -272,8 +272,8 @@ void data_< image2d<T> >::update_vb_() { - vb_.pmin() = b_.pmin() - dpoint2d(all(bdr_)); - vb_.pmax() = b_.pmax() + dpoint2d(all(bdr_)); + vb_.pmin() = b_.pmin() - dpoint2d(all_to(bdr_)); + vb_.pmax() = b_.pmax() + dpoint2d(all_to(bdr_)); } template <typename T> Index: trunk/milena/mln/core/image3d.hh =================================================================== --- trunk/milena/mln/core/image3d.hh (revision 1354) +++ trunk/milena/mln/core/image3d.hh (revision 1355) @@ -39,7 +39,7 @@ # include <mln/border/thickness.hh> # include <mln/value/set.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/core/line_piter.hh> @@ -273,8 +273,8 @@ void data_< image3d<T> >::update_vb_() { - vb_.pmin() = b_.pmin() - dpoint3d(all(bdr_)); - vb_.pmax() = b_.pmax() + dpoint3d(all(bdr_)); + vb_.pmin() = b_.pmin() - dpoint3d(all_to(bdr_)); + vb_.pmax() = b_.pmax() + dpoint3d(all_to(bdr_)); } template <typename T> Index: trunk/milena/mln/metal/vec.hh =================================================================== --- trunk/milena/mln/metal/vec.hh (revision 1354) +++ trunk/milena/mln/metal/vec.hh (revision 1355) @@ -40,7 +40,7 @@ # include <mln/core/concept/object.hh> # include <mln/trait/all.hh> # include <mln/value/props.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/value/concept/all.hh> @@ -434,10 +434,10 @@ } template <unsigned n, typename T> - const vec<n, T> vec<n, T>::zero = all(0); + const vec<n, T> vec<n, T>::zero = all_to(0); template <unsigned n, typename T> - const vec<n, T> vec<n, T>::origin = all(0); + const vec<n, T> vec<n, T>::origin = all_to(0); // eq Index: trunk/milena/mln/morpho/all.hh =================================================================== --- trunk/milena/mln/morpho/all.hh (revision 1354) +++ trunk/milena/mln/morpho/all.hh (revision 1355) @@ -41,13 +41,19 @@ namespace morpho { - /// Namespace of morphological image processing routines - /// implementation details. + /*! \namespace impl + * + * \brief Namespace of morphological image processing routines + * implementation details. + */ namespace impl { - /// Namespace of morphological image processing routines generic - /// implementations. + /*! \namespace generic + * + * \brief Namespace of morphological image processing routines + * generic implementations. + */ namespace generic { }