Olena-patches September 2008

olena-patches@lrde.epita.fr

12 participants
359 discussions

cleanup-2008 2178: Move h_vec and h_mat in mln/ from core/ to algebra/.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move h_vec and h_mat in mln/ from core/ to algebra/. * mln/core/h_vec.hh, * mln/core/h_mat.hh: Rename as... * mln/algebra/h_vec.hh, * mln/algebra/h_mat.hh: ...these. Update. * tests/core/h_vec.cc, * tests/algebra/vec2.cc, * tests/algebra/mat.cc, * mln/core/point.hh, * mln/metal/vec.hh, * mln/fun/x2x/composed.hh, * mln/fun/x2x/translation.hh, * mln/fun/x2x/rotation.hh, * mln/fun/internal/x2x_linear_impl.hh, * mln/algebra/vec.hh: Update. mln/algebra/h_mat.hh | 27 +++++++++++------ mln/algebra/h_vec.hh | 55 ++++++++++++++++++++---------------- mln/algebra/vec.hh | 2 - mln/core/point.hh | 10 +++--- mln/fun/internal/x2x_linear_impl.hh | 8 ++--- mln/fun/x2x/composed.hh | 2 - mln/fun/x2x/rotation.hh | 2 - mln/fun/x2x/translation.hh | 4 +- mln/metal/vec.hh | 2 - tests/algebra/mat.cc | 10 +++--- tests/algebra/vec2.cc | 8 ++--- tests/core/h_vec.cc | 16 +++++----- 12 files changed, 81 insertions(+), 65 deletions(-) Index: tests/core/h_vec.cc --- tests/core/h_vec.cc (revision 2177) +++ tests/core/h_vec.cc (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 @@ -27,10 +27,10 @@ /*! \file tests/h_vec.cc * - * \brief Tests on mln::h_vec. + * \brief Tests on mln::algebra::h_vec. */ -#include <mln/core/h_vec.hh> +#include <mln/algebra/h_vec.hh> #include <mln/core/alias/point3d.hh> using namespace mln; @@ -40,12 +40,12 @@ { } -void run_in_3d_h(const h_vec<3, int>&) +void run_in_3d_h(const algebra::h_vec<3, int>&) { } -void foo(const mln::h_vec<3,float>&) +void foo(const mln::algebra::h_vec<3,float>&) { } @@ -54,9 +54,9 @@ { algebra::vec<3, int> x; - h_vec<3, int> w = x.to_h_vec(); + algebra::h_vec<3, int> w = x.to_h_vec(); - typedef h_vec<3, int> p3d; + typedef algebra::h_vec<3, int> p3d; p3d p; run_in_3d(p.to_vec()); @@ -66,7 +66,7 @@ { algebra::vec<3,float> v; - h_vec<3,float> w(v.to_h_vec()); + algebra::h_vec<3,float> w(v.to_h_vec()); w = v.to_h_vec(); foo(v.to_h_vec()); } Index: tests/algebra/vec2.cc --- tests/algebra/vec2.cc (revision 2177) +++ tests/algebra/vec2.cc (working copy) @@ -34,7 +34,7 @@ #include <iostream> #include <mln/fun/i2v/all_to.hh> #include <mln/algebra/vec.hh> -#include <mln/core/h_vec.hh> +#include <mln/algebra/h_vec.hh> @@ -45,10 +45,10 @@ algebra::vec<1,float> v1(all_to(4.)); algebra::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. + algebra::h_vec<1,float> hv1; + algebra::h_vec<2,float> hv2 = v2.to_h_vec(); // Immersion into homogeneous. - h_vec<3,float> hv3(all_to(1.5)); + algebra::h_vec<3,float> hv3(all_to(1.5)); hv3 += make::vec(0., 0., 0., 0.5); Index: tests/algebra/mat.cc --- tests/algebra/mat.cc (revision 2177) +++ tests/algebra/mat.cc (working copy) @@ -34,7 +34,7 @@ #include <iostream> #include <mln/fun/i2v/all_to.hh> #include <mln/algebra/mat.hh> -#include <mln/core/h_mat.hh> +#include <mln/algebra/h_mat.hh> @@ -45,9 +45,9 @@ algebra::mat<1,3,float> m1(all_to(4.)); algebra::mat<2,2,float> m2 = algebra::mat<2,2,float>::Id; - h_mat<1,float> hm1(m2); - h_mat<2,float> hm2; - h_mat<3,float> hm3(all_to(1.5)); + algebra::h_mat<1,float> hm1(m2); + algebra::h_mat<2,float> hm2; + algebra::h_mat<3,float> hm3(all_to(1.5)); algebra::mat<4,4,float> m4 = hm3; @@ -59,7 +59,7 @@ std::cout << "hm3 = " << hm3 << ";" << std::endl; { - h_mat<2,float> m, m2; + algebra::h_mat<2,float> m, m2; m = m2; // FIXME: Test *many* => runs ok... } Index: mln/core/point.hh --- mln/core/point.hh (revision 2177) +++ mln/core/point.hh (working copy) @@ -42,7 +42,7 @@ # include <mln/metal/is_not.hh> # include <mln/algebra/vec.hh> # include <mln/metal/converts_to.hh> -# include <mln/core/h_vec.hh> +# include <mln/algebra/h_vec.hh> # include <mln/util/yes.hh> @@ -69,7 +69,7 @@ struct point_to_ { typedef algebra::vec<G::dim, C> metal_vec; - typedef mln::h_vec<G::dim, C> h_vec; + typedef mln::algebra::h_vec<G::dim, C> h_vec; }; } // end of namespace mln::internal @@ -174,7 +174,7 @@ const algebra::vec<G::dim, C>& to_vec() const; /// Transform to point in homogene coordinate system. - h_vec<G::dim, C> to_h_vec() const; + algebra::h_vec<G::dim, C> to_h_vec() const; /// Point with all coordinates set to the maximum value. static const point<G,C>& plus_infty(); @@ -394,9 +394,9 @@ template <typename G, typename C> inline - h_vec<G::dim, C> point<G,C>::to_h_vec() const + algebra::h_vec<G::dim, C> point<G,C>::to_h_vec() const { - h_vec<G::dim, C> tmp; + algebra::h_vec<G::dim, C> tmp; for (unsigned i = 0; i < dim; ++i) tmp[i] = coord_[i]; tmp[G::dim] = 1; Index: mln/metal/vec.hh --- mln/metal/vec.hh (revision 2177) +++ mln/metal/vec.hh (working copy) @@ -191,7 +191,7 @@ // Immersion of the vector into its homogeneous space. - h_vec<n, T> to_h_vec() const; + algebra::h_vec<n, T> to_h_vec() const; const T& operator[](unsigned i) const; Index: mln/fun/x2x/composed.hh --- mln/fun/x2x/composed.hh (revision 2177) +++ mln/fun/x2x/composed.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/algebra/vec.hh> # include <mln/metal/is.hh> # include <mln/metal/bexpr.hh> -# include <mln/core/h_mat.hh> +# include <mln/algebra/h_mat.hh> namespace mln Index: mln/fun/x2x/translation.hh --- mln/fun/x2x/translation.hh (revision 2177) +++ mln/fun/x2x/translation.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/function.hh> # include <mln/fun/internal/x2x_linear_impl.hh> # include <mln/algebra/vec.hh> -# include <mln/core/h_mat.hh> +# include <mln/algebra/h_mat.hh> # include <mln/fun/i2v/all.hh> namespace mln @@ -97,7 +97,7 @@ translation<n,C>::translation(const algebra::vec<n,C>& t) :t_(t) { - this->m_ = h_mat<n,C>::Id; + this->m_ = algebra::h_mat<n,C>::Id; this->update(); } Index: mln/fun/x2x/rotation.hh --- mln/fun/x2x/rotation.hh (revision 2177) +++ mln/fun/x2x/rotation.hh (working copy) @@ -100,7 +100,7 @@ dir_(dir) { mln_precondition(dir == 2 || n == 3); - this->m_ = h_mat<n,C>::Id; + this->m_ = algebra::h_mat<n,C>::Id; update(); } Index: mln/fun/internal/x2x_linear_impl.hh --- mln/fun/internal/x2x_linear_impl.hh (revision 2177) +++ mln/fun/internal/x2x_linear_impl.hh (working copy) @@ -34,8 +34,8 @@ */ # include <mln/core/concept/function.hh> -# include <mln/core/h_mat.hh> -# include <mln/core/h_vec.hh> +# include <mln/algebra/h_mat.hh> +# include <mln/algebra/h_vec.hh> namespace mln { @@ -54,11 +54,11 @@ typedef V argument; typedef V result; typedef typename V::coord coord; - typedef h_mat<dim, coord> matrix; + typedef algebra::h_mat<dim, coord> matrix; V operator()(const V& x) const { - h_vec<dim, coord> tmp = m_ * x.to_h_vec(); + algebra::h_vec<dim, coord> tmp = m_ * x.to_h_vec(); return tmp.to_vec(); } Index: mln/algebra/h_vec.hh --- mln/algebra/h_vec.hh (revision 2177) +++ mln/algebra/h_vec.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 @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_H_VEC_HH -# define MLN_CORE_H_VEC_HH +#ifndef MLN_ALGEBRA_H_VEC_HH +# define MLN_ALGEBRA_H_VEC_HH -/*! \file mln/core/h_vec.hh +/*! \file mln/algebra/h_vec.hh * * \brief Definition of a vector with homogeneous coordinates. */ @@ -36,12 +36,14 @@ # include <mln/algebra/vec.hh> # include <mln/literal/one.hh> + namespace mln { - // Fwd decl. + // Forward declaration. + namespace algebra { template <unsigned d, typename C> struct h_vec; - + } namespace trait @@ -51,10 +53,10 @@ template < template <class> class Name, unsigned d, typename C > - struct set_precise_unary_< Name, h_vec<d, C> > + struct set_precise_unary_< Name, algebra::h_vec<d, C> > { typedef mln_trait_unary(Name, C) V; - typedef h_vec<d, V> ret; + typedef algebra::h_vec<d, V> ret; }; // For binary traits. @@ -63,30 +65,35 @@ unsigned d, typename C, typename Q > struct set_precise_binary_< Name, - h_vec<d, C>, h_vec<d, Q> > + algebra::h_vec<d, C>, algebra::h_vec<d, Q> > { typedef mln_trait_binary(Name, C, Q) V; - typedef h_vec<d, V> ret; + typedef algebra::h_vec<d, V> ret; }; template < template <class, class> class Name, unsigned d, typename C, typename S > struct set_precise_binary_< Name, - h_vec<d, C>, mln::value::scalar_<S> > + algebra::h_vec<d, C>, mln::value::scalar_<S> > { typedef mln_trait_binary(Name, C, S) V; - typedef h_vec<d, V> ret; + typedef algebra::h_vec<d, V> ret; }; } // end of namespace mln::trait + + namespace algebra + { + + /*! \brief N-Dimensional vector with homogeneous coordinates. * */ template <unsigned d, typename C> - struct h_vec : public algebra::vec<d + 1, C> + struct h_vec : public vec<d + 1, C> { /// Dimension is the 'natural' one (3 for 3D), not the one of the vector (dim + 1). enum { dim = d }; @@ -94,12 +101,12 @@ /// Constructor without argument. h_vec(); /// Constructor with the underlying vector. - h_vec(const algebra::vec<d+1, C>& other); + h_vec(const vec<d+1, C>& other); - h_vec& operator=(const algebra::vec<d+1, C>& rhs); + h_vec& operator=(const vec<d+1, C>& rhs); /// Back to the natural (non-homogeneous) space. - algebra::vec<d,C> to_vec() const; + vec<d,C> to_vec() const; }; @@ -119,18 +126,18 @@ template <unsigned d, typename C> inline - h_vec<d,C>::h_vec(const algebra::vec<d+1, C>& other) - : algebra::vec<d+1, C>(other) + h_vec<d,C>::h_vec(const vec<d+1, C>& other) + : vec<d+1, C>(other) { } template <unsigned d, typename C> inline - h_vec<d,C>& h_vec<d,C>::operator=(const algebra::vec<d+1, C>& rhs) + h_vec<d,C>& h_vec<d,C>::operator=(const vec<d+1, C>& rhs) { if (& rhs == this) return *this; - this->algebra::vec<d+1, C>::operator=(rhs); + this->vec<d+1, C>::operator=(rhs); return *this; } @@ -154,12 +161,12 @@ template <unsigned d, typename C> inline - algebra::vec<d,C> h_vec<d,C>::to_vec() const + vec<d,C> h_vec<d,C>::to_vec() const { const C w = this->data_[d]; mln_assertion(w != 0); - algebra::vec<d,C> tmp; + vec<d,C> tmp; for (unsigned i = 0; i < d; ++i) tmp[i] = this->data_[i] / w; return tmp; @@ -167,7 +174,9 @@ # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::algebra + } // end of namespace mln -#endif // ! MLN_CORE_H_VEC_HH +#endif // ! MLN_ALGEBRA_H_VEC_HH Index: mln/algebra/h_mat.hh --- mln/algebra/h_mat.hh (revision 2177) +++ mln/algebra/h_mat.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 @@ -25,12 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_H_MAT_HH -# define MLN_CORE_H_MAT_HH +#ifndef MLN_ALGEBRA_H_MAT_HH +# define MLN_ALGEBRA_H_MAT_HH -/*! \file mln/core/h_mat.hh +/*! \file mln/algebra/h_mat.hh * * \brief Definition of a matrix with homogeneous coordinates. + * + * \todo Add traits. */ # include <mln/algebra/mat.hh> @@ -39,11 +41,14 @@ namespace mln { + namespace algebra + { + /*! \brief N-Dimensional matrix with homogeneous coordinates. * */ template <unsigned d, typename T> - struct h_mat : public algebra::mat<d+1, d+1, T> + struct h_mat : public mat<d+1, d+1, T> { /// Dimension is the 'natural' one (3 for 3D), not the one of the vector (dim + 1) enum { N = d, @@ -53,7 +58,7 @@ /// Constructor without argument. h_mat(); /// Constructor with the underlying matrix. - h_mat(const algebra::mat<d+1, d+1, T>& x); + h_mat(const mat<d+1, d+1, T>& x); }; @@ -62,21 +67,23 @@ template <unsigned d, typename T> inline h_mat<d,T>::h_mat() - : algebra::mat<d+1, d+1, T>(algebra::mat<d+1, d+1, T>::Id) + : mat<d+1, d+1, T>(mat<d+1, d+1, T>::Id) { } template <unsigned d, typename T> inline - h_mat<d,T>::h_mat(const algebra::mat<d+1, d+1, T>& x) - : algebra::mat<d+1, d+1, T>(x) + h_mat<d,T>::h_mat(const mat<d+1, d+1, T>& x) + : mat<d+1, d+1, T>(x) { } # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::algebra + } // end of namespace mln -#endif // ! MLN_CORE_H_MAT_HH +#endif // ! MLN_ALGEBRA_H_MAT_HH Index: mln/algebra/vec.hh --- mln/algebra/vec.hh (revision 2177) +++ mln/algebra/vec.hh (working copy) @@ -197,7 +197,7 @@ // Immersion of the vector into its homogeneous space. - h_vec<n, T> to_h_vec() const; + algebra::h_vec<n, T> to_h_vec() const; const T& operator[](unsigned i) const;

15 years, 8 months

cleanup-2008 2177: Move some remaining core types in appropriate directories.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move some remaining core types in appropriate directories. * mln/core/complex_image.hh, * mln/core/lazy_image.hh: Rename as... * mln/core/image/complex_image.hh, * mln/core/image/lazy_image.hh: ...these. * mln/core/p_complex.hh, * mln/core/p_complex_piter.hh, * mln/core/p_faces.hh: Rename as... * mln/core/site_set/p_complex.hh, * mln/core/site_set/p_complex_piter.hh, * mln/core/site_set/p_faces.hh: ...these. * tests/core/complex_image.cc: Update. mln/core/image/complex_image.hh | 10 +++++----- mln/core/image/lazy_image.hh | 8 ++++---- mln/core/site_set/p_complex.hh | 10 +++++----- mln/core/site_set/p_complex_piter.hh | 10 +++++----- mln/core/site_set/p_faces.hh | 8 ++++---- tests/core/complex_image.cc | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) Index: tests/core/complex_image.cc --- tests/core/complex_image.cc (revision 2176) +++ tests/core/complex_image.cc (working copy) @@ -33,8 +33,8 @@ #include <mln/value/int_u8.hh> #include <mln/core/alias/point2d.hh> -#include <mln/core/p_faces.hh> -#include <mln/core/complex_image.hh> +#include <mln/core/site_set/p_faces.hh> +#include <mln/core/image/complex_image.hh> int main() @@ -127,12 +127,12 @@ At least, we could have better error messages, i.e., something like - mln/core/complex_image.hh 267: + mln/core/image/complex_image.hh 267: mln::complex_image<D, P, V>::operator(): Uncompatible p_complex. instead of - mln/core/complex_image.hh:267: + mln/core/image/complex_image.hh:267: typename mln::complex_image<D, P, V>::lvalue mln::complex_image<D, P, V>::operator()(const mln::complex_psite<D, P>&) [with unsigned int D = 2u, Index: mln/core/site_set/p_complex.hh --- mln/core/site_set/p_complex.hh (revision 2176) +++ mln/core/site_set/p_complex.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_COMPLEX_HH -# define MLN_CORE_P_COMPLEX_HH +#ifndef MLN_CORE_SITE_SET_P_COMPLEX_HH +# define MLN_CORE_SITE_SET_P_COMPLEX_HH -/// \file mln/core/p_complex.hh +/// \file mln/core/site_set/p_complex.hh /// \brief Definition of a point set based on a complex. # include <mln/core/internal/point_set_base.hh> @@ -38,7 +38,7 @@ # include <mln/core/complex.hh> # include <mln/core/complex_psite.hh> -# include <mln/core/p_complex_piter.hh> +# include <mln/core/site_set/p_complex_piter.hh> namespace mln @@ -239,4 +239,4 @@ } // end of mln -#endif // MLN_CORE_P_COMPLEX_HH +#endif // MLN_CORE_SITE_SET_P_COMPLEX_HH Index: mln/core/site_set/p_complex_piter.hh --- mln/core/site_set/p_complex_piter.hh (revision 2176) +++ mln/core/site_set/p_complex_piter.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_COMPLEX_PITER_HH -# define MLN_CORE_P_COMPLEX_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_COMPLEX_PITER_HH +# define MLN_CORE_SITE_SET_P_COMPLEX_PITER_HH # include <limits> # include <mln/core/internal/point_iterator_base.hh> -# include <mln/core/p_complex.hh> +# include <mln/core/site_set/p_complex.hh> # include <mln/core/complex_psite.hh> -/// \file mln/core/p_complex_piter.hh +/// \file mln/core/site_set/p_complex_piter.hh /// \brief Definition of point iterator on complex-based pset. // Factor p_complex_fwd_piter_<D, P> and p_complex_bkd_piter_<D, P> @@ -607,4 +607,4 @@ } // end of mln -#endif // ! MLN_CORE_P_COMPLEX_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_COMPLEX_PITER_HH Index: mln/core/site_set/p_faces.hh --- mln/core/site_set/p_faces.hh (revision 2176) +++ mln/core/site_set/p_faces.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_FACES_HH -# define MLN_CORE_P_FACES_HH +#ifndef MLN_CORE_SITE_SET_P_FACES_HH +# define MLN_CORE_SITE_SET_P_FACES_HH -/// \file mln/core/p_faces.hh +/// \file mln/core/site_set/p_faces.hh /// \brief Definition of a point set based on the set of n-faces of a /// complex. @@ -206,4 +206,4 @@ } // end of mln -#endif // MLN_CORE_P_FACES_HH +#endif // MLN_CORE_SITE_SET_P_FACES_HH Index: mln/core/image/lazy_image.hh --- mln/core/image/lazy_image.hh (revision 2176) +++ mln/core/image/lazy_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LAZY_IMAGE_HH -# define MLN_CORE_LAZY_IMAGE_HH +#ifndef MLN_CORE_IMAGE_LAZY_IMAGE_HH +# define MLN_CORE_IMAGE_LAZY_IMAGE_HH -/*! \file mln/core/lazy_image.hh +/*! \file mln/core/image/lazy_image.hh * * \brief Definition of a lazy image. Values are computed on the fly */ @@ -206,4 +206,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LAZY_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_LAZY_IMAGE_HH Index: mln/core/image/complex_image.hh --- mln/core/image/complex_image.hh (revision 2176) +++ mln/core/image/complex_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_COMPLEX_IMAGE_HH -# define MLN_CORE_COMPLEX_IMAGE_HH +#ifndef MLN_CORE_IMAGE_COMPLEX_IMAGE_HH +# define MLN_CORE_IMAGE_COMPLEX_IMAGE_HH -/// \file mln/core/complex_image.hh +/// \file mln/core/image/complex_image.hh /// \brief Definition of a line complex-based image. # include <vector> @@ -37,7 +37,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/metal/vec.hh> -# include <mln/core/p_complex.hh> +# include <mln/core/site_set/p_complex.hh> # include <mln/core/complex_psite.hh> # include <mln/value/set.hh> @@ -298,4 +298,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_COMPLEX_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_COMPLEX_IMAGE_HH

15 years, 8 months

cleanup-2008 2176: Rename pset_if as p_if and remove Q at end of priority_Q.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Rename pset_if as p_if and remove Q at end of priority_Q. * mln/core/site_set/pset_if.hh, * mln/core/pset_if_piter.hh: Rename as... * mln/core/site_set/p_if.hh, * mln/core/site_set/p_if_piter.hh: ...these. * mln/core/site_set/p_priority_queue.hh: Rename as... * mln/core/site_set/p_priority.hh: ...this. * tests/core/p_priority_queue.cc, * tests/core/p_priority_queue_fast_with_array.cc, * tests/core/pset_if.cc, * tests/core/p_priority_queue_fast.cc, * tests/convert/to_image.cc, * doc/tutorial/examples/image_if.cc, * doc/tutorial/examples/p_queue.cc, * mln/core/site_set/p_image.hh, * mln/core/image/image_if.hh, * mln/core/internal/image_if_base.hh, * mln/draw/label.hh, * mln/geom/seeds2tiling_roundness.hh, * mln/morpho/meyer_wst.hh, * sandbox/pellegrin/set/test/p_priority_queue_fast.cc, * sandbox/pellegrin/set/test/p_priority_queue.cc, * sandbox/pellegrin/set/test/pset_if.cc, * sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc, * sandbox/pellegrin/set/trait/point_set.hh, * sandbox/pellegrin/set/core/p_priority_queue_fast.hh, * sandbox/pellegrin/set/core/pset_if.hh, * sandbox/pellegrin/set/core/concept/point_set.hh, * sandbox/pellegrin/set/core/p_priority_queue.hh, * sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/fllt.hh: Update. doc/tutorial/examples/image_if.cc | 2 doc/tutorial/examples/p_queue.cc | 2 mln/core/image/image_if.hh | 10 - mln/core/internal/image_if_base.hh | 10 - mln/core/site_set/p_if.hh | 52 +++++----- mln/core/site_set/p_if_piter.hh | 40 +++---- mln/core/site_set/p_image.hh | 4 mln/draw/label.hh | 2 mln/geom/seeds2tiling_roundness.hh | 4 mln/morpho/meyer_wst.hh | 2 sandbox/garrigues/fllt/fllt.hh | 4 sandbox/garrigues/level_set.hh | 4 sandbox/pellegrin/set/core/concept/point_set.hh | 2 sandbox/pellegrin/set/core/p_priority_queue.hh | 50 ++++----- sandbox/pellegrin/set/core/p_priority_queue_fast.hh | 50 ++++----- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh | 50 ++++----- sandbox/pellegrin/set/core/pset_if.hh | 52 +++++----- sandbox/pellegrin/set/test/p_priority_queue.cc | 8 - sandbox/pellegrin/set/test/p_priority_queue_fast.cc | 8 - sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc | 8 - sandbox/pellegrin/set/test/pset_if.cc | 6 - sandbox/pellegrin/set/trait/point_set.hh | 8 - tests/convert/to_image.cc | 2 tests/core/p_priority_queue.cc | 8 - tests/core/p_priority_queue_fast.cc | 8 - tests/core/p_priority_queue_fast_with_array.cc | 8 - tests/core/pset_if.cc | 6 - 27 files changed, 205 insertions(+), 205 deletions(-) Index: tests/core/p_priority_queue.cc --- tests/core/p_priority_queue.cc (revision 2175) +++ tests/core/p_priority_queue.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue.cc +/*! \file tests/core/p_priority.cc * - * \brief Tests on mln::p_priority_queue. + * \brief Tests on mln::p_priority. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/site_set/p_priority_queue.hh> +#include <mln/core/site_set/p_priority.hh> int main () { using namespace mln; - p_priority_queue<point2d, unsigned> q; + p_priority<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: tests/core/p_priority_queue_fast_with_array.cc --- tests/core/p_priority_queue_fast_with_array.cc (revision 2175) +++ tests/core/p_priority_queue_fast_with_array.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue_fast_with_array.cc +/*! \file tests/core/p_priority_fast_with_array.cc * - * \brief Tests on mln::p_priority_queue_fast_with_array. + * \brief Tests on mln::p_priority_fast_with_array. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_queue_fast_with_array.hh> +#include <mln/core/p_priority_fast_with_array.hh> int main () { using namespace mln; - p_priority_queue_fast_with_array<point2d, unsigned, 20> q; + p_priority_fast_with_array<point2d, unsigned, 20> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: tests/core/pset_if.cc --- tests/core/pset_if.cc (revision 2175) +++ tests/core/pset_if.cc (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/pset_if.cc +/*! \file tests/core/p_if.cc * - * \brief Tests on mln::pset_if. + * \brief Tests on mln::p_if. */ #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/site_set/pset_if.hh> +#include <mln/core/site_set/p_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/convert/to_image.hh> #include <mln/convert/to_p_set.hh> Index: tests/core/p_priority_queue_fast.cc --- tests/core/p_priority_queue_fast.cc (revision 2175) +++ tests/core/p_priority_queue_fast.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue_fast.cc +/*! \file tests/core/p_priority_fast.cc * - * \brief Tests on mln::p_priority_queue_fast. + * \brief Tests on mln::p_priority_fast. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_queue_fast.hh> +#include <mln/core/p_priority_fast.hh> int main () { using namespace mln; - mln::p_priority_queue_fast<point2d, unsigned> q; + mln::p_priority_fast<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2175) +++ tests/convert/to_image.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/site_set/pset_if.hh> +#include <mln/core/site_set/p_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/level/compare.hh> Index: doc/tutorial/examples/image_if.cc --- doc/tutorial/examples/image_if.cc (revision 2175) +++ doc/tutorial/examples/image_if.cc (working copy) @@ -71,7 +71,7 @@ trait::image::print(ima_); std::cout << std::endl; - typedef pset_if<box2d, fun::p2b::chess_t> S; + typedef p_if<box2d, fun::p2b::chess_t> S; ch_target(mln_fwd_piter_(S)(), ima_.domain()); // mln_VAR(ima_e, extend(ima_, pw::value(ima))); Index: doc/tutorial/examples/p_queue.cc --- doc/tutorial/examples/p_queue.cc (revision 2175) +++ doc/tutorial/examples/p_queue.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/debug/println.hh> # include <mln/level/fill.hh> -# include <mln/core/site_set/p_priority_queue.hh> +# include <mln/core/site_set/p_priority.hh> Index: mln/core/site_set/p_image.hh --- mln/core/site_set/p_image.hh (revision 2175) +++ mln/core/site_set/p_image.hh (working copy) @@ -37,7 +37,7 @@ * \todo Add an init method (deferred initialization). */ -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/fun/ops.hh> # include <mln/pw/value.hh> # include <mln/pw/cst.hh> @@ -76,7 +76,7 @@ public: /// Equivalent site_set type. - typedef pset_if<S_, F_> S; + typedef p_if<S_, F_> S; /// Conversion towards the equivalent site set. operator S() const; Index: mln/core/site_set/p_if.hh --- mln/core/site_set/p_if.hh (revision 2175) +++ mln/core/site_set/p_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_PSET_IF_HH -# define MLN_CORE_SITE_SET_PSET_IF_HH +#ifndef MLN_CORE_SITE_SET_P_IF_HH +# define MLN_CORE_SITE_SET_P_IF_HH -/*! \file mln/core/site_set/pset_if.hh +/*! \file mln/core/site_set/p_if.hh * * \brief Definition of the restriction of a point set w.r.t. a predicate. * @@ -43,15 +43,15 @@ { // Fwd decls. - template <typename S, typename F> struct pset_if; - template <typename Pi, typename S, typename F> struct pset_if_piter_; + template <typename S, typename F> struct p_if; + template <typename Pi, typename S, typename F> struct p_if_piter_; namespace trait { template <typename S, typename F> - struct site_set_< pset_if<S,F> > + struct site_set_< p_if<S,F> > { typedef trait::site_set::nsites::unknown nsites; typedef trait::site_set::bbox::unknown bbox; @@ -69,7 +69,7 @@ * \return A subset of points. */ template <typename S, typename F> - pset_if<S, F> + p_if<S, F> operator | (const Site_Set<S>& pset, const Function_p2b<F>& f); @@ -80,9 +80,9 @@ * from point to Boolean. */ template <typename S, typename F> - class pset_if : public internal::site_set_base_< mln_psite(S), pset_if<S,F> > + class p_if : public internal::site_set_base_< mln_psite(S), p_if<S,F> > { - typedef pset_if<S,F> self_; + typedef p_if<S,F> self_; typedef internal::site_set_base_<mln_psite(S), self_> super_; public: @@ -94,20 +94,20 @@ typedef mln_psite(S) psite; /// Forward Site_Iterator associated type. - typedef pset_if_piter_<mln_fwd_piter(S), S, F> fwd_piter; + typedef p_if_piter_<mln_fwd_piter(S), S, F> fwd_piter; /// Backward Site_Iterator associated type. - typedef pset_if_piter_<mln_bkd_piter(S), S, F> bkd_piter; + typedef p_if_piter_<mln_bkd_piter(S), S, F> bkd_piter; /// Site_Iterator associated type. typedef fwd_piter piter; /// Constructor with a point set \p pset and a predicate \p f. - pset_if(const S& pset, const F& f); + p_if(const S& pset, const F& f); /// Constructor without argument. - pset_if(); + p_if(); /// Test if this site set is valid. @@ -143,20 +143,20 @@ template <typename S, typename F> inline - pset_if<S, F> + p_if<S, F> operator | (const Site_Set<S>& pset, const Function_p2b<F>& f) { - pset_if<S, F> tmp(exact(pset), exact(f)); + p_if<S, F> tmp(exact(pset), exact(f)); return tmp; } - // pset_if<S,F> + // p_if<S,F> template <typename S, typename F> inline bool - pset_if<S,F>::has(const psite& p) const + p_if<S,F>::has(const psite& p) const { return pset_.has(p) && f_(p); } @@ -164,7 +164,7 @@ template <typename S, typename F> inline bool - pset_if<S,F>::is_valid() const + p_if<S,F>::is_valid() const { return pset_.is_valid(); } @@ -172,7 +172,7 @@ template <typename S, typename F> inline const S& - pset_if<S,F>::overset() const + p_if<S,F>::overset() const { return pset_; } @@ -180,14 +180,14 @@ template <typename S, typename F> inline bool - pset_if<S,F>::pred(const psite& p) const + p_if<S,F>::pred(const psite& p) const { return f_(p); } template <typename S, typename F> inline - pset_if<S,F>::pset_if(const S& pset, const F& f) + p_if<S,F>::p_if(const S& pset, const F& f) : pset_(pset), f_(f) { @@ -195,14 +195,14 @@ template <typename S, typename F> inline - pset_if<S,F>::pset_if() + p_if<S,F>::p_if() { } template <typename S, typename F> inline const F& - pset_if<S,F>::predicate() const + p_if<S,F>::predicate() const { return f_; } @@ -210,7 +210,7 @@ template <typename S, typename F> inline std::size_t - pset_if<S,F>::memory_size() const + p_if<S,F>::memory_size() const { return pset_.memory_size() + sizeof(f_); } @@ -221,8 +221,8 @@ -# include <mln/core/pset_if_piter.hh> +# include <mln/core/p_if_piter.hh> -#endif // ! MLN_CORE_SITE_SET_PSET_IF_HH +#endif // ! MLN_CORE_SITE_SET_P_IF_HH Index: mln/core/site_set/p_if_piter.hh --- mln/core/site_set/p_if_piter.hh (revision 2175) +++ mln/core/site_set/p_if_piter.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_PSET_IF_PITER_HH -# define MLN_CORE_SITE_SET_PSET_IF_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_IF_PITER_HH +# define MLN_CORE_SITE_SET_P_IF_PITER_HH -/*! \file mln/core/pset_if_piter.hh +/*! \file mln/core/p_if_piter.hh * - * \brief Definition of iterators on pset_if<S,F>. + * \brief Definition of iterators on p_if<S,F>. */ # include <mln/core/internal/piter_adaptor.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/site_set/p_if.hh> namespace mln @@ -46,19 +46,19 @@ * Parameter \c S is a site set type; parameter F is a function * from point to Boolean. * - * \see mln::pset_if + * \see mln::p_if */ template <typename Pi, typename S, typename F> - struct pset_if_piter_ + struct p_if_piter_ : public internal::piter_adaptor_< Pi, // Adaptee. - pset_if<S,F>, // Site_Set. - pset_if_piter_<Pi,S,F> > // Exact. + p_if<S,F>, // Site_Set. + p_if_piter_<Pi,S,F> > // Exact. { /// Constructor without argument. - pset_if_piter_(); + p_if_piter_(); /// Constructor from a site set. - pset_if_piter_(const pset_if<S,F>& s); + p_if_piter_(const p_if<S,F>& s); /// Start an iteration. void start_(); @@ -67,11 +67,11 @@ void next_(); /// Change the set site targeted by pi_. - void pi_change_target_(const pset_if<S,F>& s); + void pi_change_target_(const p_if<S,F>& s); private: - typedef pset_if_piter_<Pi,S,F> self_; - typedef internal::piter_adaptor_<Pi, pset_if<S,F>, self_> super_; + typedef p_if_piter_<Pi,S,F> self_; + typedef internal::piter_adaptor_<Pi, p_if<S,F>, self_> super_; protected: using super_::s_; @@ -84,13 +84,13 @@ template <typename Pi, typename S, typename F> inline - pset_if_piter_<Pi,S,F>::pset_if_piter_() + p_if_piter_<Pi,S,F>::p_if_piter_() { } template <typename Pi, typename S, typename F> inline - pset_if_piter_<Pi,S,F>::pset_if_piter_(const pset_if<S,F>& s) + p_if_piter_<Pi,S,F>::p_if_piter_(const p_if<S,F>& s) { this->change_target(s); } @@ -98,7 +98,7 @@ template <typename Pi, typename S, typename F> inline void - pset_if_piter_<Pi,S,F>::start_() + p_if_piter_<Pi,S,F>::start_() { pi_.start(); while (pi_.is_valid() && ! s_->pred(pi_)) @@ -108,7 +108,7 @@ template <typename Pi, typename S, typename F> inline void - pset_if_piter_<Pi,S,F>::next_() + p_if_piter_<Pi,S,F>::next_() { do pi_.next(); @@ -118,7 +118,7 @@ template <typename Pi, typename S, typename F> inline void - pset_if_piter_<Pi,S,F>::pi_change_target_(const pset_if<S,F>& s) + p_if_piter_<Pi,S,F>::pi_change_target_(const p_if<S,F>& s) { pi_.change_target(s.overset()); } @@ -128,4 +128,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SITE_SET_PSET_IF_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_IF_PITER_HH Index: mln/core/image/image_if.hh --- mln/core/image/image_if.hh (revision 2175) +++ mln/core/image/image_if.hh (working copy) @@ -37,7 +37,7 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/pw/all.hh> @@ -58,7 +58,7 @@ data(I& ima, const F& f); I ima_; - pset_if<mln_pset(I), F> pset_; + p_if<mln_pset(I), F> pset_; }; } // end of namespace mln::internal @@ -90,7 +90,7 @@ */ template <typename I, typename F> struct image_if : public internal::image_domain_morpher< I, - pset_if<mln_pset(I), F>, + p_if<mln_pset(I), F>, image_if<I, F> > { /// Skeleton. @@ -105,7 +105,7 @@ void init_(I& ima, const F& f); /// Give the definition domain. - const pset_if<mln_pset(I), F>& domain() const; + const p_if<mln_pset(I), F>& domain() const; /// Const promotion via conversion. operator image_if<const I, F>() const; @@ -193,7 +193,7 @@ template <typename I, typename F> inline - const pset_if<mln_pset(I), F>& + const p_if<mln_pset(I), F>& image_if<I,F>::domain() const { mln_precondition(this->has_data()); Index: mln/core/internal/image_if_base.hh --- mln/core/internal/image_if_base.hh (revision 2175) +++ mln/core/internal/image_if_base.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/pw/all.hh> # include <mln/value/interval.hh> @@ -57,7 +57,7 @@ data_(I& ima, const F& f); I ima_; - pset_if<mln_pset(I), F> pset_; + p_if<mln_pset(I), F> pset_; }; } // end of namespace mln::internal @@ -99,11 +99,11 @@ * */ template <typename I, typename F, typename E> - struct image_if_base_ : public internal::image_domain_morpher< I, pset_if<mln_pset(I),F>, E > + struct image_if_base_ : public internal::image_domain_morpher< I, p_if<mln_pset(I),F>, E > { /// Give the definition domain. - const pset_if<mln_pset(I), F>& domain() const; + const p_if<mln_pset(I), F>& domain() const; void init_(I& ima, const F& f); @@ -186,7 +186,7 @@ template <typename I, typename F, typename E> inline - const pset_if<mln_pset(I), F>& + const p_if<mln_pset(I), F>& image_if_base_<I,F,E>::domain() const { return this->data_->pset_; Index: mln/draw/label.hh --- mln/draw/label.hh (revision 2175) +++ mln/draw/label.hh (working copy) @@ -77,7 +77,7 @@ { typedef mln_value(I) V; typedef mln_ch_value(I, value::rgb8) O; - typedef const mln::pset_if<mln_pset(I), mln::fun::eq_p2b_expr_<mln::pw::value_<I>, mln::pw::cst_<V> > > F; + typedef const mln::p_if<mln_pset(I), mln::fun::eq_p2b_expr_<mln::pw::value_<I>, mln::pw::cst_<V> > > F; I in = exact(input); mln_precondition(in.has_data()); Index: mln/geom/seeds2tiling_roundness.hh --- mln/geom/seeds2tiling_roundness.hh (revision 2175) +++ mln/geom/seeds2tiling_roundness.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/neighborhood.hh> -# include <mln/core/p_priority_queue_fast.hh> +# include <mln/core/p_priority_fast.hh> # include <mln/core/routine/clone.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> @@ -86,7 +86,7 @@ I& ima = exact(ima_); image2d<unsigned> dist = geom::chamfer(ima, w_win, max); I out = clone(ima_); - p_priority_queue_fast<mln_psite(I), unsigned> q; + p_priority_fast<mln_psite(I), unsigned> q; // Init. { Index: mln/morpho/meyer_wst.hh --- mln/morpho/meyer_wst.hh (revision 2175) +++ mln/morpho/meyer_wst.hh (working copy) @@ -120,7 +120,7 @@ // Ordered queue. /* FIXME: Milena probably already provides an ordered queue - facility via the mln::p_priority_queue class. Try to use it + facility via the mln::p_priority class. Try to use it instead, and get rid of mln/util/greater_psite.hh. */ typedef std::priority_queue< psite, std::vector<psite>, util::greater_psite<I> > Index: sandbox/pellegrin/set/test/p_priority_queue_fast.cc --- sandbox/pellegrin/set/test/p_priority_queue_fast.cc (revision 2175) +++ sandbox/pellegrin/set/test/p_priority_queue_fast.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue_fast.cc +/*! \file tests/core/p_priority_fast.cc * - * \brief Tests on mln::p_priority_queue_fast. + * \brief Tests on mln::p_priority_fast. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_queue_fast.hh> +#include <mln/core/p_priority_fast.hh> int main () { using namespace mln; - mln::p_priority_queue_fast<point2d, unsigned> q; + mln::p_priority_fast<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: sandbox/pellegrin/set/test/p_priority_queue.cc --- sandbox/pellegrin/set/test/p_priority_queue.cc (revision 2175) +++ sandbox/pellegrin/set/test/p_priority_queue.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue.cc +/*! \file tests/core/p_priority.cc * - * \brief Tests on mln::p_priority_queue. + * \brief Tests on mln::p_priority. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/site_set/p_priority_queue.hh> +#include <mln/core/site_set/p_priority.hh> int main () { using namespace mln; - p_priority_queue<point2d, unsigned> q; + p_priority<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: sandbox/pellegrin/set/test/pset_if.cc --- sandbox/pellegrin/set/test/pset_if.cc (revision 2175) +++ sandbox/pellegrin/set/test/pset_if.cc (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core_pset_if.cc +/*! \file tests/core_p_if.cc * - * \brief Tests on mln::pset_if. + * \brief Tests on mln::p_if. */ #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/site_set/pset_if.hh> +#include <mln/core/site_set/p_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/convert/to_image.hh> #include <mln/convert/to_p_set.hh> Index: sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc --- sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc (revision 2175) +++ sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue_fast_with_array.cc +/*! \file tests/core/p_priority_fast_with_array.cc * - * \brief Tests on mln::p_priority_queue_fast_with_array. + * \brief Tests on mln::p_priority_fast_with_array. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_queue_fast_with_array.hh> +#include <mln/core/p_priority_fast_with_array.hh> int main () { using namespace mln; - p_priority_queue_fast_with_array<point2d, unsigned, 20> q; + p_priority_fast_with_array<point2d, unsigned, 20> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: sandbox/pellegrin/set/trait/point_set.hh --- sandbox/pellegrin/set/trait/point_set.hh (revision 2175) +++ sandbox/pellegrin/set/trait/point_set.hh (working copy) @@ -47,15 +47,15 @@ template <typename P> struct p_bgraph; template <typename P> struct p_graph; template <typename P> struct p_line_graph; - template <typename P, typename T> struct p_priority_queue; - template <typename P, typename T> struct p_priority_queue_fast; - template <typename P, typename T, unsigned S> struct p_priority_queue_fast_with_array; + template <typename P, typename T> struct p_priority; + template <typename P, typename T> struct p_priority_fast; + template <typename P, typename T, unsigned S> struct p_priority_fast_with_array; template <typename P> struct p_queue; template <typename P> struct p_queue_fast; template <typename P> struct p_run; template <typename P> struct p_runs_; template <typename P> struct p_set; - template <typename S, typename F> struct pset_if; + template <typename S, typename F> struct p_if; namespace trait { Index: sandbox/pellegrin/set/core/p_priority_queue_fast.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast.hh (revision 2175) +++ sandbox/pellegrin/set/core/p_priority_queue_fast.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH # define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH -/*! \file mln/core/p_priority_queue_fast.hh +/*! \file mln/core/p_priority_fast.hh * * \brief Definition of a point set class based on p_queue_fast with * priority features. @@ -51,7 +51,7 @@ { // Fwd decls. - template <typename P, typename T> struct p_priority_queue_fast; + template <typename P, typename T> struct p_priority_fast; template <typename P> struct p_array_fwd_piter_; template <typename P> struct p_array_bkd_piter_; @@ -59,8 +59,8 @@ { template <typename P, typename T> - struct point_set_< p_priority_queue_fast<P, T> > - : public default_point_set_< p_priority_queue_fast<P, T> > + struct point_set_< p_priority_fast<P, T> > + : public default_point_set_< p_priority_fast<P, T> > { typedef trait::point_set::arity::unique arity; typedef trait::point_set::has_speed::fast has_speed; @@ -78,7 +78,7 @@ * a call to npoints() when this container is multiple. */ template <typename P, typename T> - class p_priority_queue_fast : public internal::point_set_base_< P, p_priority_queue_fast<P, T> > + class p_priority_fast : public internal::point_set_base_< P, p_priority_fast<P, T> > { public: @@ -89,7 +89,7 @@ typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. - p_priority_queue_fast(); + p_priority_fast(); /// Test is \p p belongs to this point set. bool has(const P& p) const; @@ -104,10 +104,10 @@ const box_<P>& bbox() const; /// Push force a point \p p in the queue. - p_priority_queue_fast<P, T>& push_force(const P& p, T prio = 0); + p_priority_fast<P, T>& push_force(const P& p, T prio = 0); /// Push a point \p p in the queue. - p_priority_queue_fast<P, T>& push(const P& p, T prio = 0); + p_priority_fast<P, T>& push(const P& p, T prio = 0); /// Pop (remove) the front point \p p from the queue; \p p is the /// least recently inserted point. @@ -151,7 +151,7 @@ template <typename P, typename T> inline - p_priority_queue_fast<P, T>::p_priority_queue_fast() + p_priority_fast<P, T>::p_priority_fast() { vect_needs_update_ = false; bb_needs_update_ = false; @@ -160,7 +160,7 @@ template <typename P, typename T> inline void - p_priority_queue_fast<P, T>::vect_update_() const + p_priority_fast<P, T>::vect_update_() const { vect_.clear(); vect_.reserve(npoints()); @@ -176,7 +176,7 @@ template <typename P, typename T> inline void - p_priority_queue_fast<P, T>::bb_update_() const + p_priority_fast<P, T>::bb_update_() const { bb_.init(); @@ -192,7 +192,7 @@ template <typename P, typename T> inline bool - p_priority_queue_fast<P, T>::has(const P& p) const + p_priority_fast<P, T>::has(const P& p) const { typename std::map<T, p_queue_fast<P> >::const_iterator it = q_.begin (); @@ -205,7 +205,7 @@ template <typename P, typename T> inline bool - p_priority_queue_fast<P, T>::is_empty() const + p_priority_fast<P, T>::is_empty() const { typename std::map<T, p_queue_fast<P> >::const_iterator it = q_.begin (); @@ -218,7 +218,7 @@ template <typename P, typename T> inline size_t - p_priority_queue_fast<P, T>::npoints() const + p_priority_fast<P, T>::npoints() const { unsigned res = 0; @@ -233,7 +233,7 @@ template <typename P, typename T> inline const box_<P>& - p_priority_queue_fast<P, T>::bbox() const + p_priority_fast<P, T>::bbox() const { mln_precondition(npoints() != 0); if (bb_needs_update_) @@ -243,8 +243,8 @@ template <typename P, typename T> inline - p_priority_queue_fast<P, T>& - p_priority_queue_fast<P, T>::push_force(const P& p, T prio) + p_priority_fast<P, T>& + p_priority_fast<P, T>::push_force(const P& p, T prio) { q_[prio].push_force (p); if (! vect_needs_update_) @@ -257,8 +257,8 @@ template <typename P, typename T> inline - p_priority_queue_fast<P, T>& - p_priority_queue_fast<P, T>::push(const P& p, T prio) + p_priority_fast<P, T>& + p_priority_fast<P, T>::push(const P& p, T prio) { if (! has(p)) return this->push_force(p, prio); @@ -269,7 +269,7 @@ template <typename P, typename T> inline void - p_priority_queue_fast<P, T>::pop() + p_priority_fast<P, T>::pop() { typename std::map<T, p_queue_fast<P> >::reverse_iterator it = q_.rbegin (); @@ -287,7 +287,7 @@ template <typename P, typename T> inline const P& - p_priority_queue_fast<P, T>::front() const + p_priority_fast<P, T>::front() const { mln_precondition(! q_.empty()); @@ -302,7 +302,7 @@ template <typename P, typename T> inline const P& - p_priority_queue_fast<P, T>::pop_front() + p_priority_fast<P, T>::pop_front() { const P& res = this->front(); @@ -313,7 +313,7 @@ template <typename P, typename T> inline void - p_priority_queue_fast<P, T>::clear() + p_priority_fast<P, T>::clear() { typename std::map<T, p_queue_fast<P> >::iterator it = q_.begin (); @@ -327,7 +327,7 @@ template <typename P, typename T> inline const std::vector<P>& - p_priority_queue_fast<P, T>::vect() const + p_priority_fast<P, T>::vect() const { if (vect_needs_update_) vect_update_(); @@ -337,7 +337,7 @@ template <typename P, typename T> inline const P& - p_priority_queue_fast<P, T>::operator[](unsigned i) const + p_priority_fast<P, T>::operator[](unsigned i) const { mln_precondition(i < npoints()); Index: sandbox/pellegrin/set/core/pset_if.hh --- sandbox/pellegrin/set/core/pset_if.hh (revision 2175) +++ sandbox/pellegrin/set/core/pset_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_PSET_IF_HH -# define MLN_CORE_SITE_SET_PSET_IF_HH +#ifndef MLN_CORE_SITE_SET_P_IF_HH +# define MLN_CORE_SITE_SET_P_IF_HH -/*! \file mln/core/site_set/pset_if.hh +/*! \file mln/core/site_set/p_if.hh * * \brief Definition of the restriction of a point set w.r.t. a predicate. */ @@ -42,15 +42,15 @@ { // Fwd decls. - template <typename S, typename F> struct pset_if; - template <typename S, typename F> struct pset_if_fwd_piter_; - template <typename S, typename F> struct pset_if_bkd_piter_; + template <typename S, typename F> struct p_if; + template <typename S, typename F> struct p_if_fwd_piter_; + template <typename S, typename F> struct p_if_bkd_piter_; namespace trait { template <typename S, typename F> - struct point_set_< pset_if<S, F> > : public default_point_set_< pset_if<S, F> > + struct point_set_< p_if<S, F> > : public default_point_set_< p_if<S, F> > { typedef trait::point_set::arity::unique arity; typedef trait::point_set::has_speed::slow has_speed; @@ -65,7 +65,7 @@ * \return A subset of points. */ template <typename S, typename F> - pset_if<S, F> + p_if<S, F> operator | (const Point_Set<S>& pset, const Function_p2b<F>& f); @@ -76,26 +76,26 @@ * from point to Boolean. */ template <typename S, typename F> - class pset_if : public internal::point_set_base_< mln_psite(S), pset_if<S,F> > + class p_if : public internal::point_set_base_< mln_psite(S), p_if<S,F> > { - typedef pset_if<S,F> self_; + typedef p_if<S,F> self_; typedef internal::point_set_base_<mln_psite(S), self_> super_; public: typedef mln_psite(super_) psite; /// Forward Site_Iterator associated type. - typedef pset_if_fwd_piter_<S,F> fwd_piter; + typedef p_if_fwd_piter_<S,F> fwd_piter; /// Backward Site_Iterator associated type. typedef mln::internal::fixme bkd_piter; /// Constructor with a point set \p pset and a predicate \p f. - pset_if(const S& pset, const F& f); + p_if(const S& pset, const F& f); /// Constructor without argument. - pset_if(); + p_if(); /// Test if \p p belongs to the subset. @@ -129,20 +129,20 @@ template <typename S, typename F> inline - pset_if<S, F> + p_if<S, F> operator | (const Point_Set<S>& pset, const Function_p2b<F>& f) { - pset_if<S, F> tmp(exact(pset), exact(f)); + p_if<S, F> tmp(exact(pset), exact(f)); return tmp; } - // pset_if<S,F> + // p_if<S,F> template <typename S, typename F> inline bool - pset_if<S,F>::has(const psite& p) const + p_if<S,F>::has(const psite& p) const { return pset_.has(p) && f_(p); } @@ -150,7 +150,7 @@ template <typename S, typename F> inline const box_<mln_point(S)>& - pset_if<S,F>::bbox() const + p_if<S,F>::bbox() const { return pset_.bbox(); } @@ -158,7 +158,7 @@ template <typename S, typename F> inline const S& - pset_if<S,F>::overset() const + p_if<S,F>::overset() const { return pset_; } @@ -166,14 +166,14 @@ template <typename S, typename F> inline bool - pset_if<S,F>::pred(const psite& p) const + p_if<S,F>::pred(const psite& p) const { return f_(p); } template <typename S, typename F> inline - pset_if<S,F>::pset_if(const S& pset, const F& f) + p_if<S,F>::p_if(const S& pset, const F& f) : pset_(pset), f_(f) { @@ -181,14 +181,14 @@ template <typename S, typename F> inline - pset_if<S,F>::pset_if() + p_if<S,F>::p_if() { } template <typename S, typename F> inline const F& - pset_if<S,F>::predicate() const + p_if<S,F>::predicate() const { return f_; } @@ -199,7 +199,7 @@ -# include <mln/core/pset_if_piter.hh> +# include <mln/core/p_if_piter.hh> @@ -210,7 +210,7 @@ template <typename S, typename F> std::size_t - pset_if<S,F>::npoints() const + p_if<S,F>::npoints() const { std::size_t n = 0; fwd_piter p(*this); @@ -224,4 +224,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SITE_SET_PSET_IF_HH +#endif // ! MLN_CORE_SITE_SET_P_IF_HH Index: sandbox/pellegrin/set/core/concept/point_set.hh --- sandbox/pellegrin/set/core/concept/point_set.hh (revision 2175) +++ sandbox/pellegrin/set/core/concept/point_set.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of the concept of mln::Point_Set. * * \todo Think about adding an 'insert' method (not so easy because of - * pset_if...) + * p_if...) */ # include <mln/core/concept/point_site.hh> Index: sandbox/pellegrin/set/core/p_priority_queue.hh --- sandbox/pellegrin/set/core/p_priority_queue.hh (revision 2175) +++ sandbox/pellegrin/set/core/p_priority_queue.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH # define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH -/*! \file mln/core/site_set/p_priority_queue.hh +/*! \file mln/core/site_set/p_priority.hh * * \brief Definition of a point set class based on p_queue with * priority features. @@ -51,7 +51,7 @@ { // Fwd decls. - template <typename P, typename T> struct p_priority_queue; + template <typename P, typename T> struct p_priority; template <typename P> struct p_array_fwd_piter_; template <typename P> struct p_array_bkd_piter_; @@ -59,8 +59,8 @@ { template <typename P, typename T> - struct point_set_< p_priority_queue<P, T> > - : public default_point_set_< p_priority_queue<P, T> > + struct point_set_< p_priority<P, T> > + : public default_point_set_< p_priority<P, T> > { typedef trait::point_set::arity::unique arity; typedef trait::point_set::has_speed::slow has_speed; @@ -78,7 +78,7 @@ * a call to npoints() when this container is multiple. */ template <typename P, typename T> - class p_priority_queue : public internal::point_set_base_< P, p_priority_queue<P, T> > + class p_priority : public internal::point_set_base_< P, p_priority<P, T> > { public: @@ -89,7 +89,7 @@ typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. - p_priority_queue(); + p_priority(); /// Test is \p p belongs to this point set. bool has(const P& p) const; @@ -104,10 +104,10 @@ const box_<P>& bbox() const; /// Push force a point \p p in the queue. - p_priority_queue<P, T>& push_force(const P& p, T prio = 0); + p_priority<P, T>& push_force(const P& p, T prio = 0); /// Push a point \p p in the queue. - p_priority_queue<P, T>& push(const P& p, T prio = 0); + p_priority<P, T>& push(const P& p, T prio = 0); /// Pop (remove) the front point \p p from the queue; \p p is the /// least recently inserted point. @@ -151,7 +151,7 @@ template <typename P, typename T> inline - p_priority_queue<P, T>::p_priority_queue() + p_priority<P, T>::p_priority() { vect_needs_update_ = false; bb_needs_update_ = false; @@ -160,7 +160,7 @@ template <typename P, typename T> inline void - p_priority_queue<P, T>::vect_update_() const + p_priority<P, T>::vect_update_() const { vect_.clear(); vect_.reserve(npoints()); @@ -176,7 +176,7 @@ template <typename P, typename T> inline void - p_priority_queue<P, T>::bb_update_() const + p_priority<P, T>::bb_update_() const { bb_.init(); @@ -192,7 +192,7 @@ template <typename P, typename T> inline bool - p_priority_queue<P, T>::has(const P& p) const + p_priority<P, T>::has(const P& p) const { typename std::map<T, p_queue<P> >::const_iterator it = q_.begin (); @@ -205,7 +205,7 @@ template <typename P, typename T> inline bool - p_priority_queue<P, T>::is_empty() const + p_priority<P, T>::is_empty() const { typename std::map<T, p_queue<P> >::const_iterator it = q_.begin (); @@ -218,7 +218,7 @@ template <typename P, typename T> inline size_t - p_priority_queue<P, T>::npoints() const + p_priority<P, T>::npoints() const { unsigned res = 0; @@ -233,7 +233,7 @@ template <typename P, typename T> inline const box_<P>& - p_priority_queue<P, T>::bbox() const + p_priority<P, T>::bbox() const { mln_precondition(npoints() != 0); if (bb_needs_update_) @@ -243,8 +243,8 @@ template <typename P, typename T> inline - p_priority_queue<P, T>& - p_priority_queue<P, T>::push_force(const P& p, T prio) + p_priority<P, T>& + p_priority<P, T>::push_force(const P& p, T prio) { q_[prio].push_force (p); if (! vect_needs_update_) @@ -257,8 +257,8 @@ template <typename P, typename T> inline - p_priority_queue<P, T>& - p_priority_queue<P, T>::push(const P& p, T prio) + p_priority<P, T>& + p_priority<P, T>::push(const P& p, T prio) { if (! has(p)) return this->push_force(p, prio); @@ -269,7 +269,7 @@ template <typename P, typename T> inline void - p_priority_queue<P, T>::pop() + p_priority<P, T>::pop() { typename std::map<T, p_queue<P> >::reverse_iterator it = q_.rbegin (); @@ -287,7 +287,7 @@ template <typename P, typename T> inline const P& - p_priority_queue<P, T>::front() const + p_priority<P, T>::front() const { mln_precondition(! q_.empty()); @@ -302,7 +302,7 @@ template <typename P, typename T> inline const P& - p_priority_queue<P, T>::pop_front() + p_priority<P, T>::pop_front() { const P& res = this->front(); @@ -313,7 +313,7 @@ template <typename P, typename T> inline void - p_priority_queue<P, T>::clear() + p_priority<P, T>::clear() { typename std::map<T, p_queue<P> >::iterator it = q_.begin (); @@ -327,7 +327,7 @@ template <typename P, typename T> inline const std::vector<P>& - p_priority_queue<P, T>::vect() const + p_priority<P, T>::vect() const { if (vect_needs_update_) vect_update_(); @@ -337,7 +337,7 @@ template <typename P, typename T> inline const P& - p_priority_queue<P, T>::operator[](unsigned i) const + p_priority<P, T>::operator[](unsigned i) const { mln_precondition(i < npoints()); Index: sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (revision 2175) +++ sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH # define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH -/*! \file mln/core/p_priority_queue_fast_with_array.hh +/*! \file mln/core/p_priority_fast_with_array.hh * * \brief Definition of a point set class based on p_queue with * priority features. @@ -51,7 +51,7 @@ { // Fwd decls. - template <typename P, typename T, unsigned S> struct p_priority_queue_fast_with_array; + template <typename P, typename T, unsigned S> struct p_priority_fast_with_array; template <typename P> struct p_array_fwd_piter_; template <typename P> struct p_array_bkd_piter_; @@ -59,8 +59,8 @@ { template <typename P, typename T, unsigned S> - struct point_set_< p_priority_queue_fast_with_array<P, T, S> > - : public default_point_set_< p_priority_queue_fast_with_array<P, T, S> > + struct point_set_< p_priority_fast_with_array<P, T, S> > + : public default_point_set_< p_priority_fast_with_array<P, T, S> > { typedef trait::point_set::arity::multiple arity; typedef trait::point_set::has_speed::fast has_speed; @@ -78,7 +78,7 @@ * a call to npoints() when this container is multiple. */ template <typename P, typename T, unsigned S> - class p_priority_queue_fast_with_array : public internal::point_set_base_< P, p_priority_queue_fast_with_array<P, T, S> > + class p_priority_fast_with_array : public internal::point_set_base_< P, p_priority_fast_with_array<P, T, S> > { public: @@ -89,7 +89,7 @@ typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. - p_priority_queue_fast_with_array(); + p_priority_fast_with_array(); /// Test is \p p belongs to this point set. bool has(const P& p) const; @@ -104,10 +104,10 @@ const box_<P>& bbox() const; /// Push force a point \p p in the queue. - p_priority_queue_fast_with_array<P, T, S>& push_force(const P& p, T prio = 0); + p_priority_fast_with_array<P, T, S>& push_force(const P& p, T prio = 0); /// Push a point \p p in the queue. - p_priority_queue_fast_with_array<P, T, S>& push(const P& p, T prio = 0); + p_priority_fast_with_array<P, T, S>& push(const P& p, T prio = 0); /// Pop (remove) the front point \p p from the queue; \p p is the /// least recently inserted point. @@ -151,7 +151,7 @@ template <typename P, typename T, unsigned S> inline - p_priority_queue_fast_with_array<P, T, S>::p_priority_queue_fast_with_array() + p_priority_fast_with_array<P, T, S>::p_priority_fast_with_array() { vect_needs_update_ = false; bb_needs_update_ = false; @@ -165,7 +165,7 @@ template <typename P, typename T, unsigned S> inline void - p_priority_queue_fast_with_array<P, T, S>::vect_update_() const + p_priority_fast_with_array<P, T, S>::vect_update_() const { vect_.clear(); vect_.reserve(npoints()); @@ -179,7 +179,7 @@ template <typename P, typename T, unsigned S> inline void - p_priority_queue_fast_with_array<P, T, S>::bb_update_() const + p_priority_fast_with_array<P, T, S>::bb_update_() const { bb_.init(); @@ -193,7 +193,7 @@ template <typename P, typename T, unsigned S> inline bool - p_priority_queue_fast_with_array<P, T, S>::has(const P& p) const + p_priority_fast_with_array<P, T, S>::has(const P& p) const { for (unsigned i = 0; i < S; ++i) if (q_[i].has (p)) @@ -204,7 +204,7 @@ template <typename P, typename T, unsigned S> inline bool - p_priority_queue_fast_with_array<P, T, S>::is_empty() const + p_priority_fast_with_array<P, T, S>::is_empty() const { for (unsigned i = 0; i < S; ++i) if (!q_[i].is_empty ()) @@ -215,7 +215,7 @@ template <typename P, typename T, unsigned S> inline unsigned - p_priority_queue_fast_with_array<P, T, S>::npoints() const + p_priority_fast_with_array<P, T, S>::npoints() const { unsigned res = 0; @@ -229,7 +229,7 @@ template <typename P, typename T, unsigned S> inline const box_<P>& - p_priority_queue_fast_with_array<P, T, S>::bbox() const + p_priority_fast_with_array<P, T, S>::bbox() const { mln_precondition(npoints() != 0); if (bb_needs_update_) @@ -239,8 +239,8 @@ template <typename P, typename T, unsigned S> inline - p_priority_queue_fast_with_array<P, T, S>& - p_priority_queue_fast_with_array<P, T, S>::push_force(const P& p, T prio) + p_priority_fast_with_array<P, T, S>& + p_priority_fast_with_array<P, T, S>::push_force(const P& p, T prio) { q_[prio].push_force (p); if (! vect_needs_update_) @@ -254,8 +254,8 @@ template <typename P, typename T, unsigned S> inline - p_priority_queue_fast_with_array<P, T, S>& - p_priority_queue_fast_with_array<P, T, S>::push(const P& p, T prio) + p_priority_fast_with_array<P, T, S>& + p_priority_fast_with_array<P, T, S>::push(const P& p, T prio) { if (! has(p)) return this->push_force(p, prio); @@ -266,7 +266,7 @@ template <typename P, typename T, unsigned S> inline void - p_priority_queue_fast_with_array<P, T, S>::pop() + p_priority_fast_with_array<P, T, S>::pop() { for (unsigned i = S - 1; i != UINT_MAX; --i) if (!q_[i].is_empty ()) @@ -282,7 +282,7 @@ template <typename P, typename T, unsigned S> inline const P& - p_priority_queue_fast_with_array<P, T, S>::front() const + p_priority_fast_with_array<P, T, S>::front() const { mln_precondition(! is_empty()); @@ -295,7 +295,7 @@ template <typename P, typename T, unsigned S> inline const P& - p_priority_queue_fast_with_array<P, T, S>::pop_front() + p_priority_fast_with_array<P, T, S>::pop_front() { const P& res = this->front(); @@ -306,7 +306,7 @@ template <typename P, typename T, unsigned S> inline void - p_priority_queue_fast_with_array<P, T, S>::clear() + p_priority_fast_with_array<P, T, S>::clear() { for (unsigned i = 0; i < S; ++i) q_[i].clear (); @@ -318,7 +318,7 @@ template <typename P, typename T, unsigned S> inline const std::vector<P>& - p_priority_queue_fast_with_array<P, T, S>::vect() const + p_priority_fast_with_array<P, T, S>::vect() const { if (vect_needs_update_) vect_update_(); @@ -328,7 +328,7 @@ template <typename P, typename T, unsigned S> inline const P& - p_priority_queue_fast_with_array<P, T, S>::operator[](unsigned n) const + p_priority_fast_with_array<P, T, S>::operator[](unsigned n) const { mln_precondition(n < npoints()); unsigned i = S - 1; Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2175) +++ sandbox/garrigues/level_set.hh (working copy) @@ -46,8 +46,8 @@ # include <mln/core/image/inplace.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> -# include <mln/core/pset_if_piter.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/p_if_piter.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/image_if.hh> # include <mln/core/routine/clone.hh> Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2175) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -39,8 +39,8 @@ # include <mln/core/site_set/p_set.hh> # include <mln/core/image/inplace.hh> # include <mln/core/alias/neighb2d.hh> -# include <mln/core/pset_if_piter.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/p_if_piter.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/image_if.hh> # include <mln/core/routine/clone.hh>

15 years, 8 months

cleanup-2008 2175: Remove some obsolete files in mln/core/.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Remove some obsolete files in mln/core/. p_image2d is replaced by p_image. * mln/core/p_image2d_pixter.hh: Remove. * mln/core/p_image2d.hh: Remove. * mln/core/p_image2d_piter.hh: Remove. * mln/core/runs_psite.hh: Remove. pset_array is replaced by p_array_of<S>. * mln/core/pset_array.hh: Remove. * mln/core/pset_array_psite.hh: Remove. Priority queues are factored by p_priority<Q>. * mln/core/p_priority_queue_fast.hh: Remove. * mln/core/p_priority_queue_fast_with_array.hh: Remove. image_if is general. * mln/core/image_if_value.hh: Remove. * mln/core/image_if_interval.hh: Remove. p_indexed stuff is general. * mln/core/p_array_piter.hh: Remove. p_runs is replaced by p_set_of< p_run<P> >. * mln/core/p_runs.hh: Remove. Misc. * mln/core/p_array_bb.hh: Remove. We do not want such a slow class. * mln/core/obsolete_p_vaccess.hh: Remove cause p_vaccess is ok. Fix missing move. * mln/core/p_run_piter.hh: Rename as ... * mln/core/site_set/p_run_piter.hh: ...this. Update guards. * mln/core/site_set/p_run.hh, * sandbox/pellegrin/set/core/p_run.hh (include): Update. mln/core/site_set/p_run.hh | 2 +- mln/core/site_set/p_run_piter.hh | 2 +- sandbox/pellegrin/set/core/p_run.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: mln/core/site_set/p_run.hh --- mln/core/site_set/p_run.hh (revision 2174) +++ mln/core/site_set/p_run.hh (working copy) @@ -492,7 +492,7 @@ } // end of namespace mln -# include <mln/core/p_run_piter.hh> +# include <mln/core/site_set/p_run_piter.hh> #endif // ! MLN_CORE_SITE_SET_P_RUN_HH Index: mln/core/site_set/p_run_piter.hh --- mln/core/site_set/p_run_piter.hh (revision 2174) +++ mln/core/site_set/p_run_piter.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_P_RUN_PITER_HH # define MLN_CORE_SITE_SET_P_RUN_PITER_HH -/*! \file mln/core/p_run_piter.hh +/*! \file mln/core/site_set/p_run_piter.hh * * \brief Definition of point iterators on mln::p_run. */ Index: sandbox/pellegrin/set/core/p_run.hh --- sandbox/pellegrin/set/core/p_run.hh (revision 2174) +++ sandbox/pellegrin/set/core/p_run.hh (working copy) @@ -245,6 +245,6 @@ } // end of namespace mln -# include <mln/core/p_run_piter.hh> +# include <mln/core/site_set/p_run_piter.hh> #endif // ! MLN_CORE_SITE_SET_P_RUN_HH

15 years, 8 months

cleanup-2008 2174: Move routine files from mln/core/ to mln/core/routine/.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move routine files from mln/core/ to mln/core/routine/. * mln/core/initialize.hh, * mln/core/exact.hh, * mln/core/init.hh, * mln/core/ops.hh, * mln/core/clone.hh: Rename as... * mln/core/routine/initialize.hh, * mln/core/routine/ops.hh, * mln/core/routine/init.hh, * mln/core/routine/exact.hh, * mln/core/routine/clone.hh: ...these. Update guards and includes. * tests/core/clone.cc, * tests/core/image2d.cc, * tests/core/exact.cc, * tests/metal/unconst.cc, * tests/level/assign_full.cc, * tests/level/apply_full.cc, * tests/level/saturate_full.cc, * tests/arith/plus.cc, * tests/border/find_full.cc, * tests/border/find.cc, * mln/trait/solve_binary.hh, * mln/trait/solve_unary.hh, * mln/core/image/plain.hh, * mln/core/image/image2d.hh, * mln/core/image/inplace.hh, * mln/core/concept/object.hh, * mln/core/concept/image.hh, * mln/core/concept/site_set.hh, * mln/core/a_point_of.hh, * mln/draw/label.hh, * mln/border/resize.hh, * mln/geom/seeds2tiling_roundness.hh, * mln/geom/seeds2tiling.hh, * mln/geom/resize.hh, * mln/util/yes.hh, * mln/util/ordpair.hh, * sandbox/duhamel/slow_seed2tiling.cc, * sandbox/duhamel/labeling_algo.hh, * sandbox/pellegrin/set/core/concept/point_set.hh, * sandbox/aroumougame/skeleton/sedt.hh, * sandbox/geraud/fllt/fllt.hh, * sandbox/geraud/fllt/fllt.svg.1.cc, * sandbox/geraud/fllt/fllt.svg.7.hh, * sandbox/geraud/fllt/fllt.svg.2.cc, * sandbox/geraud/fllt/fllt.svg.3.cc, * sandbox/geraud/fllt/fllt.svg.4.cc, * sandbox/geraud/fllt/fllt.svg.5.cc, * sandbox/geraud/fllt/fllt.svg.6.cc, * sandbox/geraud/fllt/fllt_test.hh, * sandbox/geraud/fllt.svg.7.hh, * sandbox/geraud/fllt.svg.6.cc, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/test_fllt_lena_tiles.cc, * sandbox/garrigues/fllt/test_fllt10.cc, * sandbox/garrigues/fllt/test_fllt_tiny.cc, * sandbox/garrigues/fllt/test_fllt12.cc, * sandbox/garrigues/fllt/fllt_simple.svg.1.cc, * sandbox/garrigues/fllt/fllt_simple.svg.3.cc, * sandbox/garrigues/fllt/fllt_simple.cc, * sandbox/garrigues/fllt/test_fllt10_inv.cc, * sandbox/garrigues/fllt/fllt_theo.cc, * sandbox/garrigues/fllt/test_fllt3.cc, * sandbox/garrigues/fllt/test_fllt5.cc, * sandbox/garrigues/fllt/test_fllt7.cc, * sandbox/garrigues/fllt/test_fllt9.cc, * sandbox/garrigues/fllt/test_fllt3_inv.cc, * sandbox/garrigues/fllt/test_fllt_lena.cc, * sandbox/garrigues/fllt/test_fllt.cc, * sandbox/garrigues/fllt/test_flltb.cc, * sandbox/garrigues/fllt/test_fllt7_inv.cc, * sandbox/garrigues/fllt/test_fllt13.cc, * sandbox/garrigues/fllt/test_fllt15.cc, * sandbox/garrigues/fllt/fllt_simple.svg.2.cc, * sandbox/garrigues/fllt/fllt.hh, * sandbox/garrigues/fllt/test.cc, * sandbox/garrigues/fllt/test_fllt2.cc, * sandbox/garrigues/fllt/test_fllt4.cc, * sandbox/garrigues/fllt/test_fllt6.cc, * sandbox/garrigues/fllt/test_fllt8.cc, * sandbox/garrigues/tiled_image2d/tiled_image2d.hh, * sandbox/ballas/refactorization/exact.hh: Update. mln/border/resize.hh | 2 +- mln/core/a_point_of.hh | 2 +- mln/core/concept/image.hh | 2 +- mln/core/concept/object.hh | 4 ++-- mln/core/concept/site_set.hh | 2 +- mln/core/image/image2d.hh | 2 +- mln/core/image/inplace.hh | 2 +- mln/core/image/plain.hh | 2 +- mln/core/routine/clone.hh | 10 +++++----- mln/core/routine/exact.hh | 8 ++++---- mln/core/routine/init.hh | 8 ++++---- mln/core/routine/initialize.hh | 8 ++++---- mln/core/routine/ops.hh | 8 ++++---- mln/draw/label.hh | 2 +- mln/geom/resize.hh | 2 +- mln/geom/seeds2tiling.hh | 2 +- mln/geom/seeds2tiling_roundness.hh | 2 +- mln/trait/solve_binary.hh | 2 +- mln/trait/solve_unary.hh | 2 +- mln/util/ordpair.hh | 2 +- mln/util/yes.hh | 2 +- sandbox/aroumougame/skeleton/sedt.hh | 2 +- sandbox/ballas/refactorization/exact.hh | 8 ++++---- sandbox/duhamel/labeling_algo.hh | 2 +- sandbox/duhamel/slow_seed2tiling.cc | 2 +- sandbox/garrigues/fllt/fllt.hh | 2 +- sandbox/garrigues/fllt/fllt_simple.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 2 +- sandbox/garrigues/fllt/fllt_theo.cc | 2 +- sandbox/garrigues/fllt/test.cc | 2 +- sandbox/garrigues/fllt/test_fllt.cc | 2 +- sandbox/garrigues/fllt/test_fllt10.cc | 2 +- sandbox/garrigues/fllt/test_fllt10_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt12.cc | 2 +- sandbox/garrigues/fllt/test_fllt13.cc | 2 +- sandbox/garrigues/fllt/test_fllt15.cc | 2 +- sandbox/garrigues/fllt/test_fllt2.cc | 2 +- sandbox/garrigues/fllt/test_fllt3.cc | 2 +- sandbox/garrigues/fllt/test_fllt3_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt4.cc | 2 +- sandbox/garrigues/fllt/test_fllt5.cc | 2 +- sandbox/garrigues/fllt/test_fllt6.cc | 2 +- sandbox/garrigues/fllt/test_fllt7.cc | 2 +- sandbox/garrigues/fllt/test_fllt7_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt8.cc | 2 +- sandbox/garrigues/fllt/test_fllt9.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc | 2 +- sandbox/garrigues/fllt/test_fllt_tiny.cc | 2 +- sandbox/garrigues/fllt/test_flltb.cc | 2 +- sandbox/garrigues/level_set.hh | 2 +- sandbox/garrigues/tiled_image2d/tiled_image2d.hh | 2 +- sandbox/geraud/fllt.svg.6.cc | 2 +- sandbox/geraud/fllt.svg.7.hh | 2 +- sandbox/geraud/fllt/fllt.hh | 2 +- sandbox/geraud/fllt/fllt.svg.1.cc | 2 +- sandbox/geraud/fllt/fllt.svg.2.cc | 2 +- sandbox/geraud/fllt/fllt.svg.3.cc | 2 +- sandbox/geraud/fllt/fllt.svg.4.cc | 2 +- sandbox/geraud/fllt/fllt.svg.5.cc | 2 +- sandbox/geraud/fllt/fllt.svg.6.cc | 2 +- sandbox/geraud/fllt/fllt.svg.7.hh | 2 +- sandbox/geraud/fllt/fllt_test.hh | 2 +- sandbox/pellegrin/set/core/concept/point_set.hh | 2 +- tests/arith/plus.cc | 2 +- tests/border/find.cc | 2 +- tests/border/find_full.cc | 2 +- tests/core/clone.cc | 2 +- tests/core/exact.cc | 2 +- tests/core/image2d.cc | 2 +- tests/level/apply_full.cc | 2 +- tests/level/assign_full.cc | 2 +- tests/level/saturate_full.cc | 2 +- tests/metal/unconst.cc | 2 +- 76 files changed, 96 insertions(+), 96 deletions(-) Index: tests/core/clone.cc --- tests/core/clone.cc (revision 2173) +++ tests/core/clone.cc (working copy) @@ -36,7 +36,7 @@ #include <mln/debug/iota.hh> #include <mln/debug/println.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> Index: tests/core/image2d.cc --- tests/core/image2d.cc (revision 2173) +++ tests/core/image2d.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/image2d.hh> #include <mln/geom/size2d.hh> -#include <mln/core/init.hh> +#include <mln/core/routine/init.hh> #include <mln/border/resize.hh> Index: tests/core/exact.cc --- tests/core/exact.cc (revision 2173) +++ tests/core/exact.cc (working copy) @@ -31,7 +31,7 @@ */ #include <typeinfo> -#include <mln/core/exact.hh> +#include <mln/core/routine/exact.hh> struct test : mln::Object< test > Index: tests/metal/unconst.cc --- tests/metal/unconst.cc (revision 2173) +++ tests/metal/unconst.cc (working copy) @@ -34,7 +34,7 @@ #include <string> #include <mln/metal/unconst.hh> -#include <mln/core/exact.hh> +#include <mln/core/routine/exact.hh> Index: tests/level/assign_full.cc --- tests/level/assign_full.cc (revision 2173) +++ tests/level/assign_full.cc (working copy) @@ -47,7 +47,7 @@ #include <mln/fun/p2b/chess.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/level/assign.hh> #include <mln/level/compare.hh> #include <mln/debug/iota.hh> Index: tests/level/apply_full.cc --- tests/level/apply_full.cc (revision 2173) +++ tests/level/apply_full.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/value/int_s16.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/level/apply.hh> #include <mln/debug/iota.hh> Index: tests/level/saturate_full.cc --- tests/level/saturate_full.cc (revision 2173) +++ tests/level/saturate_full.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/int_s16.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/level/saturate.hh> #include <mln/debug/iota.hh> Index: tests/arith/plus.cc --- tests/arith/plus.cc (revision 2173) +++ tests/arith/plus.cc (working copy) @@ -62,7 +62,7 @@ // #include <mln/core/image/image2d.hh> -// #include <mln/core/clone.hh> +// #include <mln/core/routine/clone.hh> // #include <mln/value/int_u8.hh> // #include <mln/arith/plus.hh> Index: tests/border/find_full.cc --- tests/border/find_full.cc (revision 2173) +++ tests/border/find_full.cc (working copy) @@ -45,7 +45,7 @@ #include <mln/debug/iota.hh> #include <mln/border/find.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> struct f_box1d_t : mln::Function_p2b< f_box1d_t > Index: tests/border/find.cc --- tests/border/find.cc (revision 2173) +++ tests/border/find.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/debug/iota.hh> #include <mln/border/find.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> Index: mln/trait/solve_binary.hh --- mln/trait/solve_binary.hh (revision 2173) +++ mln/trait/solve_binary.hh (working copy) @@ -37,7 +37,7 @@ */ # include <mln/core/category.hh> -# include <mln/core/exact.hh> +# include <mln/core/routine/exact.hh> # include <mln/metal/equal.hh> # include <mln/metal/if.hh> # include <mln/metal/ret.hh> Index: mln/trait/solve_unary.hh --- mln/trait/solve_unary.hh (revision 2173) +++ mln/trait/solve_unary.hh (working copy) @@ -37,7 +37,7 @@ */ # include <mln/core/category.hh> -# include <mln/core/exact.hh> +# include <mln/core/routine/exact.hh> # include <mln/metal/equal.hh> # include <mln/metal/if.hh> # include <mln/metal/ret.hh> Index: mln/core/image/plain.hh --- mln/core/image/plain.hh (revision 2173) +++ mln/core/image/plain.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/internal/image_identity.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/metal/is_not_const.hh> Index: mln/core/image/image2d.hh --- mln/core/image/image2d.hh (revision 2173) +++ mln/core/image/image2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> # include <mln/core/alias/box2d.hh> -# include <mln/core/init.hh> +# include <mln/core/routine/init.hh> # include <mln/border/thickness.hh> # include <mln/value/set.hh> Index: mln/core/image/inplace.hh --- mln/core/image/inplace.hh (revision 2173) +++ mln/core/image/inplace.hh (working copy) @@ -34,7 +34,7 @@ * mutable. */ -# include <mln/core/exact.hh> +# include <mln/core/routine/exact.hh> namespace mln Index: mln/core/routine/initialize.hh --- mln/core/routine/initialize.hh (revision 2173) +++ mln/core/routine/initialize.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INITIALIZE_HH -# define MLN_CORE_INITIALIZE_HH +#ifndef MLN_CORE_ROUTINE_INITIALIZE_HH +# define MLN_CORE_ROUTINE_INITIALIZE_HH -/*! \file mln/core/initialize.hh +/*! \file mln/core/routine/initialize.hh * * \brief Definition of function that initialize an image from another * one. @@ -71,4 +71,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INITIALIZE_HH +#endif // ! MLN_CORE_ROUTINE_INITIALIZE_HH Index: mln/core/routine/ops.hh --- mln/core/routine/ops.hh (revision 2173) +++ mln/core/routine/ops.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_OPS_HH -# define MLN_CORE_OPS_HH +#ifndef MLN_CORE_ROUTINE_OPS_HH +# define MLN_CORE_ROUTINE_OPS_HH -/*! \file mln/core/ops.hh +/*! \file mln/core/routine/ops.hh * * \brief Definitions of some default implementations for operators. * @@ -554,4 +554,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_OPS_HH +#endif // ! MLN_CORE_ROUTINE_OPS_HH Index: mln/core/routine/init.hh --- mln/core/routine/init.hh (revision 2173) +++ mln/core/routine/init.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INIT_HH -# define MLN_CORE_INIT_HH +#ifndef MLN_CORE_ROUTINE_INIT_HH +# define MLN_CORE_ROUTINE_INIT_HH -/*! \file mln/core/init.hh +/*! \file mln/core/routine/init.hh * * \brief Definition of function that initialize an image from another * one. @@ -104,4 +104,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INIT_HH +#endif // ! MLN_CORE_ROUTINE_INIT_HH Index: mln/core/routine/exact.hh --- mln/core/routine/exact.hh (revision 2173) +++ mln/core/routine/exact.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_EXACT_HH -# define MLN_CORE_EXACT_HH +#ifndef MLN_CORE_ROUTINE_EXACT_HH +# define MLN_CORE_ROUTINE_EXACT_HH -/*! \file mln/core/exact.hh +/*! \file mln/core/routine/exact.hh * \brief Definition of the mln::exact downcast routines. */ @@ -88,4 +88,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_EXACT_HH +#endif // ! MLN_CORE_ROUTINE_EXACT_HH Index: mln/core/routine/clone.hh --- mln/core/routine/clone.hh (revision 2173) +++ mln/core/routine/clone.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_CLONE_HH -# define MLN_CORE_CLONE_HH +#ifndef MLN_CORE_ROUTINE_CLONE_HH +# define MLN_CORE_ROUTINE_CLONE_HH -/*! \file mln/core/clone.hh +/*! \file mln/core/routine/clone.hh * * \brief Clone an image, that is, get an effective copy. */ # include <mln/core/concept/image.hh> -# include <mln/core/init.hh> +# include <mln/core/routine/init.hh> # include <mln/level/fill.hh> @@ -75,4 +75,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_CLONE_HH +#endif // ! MLN_CORE_ROUTINE_CLONE_HH Index: mln/core/concept/object.hh --- mln/core/concept/object.hh (revision 2173) +++ mln/core/concept/object.hh (working copy) @@ -187,8 +187,8 @@ } // end of namespace mln -# include <mln/core/exact.hh> -# include <mln/core/ops.hh> +# include <mln/core/routine/exact.hh> +# include <mln/core/routine/ops.hh> #endif // ! MLN_CORE_CONCEPT_OBJECT_HH Index: mln/core/concept/image.hh --- mln/core/concept/image.hh (revision 2173) +++ mln/core/concept/image.hh (working copy) @@ -159,6 +159,6 @@ } // end of namespace mln -# include <mln/core/initialize.hh> +# include <mln/core/routine/initialize.hh> #endif // ! MLN_CORE_CONCEPT_IMAGE_HH Index: mln/core/concept/site_set.hh --- mln/core/concept/site_set.hh (revision 2173) +++ mln/core/concept/site_set.hh (working copy) @@ -385,7 +385,7 @@ } // end of namespace mln -# include <mln/core/ops.hh> +# include <mln/core/routine/ops.hh> #endif // ! MLN_CORE_CONCEPT_SITE_SET_HH Index: mln/core/a_point_of.hh --- mln/core/a_point_of.hh (revision 2173) +++ mln/core/a_point_of.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/exact.hh> +# include <mln/core/routine/exact.hh> namespace mln { Index: mln/draw/label.hh --- mln/draw/label.hh (revision 2173) +++ mln/draw/label.hh (working copy) @@ -33,7 +33,7 @@ * \brief Draw a random color image from a label image. */ -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/core/concept/image.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/border/resize.hh --- mln/border/resize.hh (revision 2173) +++ mln/border/resize.hh (working copy) @@ -37,7 +37,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/border/get.hh> // # include <mln/level/fill.hh> // # include <mln/level/paste.hh> Index: mln/geom/seeds2tiling_roundness.hh --- mln/geom/seeds2tiling_roundness.hh (revision 2173) +++ mln/geom/seeds2tiling_roundness.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/core/p_priority_queue_fast.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> # include <mln/algebra/vec.hh> Index: mln/geom/seeds2tiling.hh --- mln/geom/seeds2tiling.hh (revision 2173) +++ mln/geom/seeds2tiling.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/p_queue.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> # include <mln/algebra/vec.hh> Index: mln/geom/resize.hh --- mln/geom/resize.hh (revision 2173) +++ mln/geom/resize.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/make/w_window1d.hh> # include <mln/accu/mean.hh> # include <mln/border/resize.hh> Index: mln/util/yes.hh --- mln/util/yes.hh (revision 2173) +++ mln/util/yes.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/object.hh> -# include <mln/core/ops.hh> +# include <mln/core/routine/ops.hh> namespace mln Index: mln/util/ordpair.hh --- mln/util/ordpair.hh (revision 2173) +++ mln/util/ordpair.hh (working copy) @@ -145,4 +145,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_EXACT_HH +#endif // ! MLN_CORE_ROUTINE_EXACT_HH Index: sandbox/duhamel/slow_seed2tiling.cc --- sandbox/duhamel/slow_seed2tiling.cc (revision 2173) +++ sandbox/duhamel/slow_seed2tiling.cc (working copy) @@ -57,7 +57,7 @@ # include <mln/core/queue_p.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> # include <mln/algebra/vec.hh> Index: sandbox/duhamel/labeling_algo.hh --- sandbox/duhamel/labeling_algo.hh (revision 2173) +++ sandbox/duhamel/labeling_algo.hh (working copy) @@ -1,6 +1,6 @@ # include <mln/core/queue_p.hh> # include "queue_p_fast.hh" -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/debug/println.hh> Index: sandbox/pellegrin/set/core/concept/point_set.hh --- sandbox/pellegrin/set/core/concept/point_set.hh (revision 2173) +++ sandbox/pellegrin/set/core/concept/point_set.hh (working copy) @@ -241,6 +241,6 @@ } // end of namespace mln -# include <mln/core/ops.hh> +# include <mln/core/routine/ops.hh> #endif // ! MLN_CORE_CONCEPT_POINT_SET_HH Index: sandbox/aroumougame/skeleton/sedt.hh --- sandbox/aroumougame/skeleton/sedt.hh (revision 2173) +++ sandbox/aroumougame/skeleton/sedt.hh (working copy) @@ -1,6 +1,6 @@ #include <string> #include <mln/core/image/image2d.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/math/max.hh> #include <mln/math/min.hh> #include <mln/math/sqr.hh> Index: sandbox/geraud/fllt/fllt.hh --- sandbox/geraud/fllt/fllt.hh (revision 2173) +++ sandbox/geraud/fllt/fllt.hh (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/geraud/fllt/fllt.svg.1.cc --- sandbox/geraud/fllt/fllt.svg.1.cc (revision 2173) +++ sandbox/geraud/fllt/fllt.svg.1.cc (working copy) @@ -28,7 +28,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.7.hh --- sandbox/geraud/fllt/fllt.svg.7.hh (revision 2173) +++ sandbox/geraud/fllt/fllt.svg.7.hh (working copy) @@ -34,7 +34,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 2173) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -28,7 +28,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 2173) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -28,7 +28,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 2173) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -28,7 +28,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 2173) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -28,7 +28,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.6.cc --- sandbox/geraud/fllt/fllt.svg.6.cc (revision 2173) +++ sandbox/geraud/fllt/fllt.svg.6.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/geraud/fllt/fllt_test.hh --- sandbox/geraud/fllt/fllt_test.hh (revision 2173) +++ sandbox/geraud/fllt/fllt_test.hh (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/geraud/fllt.svg.7.hh --- sandbox/geraud/fllt.svg.7.hh (revision 2173) +++ sandbox/geraud/fllt.svg.7.hh (working copy) @@ -34,7 +34,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 2173) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2173) +++ sandbox/garrigues/level_set.hh (working copy) @@ -50,7 +50,7 @@ # include <mln/core/site_set/pset_if.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/image_if.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/core/a_point_of.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt_lena_tiles.cc --- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt_optimized.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt10.cc --- sandbox/garrigues/fllt/test_fllt10.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt10.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt_tiny.cc --- sandbox/garrigues/fllt/test_fllt_tiny.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt_tiny.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt12.cc --- sandbox/garrigues/fllt/test_fllt12.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt12.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.1.cc --- sandbox/garrigues/fllt/fllt_simple.svg.1.cc (revision 2173) +++ sandbox/garrigues/fllt/fllt_simple.svg.1.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.3.cc --- sandbox/garrigues/fllt/fllt_simple.svg.3.cc (revision 2173) +++ sandbox/garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2173) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/core/image/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/garrigues/fllt/test_fllt10_inv.cc --- sandbox/garrigues/fllt/test_fllt10_inv.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt10_inv.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/fllt_theo.cc --- sandbox/garrigues/fllt/fllt_theo.cc (revision 2173) +++ sandbox/garrigues/fllt/fllt_theo.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/test_fllt3.cc --- sandbox/garrigues/fllt/test_fllt3.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt3.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt5.cc --- sandbox/garrigues/fllt/test_fllt5.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt5.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt7.cc --- sandbox/garrigues/fllt/test_fllt7.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt7.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt9.cc --- sandbox/garrigues/fllt/test_fllt9.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt9.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt3_inv.cc --- sandbox/garrigues/fllt/test_fllt3_inv.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt3_inv.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt_lena.cc --- sandbox/garrigues/fllt/test_fllt_lena.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt_lena.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt.cc --- sandbox/garrigues/fllt/test_fllt.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_flltb.cc --- sandbox/garrigues/fllt/test_flltb.cc (revision 2173) +++ sandbox/garrigues/fllt/test_flltb.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt7_inv.cc --- sandbox/garrigues/fllt/test_fllt7_inv.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt7_inv.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt13.cc --- sandbox/garrigues/fllt/test_fllt13.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt13.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt15.cc --- sandbox/garrigues/fllt/test_fllt15.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt15.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.2.cc --- sandbox/garrigues/fllt/fllt_simple.svg.2.cc (revision 2173) +++ sandbox/garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/core/clone.hh> +#include <mln/core/routine/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2173) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -43,7 +43,7 @@ # include <mln/core/site_set/pset_if.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/image_if.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/core/a_point_of.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test.cc --- sandbox/garrigues/fllt/test.cc (revision 2173) +++ sandbox/garrigues/fllt/test.cc (working copy) @@ -5,7 +5,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/cast_image.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt2.cc --- sandbox/garrigues/fllt/test_fllt2.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt2.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt4.cc --- sandbox/garrigues/fllt/test_fllt4.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt4.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt6.cc --- sandbox/garrigues/fllt/test_fllt6.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt6.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/fllt/test_fllt8.cc --- sandbox/garrigues/fllt/test_fllt8.cc (revision 2173) +++ sandbox/garrigues/fllt/test_fllt8.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/clone.hh> +# include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: sandbox/garrigues/tiled_image2d/tiled_image2d.hh --- sandbox/garrigues/tiled_image2d/tiled_image2d.hh (revision 2173) +++ sandbox/garrigues/tiled_image2d/tiled_image2d.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/internal/fixme.hh> # include <mln/core/alias/box2d.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/init.hh> +# include <mln/core/routine/init.hh> # include <mln/core/line_piter.hh> # include <mln/geom/size2d.hh> Index: sandbox/ballas/refactorization/exact.hh --- sandbox/ballas/refactorization/exact.hh (revision 2173) +++ sandbox/ballas/refactorization/exact.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_EXACT_HH -# define MLN_CORE_EXACT_HH +#ifndef MLN_CORE_ROUTINE_EXACT_HH +# define MLN_CORE_ROUTINE_EXACT_HH -/*! \file mln/core/exact.hh +/*! \file mln/core/routine/exact.hh * \brief Definition of the mln::exact downcast routines. */ @@ -92,4 +92,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_EXACT_HH +#endif // ! MLN_CORE_ROUTINE_EXACT_HH

15 years, 8 months

cleanup-2008 2173: Move alias files from mln/core/ to mln/core/alias/.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move alias files from mln/core/ to mln/core/alias/. * mln/core/neighb1d.hh, * mln/core/dpoint1d.hh, * mln/core/neighb2d.hh, * mln/core/neighb3d.hh, * mln/core/dpoint2d.hh, * mln/core/dpoint3d.hh, * mln/core/point1d.hh, * mln/core/point2d.hh, * mln/core/point3d.hh, * mln/core/w_window1d_int.hh, * mln/core/window1d.hh, * mln/core/w_window2d_int.hh, * mln/core/window2d.hh, * mln/core/w_window3d_int.hh, * mln/core/window3d.hh, * mln/core/w_window2d_float.hh, * mln/core/dpoint2d_h.hh, * mln/core/box1d.hh, * mln/core/box2d.hh, * mln/core/box3d.hh, * mln/core/box2d_h.hh, * mln/core/point2d_h.hh, * mln/core/w_window1d_float.hh, * mln/core/w_window3d_float.hh: Rename as... * mln/core/alias/neighb1d.hh, * mln/core/alias/neighb2d.hh, * mln/core/alias/dpoint1d.hh, * mln/core/alias/neighb3d.hh, * mln/core/alias/dpoint2d.hh, * mln/core/alias/dpoint3d.hh, * mln/core/alias/box2d_h.hh, * mln/core/alias/point2d_h.hh, * mln/core/alias/dpoint2d_h.hh, * mln/core/alias/w_window1d_int.hh, * mln/core/alias/window1d.hh, * mln/core/alias/w_window2d_int.hh, * mln/core/alias/window2d.hh, * mln/core/alias/window3d.hh, * mln/core/alias/w_window3d_int.hh, * mln/core/alias/w_window1d_float.hh, * mln/core/alias/w_window2d_float.hh, * mln/core/alias/w_window3d_float.hh, * mln/core/alias/box1d.hh, * mln/core/alias/point1d.hh, * mln/core/alias/box2d.hh, * mln/core/alias/box3d.hh, * mln/core/alias/point2d.hh, * mln/core/alias/point3d.hh: ...these. Update guards and includes. * tools/seed2tiling.cc, * tools/area_flooding.cc, * tests/core/w_window1d_int.cc, * tests/core/graph_elt_neighborhood.cc, * tests/core/neighb.cc, * tests/core/window1d.cc, * tests/core/window2d.cc, * tests/core/w_window2d_int.cc, * tests/core/w_window3d_int.cc, * tests/core/window3d.cc, * tests/core/graph_image_wst.cc, * tests/core/p_priority_queue.cc, * tests/core/complex_image.cc, * tests/core/p_priority_queue_fast_with_array.cc, * tests/core/p_set.cc, * tests/core/mono_rle_image.cc, * tests/core/point_set_compatibility.cc, * tests/core/obased_rle_image.cc, * tests/core/graph_image.cc, * tests/core/box1d.cc, * tests/core/box2d.cc, * tests/core/box3d.cc, * tests/core/p_queue_fast.cc, * tests/core/p_bgraph.cc, * tests/core/mono_obased_rle_image.cc, * tests/core/graph_elt_window.cc, * tests/core/p_array.cc, * tests/core/sparse_image.cc, * tests/core/dpoint1d.cc, * tests/core/dpoint2d.cc, * tests/core/dpoint3d.cc, * tests/core/clock_test.cc, * tests/core/line_graph_elt_window.cc, * tests/core/value_enc_image.cc, * tests/core/line_graph_elt_neighborhood.cc, * tests/core/p_queue.cc, * tests/core/line_graph_image.cc, * tests/core/point1d.cc, * tests/core/point2d.cc, * tests/core/point3d.cc, * tests/core/p_priority_queue_fast.cc, * tests/core/rle_image.cc, * tests/core/h_vec.cc, * tests/neighb/image.cc, * tests/draw/label.cc, * tests/draw/graph.cc, * tests/linear/convolve.cc, * tests/linear/line_convolve.cc, * tests/linear/local/convolve.cc, * tests/accu/all_accus.cc, * tests/accu/bbox.cc, * tests/convert/to_p_set.cc, * tests/convert/to_p_array.cc, * tests/convert/to_image.cc, * tests/convert/to_window.cc, * tests/pw/image.cc, * tests/geom/sym.cc, * tests/geom/seed2tiling_roundness.cc, * tests/geom/seed2tiling.cc, * tests/geom/shift.cc, * tests/geom/pmin_pmax.cc, * tests/geom/bbox.cc, * tests/set/uni.cc, * tests/set/sym_diff.cc, * tests/set/inter.cc, * tests/set/is_subset_of.cc, * tests/set/diff.cc, * tests/morpho/meyer_wst_long.cc, * tests/morpho/artificial_line_graph_image_wst.cc, * tests/morpho/rank_filter.cc, * tests/morpho/dilation.cc, * tests/morpho/line_graph_image_wst.cc, * tests/morpho/meyer_wst.cc, * tests/morpho/thinning.cc, * tests/morpho/erosion.cc, * tests/morpho/dilation_max_h.cc, * tests/morpho/hit_or_miss.cc, * tests/morpho/combined.cc, * tests/morpho/gradient_elementary.cc, * tests/morpho/closing_volume.cc, * tests/morpho/closing_area.cc, * tests/morpho/closing_height.cc, * tests/morpho/opening_volume.cc, * tests/morpho/opening_area.cc, * tests/morpho/lena_line_graph_image_wst1.cc, * tests/morpho/opening_height.cc, * tests/morpho/erosion_min_h.cc, * tests/morpho/lena_line_graph_image_wst2.cc, * tests/display/show.cc, * tests/display/save_and_show.cc, * tests/canvas/chamfer.cc, * tests/util/ordpair.cc, * tests/labeling/regional_maxima.cc, * tests/labeling/background.cc, * tests/labeling/blobs.cc, * tests/labeling/flat_zones.cc, * tests/labeling/level.cc, * tests/labeling/foreground.cc, * tests/labeling/regional_minima.cc, * apps/statues/mesh-segm.cc, * apps/statues/mesh-skel.cc, * doc/tutorial/examples/sub_image.cc, * doc/tutorial/examples/image_if.cc, * doc/tutorial/examples/p_vaccess.cc, * doc/tutorial/examples/window.cc, * doc/tutorial/examples/image2d.cc, * doc/examples/labeling_algo.cc, * mln/debug/println_with_border.hh, * mln/core/p_image2d_pixter.hh, * mln/core/image/translate_image.hh, * mln/core/image/hexa.hh, * mln/core/image/hexa_piter.hh, * mln/core/image/image1d.hh, * mln/core/image/fi_adaptor.hh, * mln/core/image/image2d.hh, * mln/core/image/image3d.hh, * mln/core/p_image2d.hh, * mln/core/clock_neighb2d.hh, * mln/core/lazy_image.hh, * mln/core/site_set/line2d.hh, * mln/core/pixter1d.hh, * mln/core/pixter2d.hh, * mln/core/pixter3d.hh, * mln/core/alias/p_run2d.hh, * mln/draw/box.hh, * mln/level/was.median.hh, * mln/level/median.hh, * mln/level/naive/median.hh, * mln/level/fast_median.hh, * mln/linear/gaussian.hh, * mln/make/dpoint1d.hh, * mln/make/dpoint2d.hh, * mln/make/dpoint3d.hh, * mln/make/dpoint2d_h.hh, * mln/make/box1d.hh, * mln/make/box2d.hh, * mln/make/point1d.hh, * mln/make/point2d.hh, * mln/make/box3d.hh, * mln/make/point3d.hh, * mln/make/win_chamfer.hh, * mln/make/w_window1d.hh, * mln/make/w_window2d.hh, * mln/make/w_window3d.hh, * mln/make/box2d_h.hh, * mln/make/point2d_h.hh, * mln/make/window1d.hh, * mln/make/w_window1d_int.hh, * mln/make/w_window2d_int.hh, * mln/make/window2d.hh, * mln/make/window3d.hh, * mln/make/w_window3d_int.hh, * mln/geom/chamfer.hh, * mln/fun/p2b/chess.hh, * mln/win/cube3d.hh, * mln/win/diag2d.hh, * mln/win/backdiag2d.hh, * mln/win/cuboid3d.hh, * mln/win/octagon2d.hh, * mln/win/disk2d.hh, * mln/morpho/erosion_fast.hh, * mln/morpho/line_gradient.hh, * mln/morpho/dilation_fast.hh, * mln/io/pfm/save.hh, * mln/io/pnm/save.hh, * sandbox/duhamel/main_mesh_image.cc, * sandbox/duhamel/graph_labeling.hh, * sandbox/duhamel/translate_image.hh, * sandbox/duhamel/labeling_level_generic_10000x1000.cc, * sandbox/duhamel/slow_seed2tiling.cc, * sandbox/duhamel/labeling_algo.cc, * sandbox/duhamel/main.cc, * sandbox/duhamel/color_sub.cc, * sandbox/duhamel/labeling_level_fast_10000x1000.cc, * sandbox/duhamel/chamfer.cc, * sandbox/duhamel/labeling_level_fast.cc, * sandbox/duhamel/labeling_algo.hh, * sandbox/duhamel/mesh_image.hh, * sandbox/duhamel/chamfer.hh, * sandbox/duhamel/draw_mesh.hh, * sandbox/duhamel/labeling_level.hh, * sandbox/pellegrin/set/test/p_queue_fast.cc, * sandbox/pellegrin/set/test/p_priority_queue_fast.cc, * sandbox/pellegrin/set/test/p_bgraph.cc, * sandbox/pellegrin/set/test/p_queue.cc, * sandbox/pellegrin/set/test/p_priority_queue.cc, * sandbox/pellegrin/set/test/p_set.cc, * sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc, * sandbox/pellegrin/set/core/line2d.hh, * sandbox/aroumougame/skeleton/mesh-skel_region.cc, * sandbox/aroumougame/skeleton/test.cc, * sandbox/aroumougame/skeleton/neighborhood1.hh, * sandbox/aroumougame/skeleton/mesh-skel.cc, * sandbox/aroumougame/skeleton/test_image3d.cc, * sandbox/nivault/plugin-gimp/src/gimp-image.hh, * sandbox/nivault/plugin-gimp/src/build-image.hh, * sandbox/nivault/extract_score.cc, * sandbox/nivault/extract_character.cc, * sandbox/nivault/median.hh, * sandbox/geraud/fllt/fllt.hh, * sandbox/geraud/fllt/fllt.svg.1.cc, * sandbox/geraud/fllt/fllt.svg.7.hh, * sandbox/geraud/fllt/fllt.svg.2.cc, * sandbox/geraud/fllt/fllt.svg.3.cc, * sandbox/geraud/fllt/fllt.svg.4.cc, * sandbox/geraud/fllt/fllt.svg.5.cc, * sandbox/geraud/fllt/fllt.svg.6.cc, * sandbox/geraud/fllt/fllt_test.hh, * sandbox/geraud/fllt.svg.7.hh, * sandbox/geraud/dmap.cc, * sandbox/geraud/fllt.svg.6.cc, * sandbox/geraud/win_fun.cc, * sandbox/geraud/irm.cc, * sandbox/geraud/cs2d/tuto.cc, * sandbox/geraud/cs2d/kruskal.cc, * sandbox/geraud/cs2d/dbl_neighb.cc, * sandbox/geraud/cs2d/cs2d.hh, * sandbox/geraud/cs2d/tuto_bis.cc, * sandbox/geraud/max_tree_nnodes.cc, * sandbox/vigouroux/convert/value_to_point.hh, * sandbox/vigouroux/yuv/get_blue.hh, * sandbox/vigouroux/yuv/get_red.hh, * sandbox/vigouroux/yuv/rgb_to_yuv.hh, * sandbox/vigouroux/yuv/get_green.hh, * sandbox/vigouroux/hsi/get_blue.hh, * sandbox/vigouroux/hsi/get_red.hh, * sandbox/vigouroux/hsi/rgb_to_hsi.hh, * sandbox/vigouroux/hsi/get_green.hh, * sandbox/vigouroux/function.hh, * sandbox/vigouroux/tests.cc, * sandbox/vigouroux/cmy/rgb_to_cmy.hh, * sandbox/vigouroux/cmy/get_blue.hh, * sandbox/vigouroux/cmy/fun.hh, * sandbox/vigouroux/cmy/get_green.hh, * sandbox/vigouroux/xyz/rgb_to_xyz.hh, * sandbox/vigouroux/xyz/get_blue.hh, * sandbox/vigouroux/xyz/get_red.hh, * sandbox/vigouroux/xyz/get_green.hh, * sandbox/vigouroux/yiq/get_blue.hh, * sandbox/vigouroux/yiq/get_red.hh, * sandbox/vigouroux/yiq/rgb_to_yiq.hh, * sandbox/vigouroux/yiq/get_green.hh, * sandbox/vigouroux/load.cc, * sandbox/vigouroux/conv/getred.hh, * sandbox/vigouroux/conv/tored.hh, * sandbox/vigouroux/conv/torgb.hh, * sandbox/vigouroux/conv/rgbto.hh, * sandbox/vigouroux/color/rgb_to_hsl.hh, * sandbox/vigouroux/color/rgb_to_cmy.hh, * sandbox/vigouroux/color/rgb_to_xyz.hh, * sandbox/vigouroux/color/tests.cc, * sandbox/vigouroux/color/rgb_to_hsv.hh, * sandbox/vigouroux/color/rgb_to_yiq.hh, * sandbox/vigouroux/color/rgb_to_hsi.hh, * sandbox/vigouroux/color/rgb_to_yuv.hh, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/test_fllt_lena_tiles.cc, * sandbox/garrigues/fllt/test_fllt10.cc, * sandbox/garrigues/fllt/lower.hh, * sandbox/garrigues/fllt/test_fllt12.cc, * sandbox/garrigues/fllt/upper.hh, * sandbox/garrigues/fllt/fllt_simple.svg.1.cc, * sandbox/garrigues/fllt/fllt_simple.svg.3.cc, * sandbox/garrigues/fllt/fllt_simple.cc, * sandbox/garrigues/fllt/test_fllt10_inv.cc, * sandbox/garrigues/fllt/fllt_theo.cc, * sandbox/garrigues/fllt/test_fllt3.cc, * sandbox/garrigues/fllt/test_fllt5.cc, * sandbox/garrigues/fllt/test_fllt7.cc, * sandbox/garrigues/fllt/test_fllt9.cc, * sandbox/garrigues/fllt/test_fllt3_inv.cc, * sandbox/garrigues/fllt/test_fllt_lena.cc, * sandbox/garrigues/fllt/test_fllt.cc, * sandbox/garrigues/fllt/test_flltb.cc, * sandbox/garrigues/fllt/test_fllt7_inv.cc, * sandbox/garrigues/fllt/test_fllt13.cc, * sandbox/garrigues/fllt/test_fllt15.cc, * sandbox/garrigues/fllt/fllt_simple.svg.2.cc, * sandbox/garrigues/fllt/fllt.hh, * sandbox/garrigues/fllt/test.cc, * sandbox/garrigues/fllt/give_confs.cc, * sandbox/garrigues/fllt/test_fllt2.cc, * sandbox/garrigues/fllt/test_fllt4.cc, * sandbox/garrigues/fllt/test_fllt6.cc, * sandbox/garrigues/fllt/test_fllt8.cc, * sandbox/garrigues/lower.hh, * sandbox/garrigues/tiled_image2d/tiled_image2d.hh, * sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh, * sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh, * sandbox/garrigues/upper.hh, * sandbox/garrigues/factures/extract_array_highlight.cc, * sandbox/garrigues/factures/extract_array.cc, * sandbox/folio/test/psn.cc, * sandbox/folio/test/psn_log.cc, * sandbox/folio/test/dt_maze.cc, * sandbox/folio/test/dt_bench.cc, * sandbox/folio/test/dt.cc, * sandbox/folio/psn.cc, * sandbox/folio/psn_log.cc, * sandbox/folio/dt.cc, * sandbox/beguin/irm_g.cc, * sandbox/beguin/fusion_graph.hh, * sandbox/beguin/irm.cc, * sandbox/abraham/tests/morpho/test_component_tree.cc, * sandbox/abraham/tests/morpho/test_watershed.cc, * sandbox/abraham/tests/morpho/test_watershed_topo.cc, * sandbox/abraham/mln/io/tikz/save.hh: Update. apps/statues/mesh-segm.cc | 2 +- apps/statues/mesh-skel.cc | 2 +- doc/examples/labeling_algo.cc | 2 +- doc/tutorial/examples/image2d.cc | 4 ++-- doc/tutorial/examples/image_if.cc | 2 +- doc/tutorial/examples/p_vaccess.cc | 2 +- doc/tutorial/examples/sub_image.cc | 2 +- doc/tutorial/examples/window.cc | 4 ++-- mln/core/alias/box1d.hh | 4 ++-- mln/core/alias/box2d.hh | 4 ++-- mln/core/alias/box2d_h.hh | 6 +++--- mln/core/alias/box3d.hh | 4 ++-- mln/core/alias/dpoint1d.hh | 10 +++++----- mln/core/alias/dpoint2d.hh | 10 +++++----- mln/core/alias/dpoint2d_h.hh | 10 +++++----- mln/core/alias/dpoint3d.hh | 10 +++++----- mln/core/alias/neighb1d.hh | 10 +++++----- mln/core/alias/neighb2d.hh | 10 +++++----- mln/core/alias/neighb3d.hh | 10 +++++----- mln/core/alias/p_run2d.hh | 2 +- mln/core/alias/point1d.hh | 10 +++++----- mln/core/alias/point2d.hh | 10 +++++----- mln/core/alias/point2d_h.hh | 10 +++++----- mln/core/alias/point3d.hh | 10 +++++----- mln/core/alias/w_window1d_float.hh | 10 +++++----- mln/core/alias/w_window1d_int.hh | 10 +++++----- mln/core/alias/w_window2d_float.hh | 10 +++++----- mln/core/alias/w_window2d_int.hh | 10 +++++----- mln/core/alias/w_window3d_float.hh | 10 +++++----- mln/core/alias/w_window3d_int.hh | 10 +++++----- mln/core/alias/window1d.hh | 10 +++++----- mln/core/alias/window2d.hh | 10 +++++----- mln/core/alias/window3d.hh | 10 +++++----- mln/core/clock_neighb2d.hh | 2 +- mln/core/image/fi_adaptor.hh | 2 +- mln/core/image/hexa.hh | 4 ++-- mln/core/image/hexa_piter.hh | 4 ++-- mln/core/image/image1d.hh | 2 +- mln/core/image/image2d.hh | 2 +- mln/core/image/image3d.hh | 2 +- mln/core/image/translate_image.hh | 2 +- mln/core/lazy_image.hh | 2 +- mln/core/p_image2d.hh | 2 +- mln/core/p_image2d_pixter.hh | 2 +- mln/core/pixter1d.hh | 2 +- mln/core/pixter2d.hh | 2 +- mln/core/pixter3d.hh | 2 +- mln/core/site_set/line2d.hh | 2 +- mln/debug/println_with_border.hh | 4 ++-- mln/draw/box.hh | 2 +- mln/fun/p2b/chess.hh | 2 +- mln/geom/chamfer.hh | 4 ++-- mln/io/pfm/save.hh | 2 +- mln/io/pnm/save.hh | 2 +- mln/level/fast_median.hh | 2 +- mln/level/median.hh | 2 +- mln/level/naive/median.hh | 2 +- mln/level/was.median.hh | 2 +- mln/linear/gaussian.hh | 2 +- mln/make/box1d.hh | 2 +- mln/make/box2d.hh | 2 +- mln/make/box2d_h.hh | 2 +- mln/make/box3d.hh | 2 +- mln/make/dpoint1d.hh | 2 +- mln/make/dpoint2d.hh | 2 +- mln/make/dpoint2d_h.hh | 2 +- mln/make/dpoint3d.hh | 2 +- mln/make/point1d.hh | 2 +- mln/make/point2d.hh | 2 +- mln/make/point2d_h.hh | 2 +- mln/make/point3d.hh | 2 +- mln/make/w_window1d.hh | 2 +- mln/make/w_window1d_int.hh | 2 +- mln/make/w_window2d.hh | 2 +- mln/make/w_window2d_int.hh | 2 +- mln/make/w_window3d.hh | 2 +- mln/make/w_window3d_int.hh | 2 +- mln/make/win_chamfer.hh | 4 ++-- mln/make/window1d.hh | 2 +- mln/make/window2d.hh | 2 +- mln/make/window3d.hh | 2 +- mln/morpho/dilation_fast.hh | 2 +- mln/morpho/erosion_fast.hh | 2 +- mln/morpho/line_gradient.hh | 2 +- mln/win/backdiag2d.hh | 2 +- mln/win/cube3d.hh | 2 +- mln/win/cuboid3d.hh | 2 +- mln/win/diag2d.hh | 2 +- mln/win/disk2d.hh | 2 +- mln/win/octagon2d.hh | 2 +- sandbox/abraham/mln/io/tikz/save.hh | 2 +- sandbox/abraham/tests/morpho/test_component_tree.cc | 4 ++-- sandbox/abraham/tests/morpho/test_watershed.cc | 4 ++-- sandbox/abraham/tests/morpho/test_watershed_topo.cc | 4 ++-- sandbox/aroumougame/skeleton/mesh-skel.cc | 2 +- sandbox/aroumougame/skeleton/mesh-skel_region.cc | 2 +- sandbox/aroumougame/skeleton/neighborhood1.hh | 6 +++--- sandbox/aroumougame/skeleton/test.cc | 4 ++-- sandbox/aroumougame/skeleton/test_image3d.cc | 2 +- sandbox/beguin/fusion_graph.hh | 4 ++-- sandbox/beguin/irm.cc | 4 ++-- sandbox/beguin/irm_g.cc | 4 ++-- sandbox/duhamel/chamfer.cc | 4 ++-- sandbox/duhamel/chamfer.hh | 4 ++-- sandbox/duhamel/color_sub.cc | 4 ++-- sandbox/duhamel/draw_mesh.hh | 2 +- sandbox/duhamel/graph_labeling.hh | 2 +- sandbox/duhamel/labeling_algo.cc | 2 +- sandbox/duhamel/labeling_algo.hh | 2 +- sandbox/duhamel/labeling_level.hh | 2 +- sandbox/duhamel/labeling_level_fast.cc | 2 +- sandbox/duhamel/labeling_level_fast_10000x1000.cc | 2 +- sandbox/duhamel/labeling_level_generic_10000x1000.cc | 2 +- sandbox/duhamel/main.cc | 4 ++-- sandbox/duhamel/main_mesh_image.cc | 2 +- sandbox/duhamel/mesh_image.hh | 2 +- sandbox/duhamel/slow_seed2tiling.cc | 4 ++-- sandbox/duhamel/translate_image.hh | 2 +- sandbox/folio/dt.cc | 2 +- sandbox/folio/psn.cc | 2 +- sandbox/folio/psn_log.cc | 2 +- sandbox/folio/test/dt.cc | 2 +- sandbox/folio/test/dt_bench.cc | 2 +- sandbox/folio/test/dt_maze.cc | 2 +- sandbox/folio/test/psn.cc | 2 +- sandbox/folio/test/psn_log.cc | 2 +- sandbox/garrigues/factures/extract_array.cc | 2 +- sandbox/garrigues/factures/extract_array_highlight.cc | 2 +- sandbox/garrigues/fllt/fllt.hh | 2 +- sandbox/garrigues/fllt/fllt_simple.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 2 +- sandbox/garrigues/fllt/fllt_theo.cc | 2 +- sandbox/garrigues/fllt/give_confs.cc | 4 ++-- sandbox/garrigues/fllt/lower.hh | 2 +- sandbox/garrigues/fllt/test.cc | 2 +- sandbox/garrigues/fllt/test_fllt.cc | 2 +- sandbox/garrigues/fllt/test_fllt10.cc | 2 +- sandbox/garrigues/fllt/test_fllt10_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt12.cc | 2 +- sandbox/garrigues/fllt/test_fllt13.cc | 2 +- sandbox/garrigues/fllt/test_fllt15.cc | 2 +- sandbox/garrigues/fllt/test_fllt2.cc | 2 +- sandbox/garrigues/fllt/test_fllt3.cc | 2 +- sandbox/garrigues/fllt/test_fllt3_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt4.cc | 2 +- sandbox/garrigues/fllt/test_fllt5.cc | 2 +- sandbox/garrigues/fllt/test_fllt6.cc | 2 +- sandbox/garrigues/fllt/test_fllt7.cc | 2 +- sandbox/garrigues/fllt/test_fllt7_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt8.cc | 2 +- sandbox/garrigues/fllt/test_fllt9.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc | 2 +- sandbox/garrigues/fllt/test_flltb.cc | 2 +- sandbox/garrigues/fllt/upper.hh | 2 +- sandbox/garrigues/level_set.hh | 4 ++-- sandbox/garrigues/lower.hh | 2 +- sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh | 2 +- sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh | 2 +- sandbox/garrigues/tiled_image2d/tiled_image2d.hh | 2 +- sandbox/garrigues/upper.hh | 2 +- sandbox/geraud/cs2d/cs2d.hh | 4 ++-- sandbox/geraud/cs2d/dbl_neighb.cc | 4 ++-- sandbox/geraud/cs2d/kruskal.cc | 4 ++-- sandbox/geraud/cs2d/tuto.cc | 4 ++-- sandbox/geraud/cs2d/tuto_bis.cc | 4 ++-- sandbox/geraud/dmap.cc | 2 +- sandbox/geraud/fllt.svg.6.cc | 2 +- sandbox/geraud/fllt.svg.7.hh | 2 +- sandbox/geraud/fllt/fllt.hh | 2 +- sandbox/geraud/fllt/fllt.svg.1.cc | 2 +- sandbox/geraud/fllt/fllt.svg.2.cc | 2 +- sandbox/geraud/fllt/fllt.svg.3.cc | 2 +- sandbox/geraud/fllt/fllt.svg.4.cc | 2 +- sandbox/geraud/fllt/fllt.svg.5.cc | 2 +- sandbox/geraud/fllt/fllt.svg.6.cc | 2 +- sandbox/geraud/fllt/fllt.svg.7.hh | 2 +- sandbox/geraud/fllt/fllt_test.hh | 2 +- sandbox/geraud/irm.cc | 4 ++-- sandbox/geraud/max_tree_nnodes.cc | 2 +- sandbox/geraud/win_fun.cc | 2 +- sandbox/nivault/extract_character.cc | 2 +- sandbox/nivault/extract_score.cc | 2 +- sandbox/nivault/median.hh | 2 +- sandbox/nivault/plugin-gimp/src/build-image.hh | 2 +- sandbox/nivault/plugin-gimp/src/gimp-image.hh | 2 +- sandbox/pellegrin/set/core/line2d.hh | 2 +- sandbox/pellegrin/set/test/p_bgraph.cc | 2 +- sandbox/pellegrin/set/test/p_priority_queue.cc | 2 +- sandbox/pellegrin/set/test/p_priority_queue_fast.cc | 2 +- sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc | 2 +- sandbox/pellegrin/set/test/p_queue.cc | 2 +- sandbox/pellegrin/set/test/p_queue_fast.cc | 2 +- sandbox/pellegrin/set/test/p_set.cc | 2 +- sandbox/vigouroux/cmy/fun.hh | 2 +- sandbox/vigouroux/cmy/get_blue.hh | 2 +- sandbox/vigouroux/cmy/get_green.hh | 2 +- sandbox/vigouroux/cmy/rgb_to_cmy.hh | 2 +- sandbox/vigouroux/color/rgb_to_cmy.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsi.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsl.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsv.hh | 2 +- sandbox/vigouroux/color/rgb_to_xyz.hh | 2 +- sandbox/vigouroux/color/rgb_to_yiq.hh | 2 +- sandbox/vigouroux/color/rgb_to_yuv.hh | 2 +- sandbox/vigouroux/color/tests.cc | 2 +- sandbox/vigouroux/conv/getred.hh | 2 +- sandbox/vigouroux/conv/rgbto.hh | 2 +- sandbox/vigouroux/conv/tored.hh | 2 +- sandbox/vigouroux/conv/torgb.hh | 2 +- sandbox/vigouroux/convert/value_to_point.hh | 4 ++-- sandbox/vigouroux/function.hh | 2 +- sandbox/vigouroux/hsi/get_blue.hh | 2 +- sandbox/vigouroux/hsi/get_green.hh | 2 +- sandbox/vigouroux/hsi/get_red.hh | 2 +- sandbox/vigouroux/hsi/rgb_to_hsi.hh | 2 +- sandbox/vigouroux/load.cc | 2 +- sandbox/vigouroux/tests.cc | 2 +- sandbox/vigouroux/xyz/get_blue.hh | 2 +- sandbox/vigouroux/xyz/get_green.hh | 2 +- sandbox/vigouroux/xyz/get_red.hh | 2 +- sandbox/vigouroux/xyz/rgb_to_xyz.hh | 2 +- sandbox/vigouroux/yiq/get_blue.hh | 2 +- sandbox/vigouroux/yiq/get_green.hh | 2 +- sandbox/vigouroux/yiq/get_red.hh | 2 +- sandbox/vigouroux/yiq/rgb_to_yiq.hh | 2 +- sandbox/vigouroux/yuv/get_blue.hh | 2 +- sandbox/vigouroux/yuv/get_green.hh | 2 +- sandbox/vigouroux/yuv/get_red.hh | 2 +- sandbox/vigouroux/yuv/rgb_to_yuv.hh | 2 +- tests/accu/all_accus.cc | 2 +- tests/accu/bbox.cc | 4 ++-- tests/canvas/chamfer.cc | 4 ++-- tests/convert/to_image.cc | 2 +- tests/convert/to_p_array.cc | 4 ++-- tests/convert/to_p_set.cc | 8 ++++---- tests/convert/to_window.cc | 8 ++++---- tests/core/box1d.cc | 2 +- tests/core/box2d.cc | 2 +- tests/core/box3d.cc | 2 +- tests/core/clock_test.cc | 2 +- tests/core/complex_image.cc | 2 +- tests/core/dpoint1d.cc | 2 +- tests/core/dpoint2d.cc | 2 +- tests/core/dpoint3d.cc | 2 +- tests/core/graph_elt_neighborhood.cc | 2 +- tests/core/graph_elt_window.cc | 2 +- tests/core/graph_image.cc | 2 +- tests/core/graph_image_wst.cc | 2 +- tests/core/h_vec.cc | 2 +- tests/core/line_graph_elt_neighborhood.cc | 2 +- tests/core/line_graph_elt_window.cc | 2 +- tests/core/line_graph_image.cc | 2 +- tests/core/mono_obased_rle_image.cc | 2 +- tests/core/mono_rle_image.cc | 2 +- tests/core/neighb.cc | 6 +++--- tests/core/obased_rle_image.cc | 2 +- tests/core/p_array.cc | 2 +- tests/core/p_bgraph.cc | 2 +- tests/core/p_priority_queue.cc | 2 +- tests/core/p_priority_queue_fast.cc | 2 +- tests/core/p_priority_queue_fast_with_array.cc | 2 +- tests/core/p_queue.cc | 2 +- tests/core/p_queue_fast.cc | 2 +- tests/core/p_set.cc | 2 +- tests/core/point1d.cc | 2 +- tests/core/point2d.cc | 2 +- tests/core/point3d.cc | 2 +- tests/core/point_set_compatibility.cc | 2 +- tests/core/rle_image.cc | 2 +- tests/core/sparse_image.cc | 2 +- tests/core/value_enc_image.cc | 2 +- tests/core/w_window1d_int.cc | 2 +- tests/core/w_window2d_int.cc | 2 +- tests/core/w_window3d_int.cc | 2 +- tests/core/window1d.cc | 2 +- tests/core/window2d.cc | 2 +- tests/core/window3d.cc | 2 +- tests/display/save_and_show.cc | 2 +- tests/display/show.cc | 2 +- tests/draw/graph.cc | 2 +- tests/draw/label.cc | 2 +- tests/geom/bbox.cc | 4 ++-- tests/geom/pmin_pmax.cc | 2 +- tests/geom/seed2tiling.cc | 2 +- tests/geom/seed2tiling_roundness.cc | 4 ++-- tests/geom/shift.cc | 4 ++-- tests/geom/sym.cc | 4 ++-- tests/labeling/background.cc | 2 +- tests/labeling/blobs.cc | 2 +- tests/labeling/flat_zones.cc | 2 +- tests/labeling/foreground.cc | 2 +- tests/labeling/level.cc | 2 +- tests/labeling/regional_maxima.cc | 2 +- tests/labeling/regional_minima.cc | 2 +- tests/linear/convolve.cc | 2 +- tests/linear/line_convolve.cc | 2 +- tests/linear/local/convolve.cc | 2 +- tests/morpho/artificial_line_graph_image_wst.cc | 6 +++--- tests/morpho/closing_area.cc | 2 +- tests/morpho/closing_height.cc | 2 +- tests/morpho/closing_volume.cc | 2 +- tests/morpho/combined.cc | 4 ++-- tests/morpho/dilation.cc | 4 ++-- tests/morpho/dilation_max_h.cc | 2 +- tests/morpho/erosion.cc | 2 +- tests/morpho/erosion_min_h.cc | 2 +- tests/morpho/gradient_elementary.cc | 2 +- tests/morpho/hit_or_miss.cc | 2 +- tests/morpho/lena_line_graph_image_wst1.cc | 6 +++--- tests/morpho/lena_line_graph_image_wst2.cc | 6 +++--- tests/morpho/line_graph_image_wst.cc | 2 +- tests/morpho/meyer_wst.cc | 4 ++-- tests/morpho/meyer_wst_long.cc | 4 ++-- tests/morpho/opening_area.cc | 2 +- tests/morpho/opening_height.cc | 2 +- tests/morpho/opening_volume.cc | 2 +- tests/morpho/rank_filter.cc | 2 +- tests/morpho/thinning.cc | 2 +- tests/neighb/image.cc | 2 +- tests/pw/image.cc | 2 +- tests/set/diff.cc | 2 +- tests/set/inter.cc | 2 +- tests/set/is_subset_of.cc | 2 +- tests/set/sym_diff.cc | 2 +- tests/set/uni.cc | 2 +- tests/util/ordpair.cc | 2 +- tools/area_flooding.cc | 2 +- tools/seed2tiling.cc | 4 ++-- 331 files changed, 472 insertions(+), 472 deletions(-) Index: tools/seed2tiling.cc --- tools/seed2tiling.cc (revision 2172) +++ tools/seed2tiling.cc (working copy) @@ -33,7 +33,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/level/stretch.hh> @@ -51,7 +51,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/make/win_chamfer.hh> int main(int argc, char* argv[]) Index: tools/area_flooding.cc --- tools/area_flooding.cc (revision 2172) +++ tools/area_flooding.cc (working copy) @@ -52,7 +52,7 @@ #include <mln/value/int_u16.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> Index: tests/core/w_window1d_int.cc --- tests/core/w_window1d_int.cc (revision 2172) +++ tests/core/w_window1d_int.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/w_window1d_int.cc /// \brief Tests on mln::w_window1d_int. -#include <mln/core/w_window1d_int.hh> +#include <mln/core/alias/w_window1d_int.hh> #include <mln/win/segment1d.hh> #include <mln/convert/to_image.hh> Index: tests/core/graph_elt_neighborhood.cc --- tests/core/graph_elt_neighborhood.cc (revision 2172) +++ tests/core/graph_elt_neighborhood.cc (working copy) @@ -32,7 +32,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/debug/iota.hh> Index: tests/core/neighb.cc --- tests/core/neighb.cc (revision 2172) +++ tests/core/neighb.cc (working copy) @@ -28,9 +28,9 @@ /// \file tests/core/neighb.cc /// \brief Tests on mln::neighb<D> specializations. -#include <mln/core/neighb1d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/neighb3d.hh> +#include <mln/core/alias/neighb1d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/neighb3d.hh> using namespace mln; Index: tests/core/window1d.cc --- tests/core/window1d.cc (revision 2172) +++ tests/core/window1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::window1d. */ -#include <mln/core/window1d.hh> +#include <mln/core/alias/window1d.hh> #include <mln/core/image/image1d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> Index: tests/core/window2d.cc --- tests/core/window2d.cc (revision 2172) +++ tests/core/window2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::window2d. */ -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image2d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> Index: tests/core/w_window2d_int.cc --- tests/core/w_window2d_int.cc (revision 2172) +++ tests/core/w_window2d_int.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::w_window2d_int. */ -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/win/rectangle2d.hh> #include <mln/convert/to_image.hh> Index: tests/core/w_window3d_int.cc --- tests/core/w_window3d_int.cc (revision 2172) +++ tests/core/w_window3d_int.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::w_window3d_int. */ -#include <mln/core/w_window3d_int.hh> +#include <mln/core/alias/w_window3d_int.hh> #include <mln/win/cube3d.hh> #include <mln/convert/to_image.hh> Index: tests/core/window3d.cc --- tests/core/window3d.cc (revision 2172) +++ tests/core/window3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::window3d. */ -#include <mln/core/window3d.hh> +#include <mln/core/alias/window3d.hh> #include <mln/core/image/image3d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> Index: tests/core/graph_image_wst.cc --- tests/core/graph_image_wst.cc (revision 2172) +++ tests/core/graph_image_wst.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_image.hh> #include <mln/core/image/graph_elt_window.hh> #include <mln/core/image/graph_window_piter.hh> Index: tests/core/p_priority_queue.cc --- tests/core/p_priority_queue.cc (revision 2172) +++ tests/core/p_priority_queue.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_priority_queue.hh> int main () Index: tests/core/complex_image.cc --- tests/core/complex_image.cc (revision 2172) +++ tests/core/complex_image.cc (working copy) @@ -31,7 +31,7 @@ #include <iostream> #include <mln/value/int_u8.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_faces.hh> #include <mln/core/complex_image.hh> Index: tests/core/p_priority_queue_fast_with_array.cc --- tests/core/p_priority_queue_fast_with_array.cc (revision 2172) +++ tests/core/p_priority_queue_fast_with_array.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue_fast_with_array. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_priority_queue_fast_with_array.hh> int main () Index: tests/core/p_set.cc --- tests/core/p_set.cc (revision 2172) +++ tests/core/p_set.cc (working copy) @@ -32,7 +32,7 @@ #include <iterator> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_set.hh> Index: tests/core/mono_rle_image.cc --- tests/core/mono_rle_image.cc (revision 2172) +++ tests/core/mono_rle_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/point_set_compatibility.cc --- tests/core/point_set_compatibility.cc (revision 2172) +++ tests/core/point_set_compatibility.cc (working copy) @@ -29,7 +29,7 @@ /// \brief Tests on the compatibility of some point sites with some /// point sets (and their iterators). -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/site_set/p_set.hh> Index: tests/core/obased_rle_image.cc --- tests/core/obased_rle_image.cc (revision 2172) +++ tests/core/obased_rle_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/graph_image.cc --- tests/core/graph_image.cc (revision 2172) +++ tests/core/graph_image.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_image.hh> #include <mln/core/image/graph_elt_window.hh> #include <mln/core/image/graph_window_piter.hh> Index: tests/core/box1d.cc --- tests/core/box1d.cc (revision 2172) +++ tests/core/box1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::box1d. */ -#include <mln/core/box1d.hh> +#include <mln/core/alias/box1d.hh> Index: tests/core/box2d.cc --- tests/core/box2d.cc (revision 2172) +++ tests/core/box2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::box2d. */ -#include <mln/core/box2d.hh> +#include <mln/core/alias/box2d.hh> Index: tests/core/box3d.cc --- tests/core/box3d.cc (revision 2172) +++ tests/core/box3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::box3d. */ -#include <mln/core/box3d.hh> +#include <mln/core/alias/box3d.hh> Index: tests/core/p_queue_fast.cc --- tests/core/p_queue_fast.cc (revision 2172) +++ tests/core/p_queue_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_queue_fast. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: tests/core/p_bgraph.cc --- tests/core/p_bgraph.cc (revision 2172) +++ tests/core/p_bgraph.cc (working copy) @@ -29,7 +29,7 @@ /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). #include <mln/core/site_set/p_bgraph.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/util/internal/boost_graph.hh> #include <boost/typeof/std/utility.hpp> Index: tests/core/mono_obased_rle_image.cc --- tests/core/mono_obased_rle_image.cc (revision 2172) +++ tests/core/mono_obased_rle_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/graph_elt_window.cc --- tests/core/graph_elt_window.cc (revision 2172) +++ tests/core/graph_elt_window.cc (working copy) @@ -32,7 +32,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_elt_window.hh> #include <mln/debug/iota.hh> Index: tests/core/p_array.cc --- tests/core/p_array.cc (revision 2172) +++ tests/core/p_array.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_array. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_array.hh> Index: tests/core/sparse_image.cc --- tests/core/sparse_image.cc (revision 2172) +++ tests/core/sparse_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/dpoint1d.cc --- tests/core/dpoint1d.cc (revision 2172) +++ tests/core/dpoint1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::dpoint1d. */ -#include <mln/core/dpoint1d.hh> +#include <mln/core/alias/dpoint1d.hh> Index: tests/core/dpoint2d.cc --- tests/core/dpoint2d.cc (revision 2172) +++ tests/core/dpoint2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::dpoint2d. */ -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> Index: tests/core/dpoint3d.cc --- tests/core/dpoint3d.cc (revision 2172) +++ tests/core/dpoint3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::dpoint3d. */ -#include <mln/core/dpoint3d.hh> +#include <mln/core/alias/dpoint3d.hh> Index: tests/core/clock_test.cc --- tests/core/clock_test.cc (revision 2172) +++ tests/core/clock_test.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/debug/println.hh> #include <mln/level/fill.hh> #include <mln/labeling/level.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> namespace mln { Index: tests/core/line_graph_elt_window.cc --- tests/core/line_graph_elt_window.cc (revision 2172) +++ tests/core/line_graph_elt_window.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/line_graph_elt_window.hh> #include <mln/debug/iota.hh> Index: tests/core/value_enc_image.cc --- tests/core/value_enc_image.cc (revision 2172) +++ tests/core/value_enc_image.cc (working copy) @@ -36,7 +36,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/line_graph_elt_neighborhood.cc --- tests/core/line_graph_elt_neighborhood.cc (revision 2172) +++ tests/core/line_graph_elt_neighborhood.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/debug/iota.hh> Index: tests/core/p_queue.cc --- tests/core/p_queue.cc (revision 2172) +++ tests/core/p_queue.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_queue. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_queue.hh> Index: tests/core/line_graph_image.cc --- tests/core/line_graph_image.cc (revision 2172) +++ tests/core/line_graph_image.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_window.hh> #include <mln/core/image/line_graph_window_piter.hh> Index: tests/core/point1d.cc --- tests/core/point1d.cc (revision 2172) +++ tests/core/point1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::point1d. */ -#include <mln/core/point1d.hh> +#include <mln/core/alias/point1d.hh> Index: tests/core/point2d.cc --- tests/core/point2d.cc (revision 2172) +++ tests/core/point2d.cc (working copy) @@ -31,7 +31,7 @@ */ #include <iostream> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/literal/all.hh> Index: tests/core/point3d.cc --- tests/core/point3d.cc (revision 2172) +++ tests/core/point3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::point3d. */ -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> Index: tests/core/p_priority_queue_fast.cc --- tests/core/p_priority_queue_fast.cc (revision 2172) +++ tests/core/p_priority_queue_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue_fast. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_priority_queue_fast.hh> int main () Index: tests/core/rle_image.cc --- tests/core/rle_image.cc (revision 2172) +++ tests/core/rle_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/h_vec.cc --- tests/core/h_vec.cc (revision 2172) +++ tests/core/h_vec.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/h_vec.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> using namespace mln; Index: tests/neighb/image.cc --- tests/neighb/image.cc (revision 2172) +++ tests/neighb/image.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/neighb/image.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/metal/has_neighborhood.hh> Index: tests/draw/label.cc --- tests/draw/label.cc (revision 2172) +++ tests/draw/label.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/display/save_and_show.hh> Index: tests/draw/graph.cc --- tests/draw/graph.cc (revision 2172) +++ tests/draw/graph.cc (working copy) @@ -37,7 +37,7 @@ #include <utility> #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/debug/println.hh> #include <mln/util/graph.hh> #include <mln/core/site_set/p_graph.hh> Index: tests/linear/convolve.cc --- tests/linear/convolve.cc (revision 2172) +++ tests/linear/convolve.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/math/round.hh> #include <mln/level/transform.hh> -#include <mln/core/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_float.hh> #include <mln/border/thickness.hh> #include <mln/linear/convolve.hh> Index: tests/linear/line_convolve.cc --- tests/linear/line_convolve.cc (revision 2172) +++ tests/linear/line_convolve.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/math/round.hh> #include <mln/level/transform.hh> -#include <mln/core/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_float.hh> #include <mln/border/thickness.hh> #include <mln/linear/line_convolve.hh> Index: tests/linear/local/convolve.cc --- tests/linear/local/convolve.cc (revision 2172) +++ tests/linear/local/convolve.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/win/rectangle2d.hh> #include <mln/core/pixel.hh> Index: tests/accu/all_accus.cc --- tests/accu/all_accus.cc (revision 2172) +++ tests/accu/all_accus.cc (working copy) @@ -29,7 +29,7 @@ /// \brief Tests on all_accus files in mln/accu. #include <mln/accu/all.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/value/set.hh> Index: tests/accu/bbox.cc --- tests/accu/bbox.cc (revision 2172) +++ tests/accu/bbox.cc (working copy) @@ -31,8 +31,8 @@ */ -#include <mln/core/point2d.hh> -#include <mln/core/box2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/box2d.hh> #include <mln/accu/bbox.hh> Index: tests/convert/to_p_set.cc --- tests/convert/to_p_set.cc (revision 2172) +++ tests/convert/to_p_set.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::convert::to_p_set. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/window2d.hh> -#include <mln/core/box2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> Index: tests/convert/to_p_array.cc --- tests/convert/to_p_array.cc (revision 2172) +++ tests/convert/to_p_array.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::convert::to_p_array. */ -#include <mln/core/point1d.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point1d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/win/segment1d.hh> Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2172) +++ tests/convert/to_image.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/level/compare.hh> Index: tests/convert/to_window.cc --- tests/convert/to_window.cc (revision 2172) +++ tests/convert/to_window.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::convert::to_window. */ -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/window2d.hh> -#include <mln/core/box2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> Index: tests/pw/image.cc --- tests/pw/image.cc (revision 2172) +++ tests/pw/image.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/fun/p2b/chess.hh> -#include <mln/core/box2d.hh> +#include <mln/core/alias/box2d.hh> #include <mln/pw/image.hh> #include <mln/debug/println.hh> Index: tests/geom/sym.cc --- tests/geom/sym.cc (revision 2172) +++ tests/geom/sym.cc (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/window2d.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/dpoint2d.hh> #include <mln/geom/sym.hh> Index: tests/geom/seed2tiling_roundness.cc --- tests/geom/seed2tiling_roundness.cc (revision 2172) +++ tests/geom/seed2tiling_roundness.cc (working copy) @@ -31,8 +31,8 @@ */ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/make/win_chamfer.hh> # include <mln/geom/seeds2tiling_roundness.hh> # include <mln/level/compare.hh> Index: tests/geom/seed2tiling.cc --- tests/geom/seed2tiling.cc (revision 2172) +++ tests/geom/seed2tiling.cc (working copy) @@ -32,7 +32,7 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/geom/seeds2tiling.hh> # include <mln/level/compare.hh> Index: tests/geom/shift.cc --- tests/geom/shift.cc (revision 2172) +++ tests/geom/shift.cc (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/window2d.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/dpoint2d.hh> #include <mln/geom/shift.hh> Index: tests/geom/pmin_pmax.cc --- tests/geom/pmin_pmax.cc (revision 2172) +++ tests/geom/pmin_pmax.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/geom/pmin_pmax.hh> Index: tests/geom/bbox.cc --- tests/geom/bbox.cc (revision 2172) +++ tests/geom/bbox.cc (working copy) @@ -26,8 +26,8 @@ // Public License. #include <mln/core/site_set/p_set.hh> -#include <mln/core/point2d.hh> -#include <mln/core/box2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/box2d.hh> #include <mln/geom/bbox.hh> Index: tests/set/uni.cc --- tests/set/uni.cc (revision 2172) +++ tests/set/uni.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/uni.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> int main() { Index: tests/set/sym_diff.cc --- tests/set/sym_diff.cc (revision 2172) +++ tests/set/sym_diff.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/sym_diff.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> int main() { Index: tests/set/inter.cc --- tests/set/inter.cc (revision 2172) +++ tests/set/inter.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/inter.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> int main() Index: tests/set/is_subset_of.cc --- tests/set/is_subset_of.cc (revision 2172) +++ tests/set/is_subset_of.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/set/is_subset_of.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> int main() { Index: tests/set/diff.cc --- tests/set/diff.cc (revision 2172) +++ tests/set/diff.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/diff.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> int main() { Index: tests/morpho/meyer_wst_long.cc --- tests/morpho/meyer_wst_long.cc (revision 2172) +++ tests/morpho/meyer_wst_long.cc (working copy) @@ -32,8 +32,8 @@ #include <mln/core/image/image_if.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/morpho/artificial_line_graph_image_wst.cc --- tests/morpho/artificial_line_graph_image_wst.cc (revision 2172) +++ tests/morpho/artificial_line_graph_image_wst.cc (working copy) @@ -50,9 +50,9 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> Index: tests/morpho/rank_filter.cc --- tests/morpho/rank_filter.cc (revision 2172) +++ tests/morpho/rank_filter.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> #include <mln/win/backdiag2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/dilation.cc --- tests/morpho/dilation.cc (revision 2172) +++ tests/morpho/dilation.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> #include <mln/win/backdiag2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> @@ -48,7 +48,7 @@ #include <mln/pw/cst.hh> #include <mln/fun/ops.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/neighb/image.hh> #include "tests/data.hh" Index: tests/morpho/line_graph_image_wst.cc --- tests/morpho/line_graph_image_wst.cc (revision 2172) +++ tests/morpho/line_graph_image_wst.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/core/image/line_graph_neighborhood_piter.hh> Index: tests/morpho/meyer_wst.cc --- tests/morpho/meyer_wst.cc (revision 2172) +++ tests/morpho/meyer_wst.cc (working copy) @@ -31,8 +31,8 @@ #include <iostream> #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> Index: tests/morpho/thinning.cc --- tests/morpho/thinning.cc (revision 2172) +++ tests/morpho/thinning.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/load.hh> Index: tests/morpho/erosion.cc --- tests/morpho/erosion.cc (revision 2172) +++ tests/morpho/erosion.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> #include <mln/win/backdiag2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/dilation_max_h.cc --- tests/morpho/dilation_max_h.cc (revision 2172) +++ tests/morpho/dilation_max_h.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/hit_or_miss.cc --- tests/morpho/hit_or_miss.cc (revision 2172) +++ tests/morpho/hit_or_miss.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/geom/shift.hh> #include <mln/set/diff.hh> Index: tests/morpho/combined.cc --- tests/morpho/combined.cc (revision 2172) +++ tests/morpho/combined.cc (working copy) @@ -34,10 +34,10 @@ #include <mln/level/fill.hh> #include <mln/debug/println.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/morpho/erosion.hh> #include <mln/morpho/Rd.hh> Index: tests/morpho/gradient_elementary.cc --- tests/morpho/gradient_elementary.cc (revision 2172) +++ tests/morpho/gradient_elementary.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: tests/morpho/closing_volume.cc --- tests/morpho/closing_volume.cc (revision 2172) +++ tests/morpho/closing_volume.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/closing_area.cc --- tests/morpho/closing_area.cc (revision 2172) +++ tests/morpho/closing_area.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/closing_height.cc --- tests/morpho/closing_height.cc (revision 2172) +++ tests/morpho/closing_height.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/opening_volume.cc --- tests/morpho/opening_volume.cc (revision 2172) +++ tests/morpho/opening_volume.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/opening_area.cc --- tests/morpho/opening_area.cc (revision 2172) +++ tests/morpho/opening_area.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/lena_line_graph_image_wst1.cc --- tests/morpho/lena_line_graph_image_wst1.cc (revision 2172) +++ tests/morpho/lena_line_graph_image_wst1.cc (working copy) @@ -49,9 +49,9 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> Index: tests/morpho/opening_height.cc --- tests/morpho/opening_height.cc (revision 2172) +++ tests/morpho/opening_height.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/erosion_min_h.cc --- tests/morpho/erosion_min_h.cc (revision 2172) +++ tests/morpho/erosion_min_h.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/lena_line_graph_image_wst2.cc --- tests/morpho/lena_line_graph_image_wst2.cc (revision 2172) +++ tests/morpho/lena_line_graph_image_wst2.cc (working copy) @@ -52,9 +52,9 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> Index: tests/display/show.cc --- tests/display/show.cc (revision 2172) +++ tests/display/show.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/display/save.hh> #include <mln/display/remove.hh> Index: tests/display/save_and_show.cc --- tests/display/save_and_show.cc (revision 2172) +++ tests/display/save_and_show.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: tests/canvas/chamfer.cc --- tests/canvas/chamfer.cc (revision 2172) +++ tests/canvas/chamfer.cc (working copy) @@ -37,8 +37,8 @@ #include <mln/level/fill.hh> #include <mln/debug/println.hh> -#include <mln/core/w_window2d_int.hh> -#include <mln/core/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_float.hh> #include <mln/core/image_if_interval.hh> #include <mln/make/win_chamfer.hh> Index: tests/util/ordpair.cc --- tests/util/ordpair.cc (revision 2172) +++ tests/util/ordpair.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::util::ordpair. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/util/ordpair.hh> Index: tests/labeling/regional_maxima.cc --- tests/labeling/regional_maxima.cc (revision 2172) +++ tests/labeling/regional_maxima.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/labeling/regional_maxima.hh> Index: tests/labeling/background.cc --- tests/labeling/background.cc (revision 2172) +++ tests/labeling/background.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/background.hh> #include <mln/logical/not.hh> Index: tests/labeling/blobs.cc --- tests/labeling/blobs.cc (revision 2172) +++ tests/labeling/blobs.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include "tests/data.hh" Index: tests/labeling/flat_zones.cc --- tests/labeling/flat_zones.cc (revision 2172) +++ tests/labeling/flat_zones.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/flat_zones.hh> #include <mln/labeling/blobs.hh> Index: tests/labeling/level.cc --- tests/labeling/level.cc (revision 2172) +++ tests/labeling/level.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/labeling/foreground.cc --- tests/labeling/foreground.cc (revision 2172) +++ tests/labeling/foreground.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/foreground.hh> #include "tests/data.hh" Index: tests/labeling/regional_minima.cc --- tests/labeling/regional_minima.cc (revision 2172) +++ tests/labeling/regional_minima.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> #include <mln/labeling/regional_minima.hh> Index: apps/statues/mesh-segm.cc --- apps/statues/mesh-segm.cc (revision 2172) +++ apps/statues/mesh-segm.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: apps/statues/mesh-skel.cc --- apps/statues/mesh-skel.cc (revision 2172) +++ apps/statues/mesh-skel.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: doc/tutorial/examples/sub_image.cc --- doc/tutorial/examples/sub_image.cc (revision 2172) +++ doc/tutorial/examples/sub_image.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/image/sub_image.hh> # include <mln/debug/iota.hh> Index: doc/tutorial/examples/image_if.cc --- doc/tutorial/examples/image_if.cc (revision 2172) +++ doc/tutorial/examples/image_if.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/image/image_if.hh> # include <mln/debug/iota.hh> Index: doc/tutorial/examples/p_vaccess.cc --- doc/tutorial/examples/p_vaccess.cc (revision 2172) +++ doc/tutorial/examples/p_vaccess.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2172) +++ doc/tutorial/examples/window.cc (working copy) @@ -1,11 +1,11 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> template <typename I, typename W, typename P> Index: doc/tutorial/examples/image2d.cc --- doc/tutorial/examples/image2d.cc (revision 2172) +++ doc/tutorial/examples/image2d.cc (working copy) @@ -1,11 +1,11 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> template <typename I, typename W, typename P> Index: doc/examples/labeling_algo.cc --- doc/examples/labeling_algo.cc (revision 2172) +++ doc/examples/labeling_algo.cc (working copy) @@ -32,7 +32,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/level/stretch.hh> Index: mln/debug/println_with_border.hh --- mln/debug/println_with_border.hh (revision 2172) +++ mln/debug/println_with_border.hh (working copy) @@ -37,8 +37,8 @@ # include <mln/core/concept/window.hh> # include <mln/debug/format.hh> -# include <mln/core/box2d.hh> -# include <mln/core/box3d.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/core/alias/box3d.hh> // Specializations are in: # include <mln/debug/println_with_border.spe.hh> Index: mln/core/p_image2d_pixter.hh --- mln/core/p_image2d_pixter.hh (revision 2172) +++ mln/core/p_image2d_pixter.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Pixel iterators on a mln::p_image2d. # include <mln/core/internal/pixel_iterator_base.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/geom/size2d.hh> namespace mln Index: mln/core/image/translate_image.hh --- mln/core/image/translate_image.hh (revision 2172) +++ mln/core/image/translate_image.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/internal/image_identity.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/line_piter.hh> Index: mln/core/image/hexa.hh --- mln/core/image/hexa.hh (revision 2172) +++ mln/core/image/hexa.hh (working copy) @@ -37,8 +37,8 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/point2d_h.hh> -# include <mln/core/box2d_h.hh> +# include <mln/core/alias/point2d_h.hh> +# include <mln/core/alias/box2d_h.hh> # include <mln/core/image/hexa_piter.hh> Index: mln/core/image/hexa_piter.hh --- mln/core/image/hexa_piter.hh (revision 2172) +++ mln/core/image/hexa_piter.hh (working copy) @@ -35,8 +35,8 @@ # include <mln/core/internal/piter_adaptor.hh> -# include <mln/core/box2d.hh> -# include <mln/core/box2d_h.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/core/alias/box2d_h.hh> # include <mln/core/image/inplace.hh> namespace mln Index: mln/core/image/image1d.hh --- mln/core/image/image1d.hh (revision 2172) +++ mln/core/image/image1d.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/internal/fixme.hh> # include <mln/core/internal/image_primary.hh> -# include <mln/core/box1d.hh> +# include <mln/core/alias/box1d.hh> # include <mln/border/thickness.hh> # include <mln/value/set.hh> Index: mln/core/image/fi_adaptor.hh --- mln/core/image/fi_adaptor.hh (revision 2172) +++ mln/core/image/fi_adaptor.hh (working copy) @@ -51,7 +51,7 @@ # include <FreeImagePlus.h> # include <mln/core/internal/image_primary.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/line_piter.hh> # include <mln/value/set.hh> Index: mln/core/image/image2d.hh --- mln/core/image/image2d.hh (revision 2172) +++ mln/core/image/image2d.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/init.hh> # include <mln/border/thickness.hh> Index: mln/core/image/image3d.hh --- mln/core/image/image3d.hh (revision 2172) +++ mln/core/image/image3d.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/internal/fixme.hh> # include <mln/core/internal/image_primary.hh> -# include <mln/core/box3d.hh> +# include <mln/core/alias/box3d.hh> # include <mln/border/thickness.hh> # include <mln/value/set.hh> Index: mln/core/p_image2d.hh --- mln/core/p_image2d.hh (revision 2172) +++ mln/core/p_image2d.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/internal/site_set_base.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> Index: mln/core/clock_neighb2d.hh --- mln/core/clock_neighb2d.hh (revision 2172) +++ mln/core/clock_neighb2d.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/clock_neighb.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln Index: mln/core/lazy_image.hh --- mln/core/lazy_image.hh (revision 2172) +++ mln/core/lazy_image.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/internal/image_identity.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/line_piter.hh> Index: mln/core/site_set/line2d.hh --- mln/core/site_set/line2d.hh (revision 2172) +++ mln/core/site_set/line2d.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/site_set/p_array.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/math/all.hh> Index: mln/core/pixter1d.hh --- mln/core/pixter1d.hh (revision 2172) +++ mln/core/pixter1d.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Pixel iterators on a 1-D image with border. # include <mln/core/internal/pixel_iterator_base.hh> -# include <mln/core/point1d.hh> +# include <mln/core/alias/point1d.hh> # include <mln/geom/size1d.hh> namespace mln Index: mln/core/pixter2d.hh --- mln/core/pixter2d.hh (revision 2172) +++ mln/core/pixter2d.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Pixel iterators on a 2-D image with border. # include <mln/core/internal/pixel_iterator_base.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/geom/size2d.hh> namespace mln Index: mln/core/pixter3d.hh --- mln/core/pixter3d.hh (revision 2172) +++ mln/core/pixter3d.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Pixel iterators on a 3-D image with border. # include <mln/core/internal/pixel_iterator_base.hh> -# include <mln/core/point3d.hh> +# include <mln/core/alias/point3d.hh> # include <mln/geom/size3d.hh> namespace mln Index: mln/core/alias/neighb1d.hh --- mln/core/alias/neighb1d.hh (revision 2172) +++ mln/core/alias/neighb1d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_NEIGHB1D_HH -# define MLN_CORE_NEIGHB1D_HH +#ifndef MLN_CORE_ALIAS_NEIGHB1D_HH +# define MLN_CORE_ALIAS_NEIGHB1D_HH -/*! \file mln/core/neighb1d.hh +/*! \file mln/core/alias/neighb1d.hh * * \brief Definition of the mln::neighb1d alias and of some classical * 1D neighborhoods. @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/neighb.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln @@ -77,4 +77,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_NEIGHB1D_HH +#endif // ! MLN_CORE_ALIAS_NEIGHB1D_HH Index: mln/core/alias/neighb2d.hh --- mln/core/alias/neighb2d.hh (revision 2172) +++ mln/core/alias/neighb2d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_NEIGHB2D_HH -# define MLN_CORE_NEIGHB2D_HH +#ifndef MLN_CORE_ALIAS_NEIGHB2D_HH +# define MLN_CORE_ALIAS_NEIGHB2D_HH -/*! \file mln/core/neighb2d.hh +/*! \file mln/core/alias/neighb2d.hh * * \brief Definition of the mln::neighb2d alias and of some classical * 2D neighborhoods. @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/neighborhood.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln @@ -167,4 +167,4 @@ -#endif // ! MLN_CORE_NEIGHB2D_HH +#endif // ! MLN_CORE_ALIAS_NEIGHB2D_HH Index: mln/core/alias/dpoint1d.hh --- mln/core/alias/dpoint1d.hh (revision 2172) +++ mln/core/alias/dpoint1d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DPOINT1D_HH -# define MLN_CORE_DPOINT1D_HH +#ifndef MLN_CORE_ALIAS_DPOINT1D_HH +# define MLN_CORE_ALIAS_DPOINT1D_HH -/*! \file mln/core/dpoint1d.hh +/*! \file mln/core/alias/dpoint1d.hh * * \brief Definition of the mln::dpoint1d alias and of its * construction routine. @@ -51,7 +51,7 @@ # include <mln/make/dpoint1d.hh> -# include <mln/core/point1d.hh> +# include <mln/core/alias/point1d.hh> namespace mln @@ -74,4 +74,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DPOINT1D_HH +#endif // ! MLN_CORE_ALIAS_DPOINT1D_HH Index: mln/core/alias/neighb3d.hh --- mln/core/alias/neighb3d.hh (revision 2172) +++ mln/core/alias/neighb3d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_NEIGHB3D_HH -# define MLN_CORE_NEIGHB3D_HH +#ifndef MLN_CORE_ALIAS_NEIGHB3D_HH +# define MLN_CORE_ALIAS_NEIGHB3D_HH -/*! \file mln/core/neighb3d.hh +/*! \file mln/core/alias/neighb3d.hh * * \brief Definition of the mln::neighb3d alias and of some classical * 3D neighborhoods. @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/neighb.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln @@ -174,4 +174,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_NEIGHB3D_HH +#endif // ! MLN_CORE_ALIAS_NEIGHB3D_HH Index: mln/core/alias/dpoint2d.hh --- mln/core/alias/dpoint2d.hh (revision 2172) +++ mln/core/alias/dpoint2d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DPOINT2D_HH -# define MLN_CORE_DPOINT2D_HH +#ifndef MLN_CORE_ALIAS_DPOINT2D_HH +# define MLN_CORE_ALIAS_DPOINT2D_HH -/*! \file mln/core/dpoint2d.hh +/*! \file mln/core/alias/dpoint2d.hh * * \brief Definition of the mln::dpoint2d alias and of its * construction routine. @@ -51,7 +51,7 @@ # include <mln/make/dpoint2d.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln @@ -73,4 +73,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DPOINT2D_HH +#endif // ! MLN_CORE_ALIAS_DPOINT2D_HH Index: mln/core/alias/dpoint3d.hh --- mln/core/alias/dpoint3d.hh (revision 2172) +++ mln/core/alias/dpoint3d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DPOINT3D_HH -# define MLN_CORE_DPOINT3D_HH +#ifndef MLN_CORE_ALIAS_DPOINT3D_HH +# define MLN_CORE_ALIAS_DPOINT3D_HH -/*! \file mln/core/dpoint3d.hh +/*! \file mln/core/alias/dpoint3d.hh * * \brief Definition of the mln::dpoint3d alias and of its * construction routine. @@ -51,7 +51,7 @@ # include <mln/make/dpoint3d.hh> -# include <mln/core/point3d.hh> +# include <mln/core/alias/point3d.hh> namespace mln @@ -75,4 +75,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DPOINT3D_HH +#endif // ! MLN_CORE_ALIAS_DPOINT3D_HH Index: mln/core/alias/box2d_h.hh --- mln/core/alias/box2d_h.hh (revision 2172) +++ mln/core/alias/box2d_h.hh (working copy) @@ -28,15 +28,15 @@ #ifndef MLN_CORE_SITE_SET_BOX2D_H_HH # define MLN_CORE_SITE_SET_BOX2D_H_HH -/*! \file mln/core/box2d_h.hh +/*! \file mln/core/alias/box2d_h.hh * * \brief Definition of the mln::box2d alias and of construction * routines. */ # include <mln/core/site_set/box.hh> -# include <mln/core/box2d.hh> -# include <mln/core/point2d_h.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/core/alias/point2d_h.hh> namespace mln Index: mln/core/alias/point2d_h.hh --- mln/core/alias/point2d_h.hh (revision 2172) +++ mln/core/alias/point2d_h.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_POINT2D_H_HH -# define MLN_CORE_POINT2D_H_HH +#ifndef MLN_CORE_ALIAS_POINT2D_H_HH +# define MLN_CORE_ALIAS_POINT2D_H_HH -/// \file mln/core/point2d_h.hh +/// \file mln/core/alias/point2d_h.hh /// \brief Definition of the mln::point2d_h alias and of its construction /// routine. @@ -49,7 +49,7 @@ # include <mln/make/point2d_h.hh> -# include <mln/core/dpoint2d_h.hh> +# include <mln/core/alias/dpoint2d_h.hh> -#endif // ! MLN_CORE_POINT2D_H_HH +#endif // ! MLN_CORE_ALIAS_POINT2D_H_HH Index: mln/core/alias/dpoint2d_h.hh --- mln/core/alias/dpoint2d_h.hh (revision 2172) +++ mln/core/alias/dpoint2d_h.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DPOINT2D_H_HH -# define MLN_CORE_DPOINT2D_H_HH +#ifndef MLN_CORE_ALIAS_DPOINT2D_H_HH +# define MLN_CORE_ALIAS_DPOINT2D_H_HH -/*! \file mln/core/dpoint2d_h.hh +/*! \file mln/core/alias/dpoint2d_h.hh * * \brief Definition of the mln::dpoint2d_h alias and of its * construction routine. @@ -51,7 +51,7 @@ # include <mln/make/dpoint2d_h.hh> -# include <mln/core/point2d_h.hh> +# include <mln/core/alias/point2d_h.hh> namespace mln @@ -66,4 +66,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DPOINT2D_H_HH +#endif // ! MLN_CORE_ALIAS_DPOINT2D_H_HH Index: mln/core/alias/w_window1d_int.hh --- mln/core/alias/w_window1d_int.hh (revision 2172) +++ mln/core/alias/w_window1d_int.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW1D_INT_HH -# define MLN_CORE_W_WINDOW1D_INT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW1D_INT_HH +# define MLN_CORE_ALIAS_W_WINDOW1D_INT_HH -/*! \file mln/core/w_window1d_int.hh +/*! \file mln/core/alias/w_window1d_int.hh * * \brief Definition of the mln::w_window1d_int alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window1d.hh> -#endif // ! MLN_CORE_W_WINDOW1D_INT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW1D_INT_HH Index: mln/core/alias/window1d.hh --- mln/core/alias/window1d.hh (revision 2172) +++ mln/core/alias/window1d.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_WINDOW1D_HH -# define MLN_CORE_WINDOW1D_HH +#ifndef MLN_CORE_ALIAS_WINDOW1D_HH +# define MLN_CORE_ALIAS_WINDOW1D_HH -/// \file mln/core/window1d.hh +/// \file mln/core/alias/window1d.hh /// \brief Definition of the mln::window1d alias and of a construction /// routine. # include <mln/core/window.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln @@ -50,4 +50,4 @@ # include <mln/make/window1d.hh> -#endif // ! MLN_CORE_WINDOW1D_HH +#endif // ! MLN_CORE_ALIAS_WINDOW1D_HH Index: mln/core/alias/w_window2d_int.hh --- mln/core/alias/w_window2d_int.hh (revision 2172) +++ mln/core/alias/w_window2d_int.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW2D_INT_HH -# define MLN_CORE_W_WINDOW2D_INT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW2D_INT_HH +# define MLN_CORE_ALIAS_W_WINDOW2D_INT_HH -/*! \file mln/core/w_window2d_int.hh +/*! \file mln/core/alias/w_window2d_int.hh * * \brief Definition of the mln::w_window2d_int alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window2d.hh> -#endif // ! MLN_CORE_W_WINDOW2D_INT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW2D_INT_HH Index: mln/core/alias/window2d.hh --- mln/core/alias/window2d.hh (revision 2172) +++ mln/core/alias/window2d.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_WINDOW2D_HH -# define MLN_CORE_WINDOW2D_HH +#ifndef MLN_CORE_ALIAS_WINDOW2D_HH +# define MLN_CORE_ALIAS_WINDOW2D_HH -/// \file mln/core/window2d.hh +/// \file mln/core/alias/window2d.hh /// \brief Definition of the mln::window2d alias and of a construction /// routine. # include <mln/core/window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln @@ -82,4 +82,4 @@ # include <mln/make/window2d.hh> -#endif // ! MLN_CORE_WINDOW2D_HH +#endif // ! MLN_CORE_ALIAS_WINDOW2D_HH Index: mln/core/alias/window3d.hh --- mln/core/alias/window3d.hh (revision 2172) +++ mln/core/alias/window3d.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_WINDOW3D_HH -# define MLN_CORE_WINDOW3D_HH +#ifndef MLN_CORE_ALIAS_WINDOW3D_HH +# define MLN_CORE_ALIAS_WINDOW3D_HH -/// \file mln/core/window3d.hh +/// \file mln/core/alias/window3d.hh /// \brief Definition of the mln::window3d alias and of a construction /// routine. # include <mln/core/window.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln @@ -50,4 +50,4 @@ # include <mln/make/window3d.hh> -#endif // ! MLN_CORE_WINDOW3D_HH +#endif // ! MLN_CORE_ALIAS_WINDOW3D_HH Index: mln/core/alias/w_window3d_int.hh --- mln/core/alias/w_window3d_int.hh (revision 2172) +++ mln/core/alias/w_window3d_int.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW3D_INT_HH -# define MLN_CORE_W_WINDOW3D_INT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW3D_INT_HH +# define MLN_CORE_ALIAS_W_WINDOW3D_INT_HH -/*! \file mln/core/w_window3d_int.hh +/*! \file mln/core/alias/w_window3d_int.hh * * \brief Definition of the mln::w_window3d_int alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window3d.hh> -#endif // ! MLN_CORE_W_WINDOW3D_INT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW3D_INT_HH Index: mln/core/alias/w_window1d_float.hh --- mln/core/alias/w_window1d_float.hh (revision 2172) +++ mln/core/alias/w_window1d_float.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW1D_FLOAT_HH -# define MLN_CORE_W_WINDOW1D_FLOAT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW1D_FLOAT_HH +# define MLN_CORE_ALIAS_W_WINDOW1D_FLOAT_HH -/*! \file mln/core/w_window1d_float.hh +/*! \file mln/core/alias/w_window1d_float.hh * * \brief Definition of the mln::w_window1d_float alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window1d.hh> -#endif // ! MLN_CORE_W_WINDOW1D_FLOAT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW1D_FLOAT_HH Index: mln/core/alias/w_window2d_float.hh --- mln/core/alias/w_window2d_float.hh (revision 2172) +++ mln/core/alias/w_window2d_float.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW2D_FLOAT_HH -# define MLN_CORE_W_WINDOW2D_FLOAT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW2D_FLOAT_HH +# define MLN_CORE_ALIAS_W_WINDOW2D_FLOAT_HH -/*! \file mln/core/w_window2d_float.hh +/*! \file mln/core/alias/w_window2d_float.hh * * \brief Definition of the mln::w_window2d_float alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window2d.hh> -#endif // ! MLN_CORE_W_WINDOW2D_FLOAT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW2D_FLOAT_HH Index: mln/core/alias/p_run2d.hh --- mln/core/alias/p_run2d.hh (revision 2172) +++ mln/core/alias/p_run2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/site_set/p_run.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln Index: mln/core/alias/w_window3d_float.hh --- mln/core/alias/w_window3d_float.hh (revision 2172) +++ mln/core/alias/w_window3d_float.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW3D_FLOAT_HH -# define MLN_CORE_W_WINDOW3D_FLOAT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW3D_FLOAT_HH +# define MLN_CORE_ALIAS_W_WINDOW3D_FLOAT_HH -/*! \file mln/core/w_window3d_float.hh +/*! \file mln/core/alias/w_window3d_float.hh * * \brief Definition of the mln::w_window3d_float alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window3d.hh> -#endif // ! MLN_CORE_W_WINDOW3D_FLOAT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW3D_FLOAT_HH Index: mln/core/alias/box1d.hh --- mln/core/alias/box1d.hh (revision 2172) +++ mln/core/alias/box1d.hh (working copy) @@ -28,14 +28,14 @@ #ifndef MLN_CORE_SITE_SET_BOX1D_HH # define MLN_CORE_SITE_SET_BOX1D_HH -/*! \file mln/core/box1d.hh +/*! \file mln/core/alias/box1d.hh * * \brief Definition of the mln::box1d alias and of construction * routines. */ # include <mln/core/site_set/box.hh> -# include <mln/core/point1d.hh> +# include <mln/core/alias/point1d.hh> namespace mln Index: mln/core/alias/point1d.hh --- mln/core/alias/point1d.hh (revision 2172) +++ mln/core/alias/point1d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_POINT1D_HH -# define MLN_CORE_POINT1D_HH +#ifndef MLN_CORE_ALIAS_POINT1D_HH +# define MLN_CORE_ALIAS_POINT1D_HH -/*! \file mln/core/point1d.hh +/*! \file mln/core/alias/point1d.hh * * \brief Definition of the mln::point1d alias and of its construction * routine. @@ -50,7 +50,7 @@ # include <mln/make/point1d.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> -#endif // ! MLN_CORE_POINT1D_HH +#endif // ! MLN_CORE_ALIAS_POINT1D_HH Index: mln/core/alias/box2d.hh --- mln/core/alias/box2d.hh (revision 2172) +++ mln/core/alias/box2d.hh (working copy) @@ -28,14 +28,14 @@ #ifndef MLN_CORE_SITE_SET_BOX2D_HH # define MLN_CORE_SITE_SET_BOX2D_HH -/*! \file mln/core/box2d.hh +/*! \file mln/core/alias/box2d.hh * * \brief Definition of the mln::box2d alias and of construction * routines. */ # include <mln/core/site_set/box.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln Index: mln/core/alias/box3d.hh --- mln/core/alias/box3d.hh (revision 2172) +++ mln/core/alias/box3d.hh (working copy) @@ -28,14 +28,14 @@ #ifndef MLN_CORE_SITE_SET_BOX3D_HH # define MLN_CORE_SITE_SET_BOX3D_HH -/*! \file mln/core/box3d.hh +/*! \file mln/core/alias/box3d.hh * * \brief Definition of the mln::box3d alias and of construction * routines. */ # include <mln/core/site_set/box.hh> -# include <mln/core/point3d.hh> +# include <mln/core/alias/point3d.hh> namespace mln Index: mln/core/alias/point2d.hh --- mln/core/alias/point2d.hh (revision 2172) +++ mln/core/alias/point2d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_POINT2D_HH -# define MLN_CORE_POINT2D_HH +#ifndef MLN_CORE_ALIAS_POINT2D_HH +# define MLN_CORE_ALIAS_POINT2D_HH -/*! \file mln/core/point2d.hh +/*! \file mln/core/alias/point2d.hh * * \brief Definition of the mln::point2d alias and of its construction * routine. @@ -181,7 +181,7 @@ # include <mln/make/point2d.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> -#endif // ! MLN_CORE_POINT2D_HH +#endif // ! MLN_CORE_ALIAS_POINT2D_HH Index: mln/core/alias/point3d.hh --- mln/core/alias/point3d.hh (revision 2172) +++ mln/core/alias/point3d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_POINT3D_HH -# define MLN_CORE_POINT3D_HH +#ifndef MLN_CORE_ALIAS_POINT3D_HH +# define MLN_CORE_ALIAS_POINT3D_HH -/*! \file mln/core/point3d.hh +/*! \file mln/core/alias/point3d.hh * * \brief Definition of the mln::point3d alias and of its construction * routine. @@ -50,7 +50,7 @@ # include <mln/make/point3d.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> -#endif // ! MLN_CORE_POINT3D_HH +#endif // ! MLN_CORE_ALIAS_POINT3D_HH Index: mln/draw/box.hh --- mln/draw/box.hh (revision 2172) +++ mln/draw/box.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/level/paste.hh> # include <mln/draw/line.hh> # include <mln/pw/image.hh> Index: mln/level/was.median.hh --- mln/level/was.median.hh (revision 2172) +++ mln/level/was.median.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/geom/shift.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/geom/min_col.hh> # include <mln/geom/max_col.hh> # include <mln/geom/max_row.hh> Index: mln/level/median.hh --- mln/level/median.hh (revision 2172) +++ mln/level/median.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/geom/shift.hh> # include <mln/set/diff.hh> Index: mln/level/naive/median.hh --- mln/level/naive/median.hh (revision 2172) +++ mln/level/naive/median.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/accu/median.hh> Index: mln/level/fast_median.hh --- mln/level/fast_median.hh (revision 2172) +++ mln/level/fast_median.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/accu/median.hh> # include <mln/geom/shift.hh> # include <mln/geom/min_col.hh> Index: mln/linear/gaussian.hh --- mln/linear/gaussian.hh (revision 2172) +++ mln/linear/gaussian.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/level/paste.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> Index: mln/make/dpoint1d.hh --- mln/make/dpoint1d.hh (revision 2172) +++ mln/make/dpoint1d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::dpoint1d. */ -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln Index: mln/make/dpoint2d.hh --- mln/make/dpoint2d.hh (revision 2172) +++ mln/make/dpoint2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::dpoint2d. */ -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln Index: mln/make/dpoint3d.hh --- mln/make/dpoint3d.hh (revision 2172) +++ mln/make/dpoint3d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::dpoint3d. */ -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln Index: mln/make/dpoint2d_h.hh --- mln/make/dpoint2d_h.hh (revision 2172) +++ mln/make/dpoint2d_h.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::dpoint2d_h. */ -# include <mln/core/dpoint2d_h.hh> +# include <mln/core/alias/dpoint2d_h.hh> namespace mln Index: mln/make/box1d.hh --- mln/make/box1d.hh (revision 2172) +++ mln/make/box1d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routines to construct an mln::box1d. */ -# include <mln/core/box1d.hh> +# include <mln/core/alias/box1d.hh> # include <mln/make/point1d.hh> Index: mln/make/box2d.hh --- mln/make/box2d.hh (revision 2172) +++ mln/make/box2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routines to construct an mln::box2d. */ -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/make/point2d.hh> Index: mln/make/point1d.hh --- mln/make/point1d.hh (revision 2172) +++ mln/make/point1d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::point1d. */ -# include <mln/core/point1d.hh> +# include <mln/core/alias/point1d.hh> namespace mln Index: mln/make/point2d.hh --- mln/make/point2d.hh (revision 2172) +++ mln/make/point2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::point2d. */ -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln Index: mln/make/box3d.hh --- mln/make/box3d.hh (revision 2172) +++ mln/make/box3d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routines to construct an mln::box3d. */ -# include <mln/core/box3d.hh> +# include <mln/core/alias/box3d.hh> # include <mln/make/point3d.hh> Index: mln/make/point3d.hh --- mln/make/point3d.hh (revision 2172) +++ mln/make/point3d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::point3d. */ -# include <mln/core/point3d.hh> +# include <mln/core/alias/point3d.hh> namespace mln Index: mln/make/win_chamfer.hh --- mln/make/win_chamfer.hh (revision 2172) +++ mln/make/win_chamfer.hh (working copy) @@ -37,8 +37,8 @@ */ -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include <math.h> namespace mln Index: mln/make/w_window1d.hh --- mln/make/w_window1d.hh (revision 2172) +++ mln/make/w_window1d.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/w_window.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln Index: mln/make/w_window2d.hh --- mln/make/w_window2d.hh (revision 2172) +++ mln/make/w_window2d.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/w_window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln Index: mln/make/w_window3d.hh --- mln/make/w_window3d.hh (revision 2172) +++ mln/make/w_window3d.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/w_window.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> #include <iostream> Index: mln/make/box2d_h.hh --- mln/make/box2d_h.hh (revision 2172) +++ mln/make/box2d_h.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routines to construct an mln::box2d_h. */ -# include <mln/core/box2d_h.hh> +# include <mln/core/alias/box2d_h.hh> # include <mln/make/point2d_h.hh> Index: mln/make/point2d_h.hh --- mln/make/point2d_h.hh (revision 2172) +++ mln/make/point2d_h.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::point2d_h. */ -# include <mln/core/point2d_h.hh> +# include <mln/core/alias/point2d_h.hh> namespace mln Index: mln/make/window1d.hh --- mln/make/window1d.hh (revision 2172) +++ mln/make/window1d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <cmath> -# include <mln/core/window1d.hh> +# include <mln/core/alias/window1d.hh> # include <mln/make/dpoint1d.hh> Index: mln/make/w_window1d_int.hh --- mln/make/w_window1d_int.hh (revision 2172) +++ mln/make/w_window1d_int.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create a mln::w_window1d_int. */ -# include <mln/core/w_window1d_int.hh> +# include <mln/core/alias/w_window1d_int.hh> # include <mln/make/w_window1d.hh> Index: mln/make/w_window2d_int.hh --- mln/make/w_window2d_int.hh (revision 2172) +++ mln/make/w_window2d_int.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create a mln::w_window2d_int. */ -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/make/w_window2d.hh> Index: mln/make/window2d.hh --- mln/make/window2d.hh (revision 2172) +++ mln/make/window2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create an mln::window2d. */ -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/metal/math/sqrt.hh> Index: mln/make/window3d.hh --- mln/make/window3d.hh (revision 2172) +++ mln/make/window3d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <cmath> -# include <mln/core/window3d.hh> +# include <mln/core/alias/window3d.hh> # include <mln/make/dpoint3d.hh> Index: mln/make/w_window3d_int.hh --- mln/make/w_window3d_int.hh (revision 2172) +++ mln/make/w_window3d_int.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create a mln::w_window3d_int. */ -# include <mln/core/w_window3d_int.hh> +# include <mln/core/alias/w_window3d_int.hh> # include <mln/make/w_window3d.hh> Index: mln/geom/chamfer.hh --- mln/geom/chamfer.hh (revision 2172) +++ mln/geom/chamfer.hh (working copy) @@ -34,8 +34,8 @@ */ # include <mln/level/fill.hh> -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> Index: mln/fun/p2b/chess.hh --- mln/fun/p2b/chess.hh (revision 2172) +++ mln/fun/p2b/chess.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/function.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln Index: mln/win/cube3d.hh --- mln/win/cube3d.hh (revision 2172) +++ mln/win/cube3d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/diag2d.hh --- mln/win/diag2d.hh (revision 2172) +++ mln/win/diag2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/backdiag2d.hh --- mln/win/backdiag2d.hh (revision 2172) +++ mln/win/backdiag2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/cuboid3d.hh --- mln/win/cuboid3d.hh (revision 2172) +++ mln/win/cuboid3d.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/octagon2d.hh --- mln/win/octagon2d.hh (revision 2172) +++ mln/win/octagon2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/disk2d.hh --- mln/win/disk2d.hh (revision 2172) +++ mln/win/disk2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/morpho/erosion_fast.hh --- mln/morpho/erosion_fast.hh (revision 2172) +++ mln/morpho/erosion_fast.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/geom/shift.hh> # include <mln/set/diff.hh> Index: mln/morpho/line_gradient.hh --- mln/morpho/line_gradient.hh (revision 2172) +++ mln/morpho/line_gradient.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/math/abs.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/core/image/line_graph_image.hh> // FIXME: Generalize to other (input) images as well (image1d, Index: mln/morpho/dilation_fast.hh --- mln/morpho/dilation_fast.hh (revision 2172) +++ mln/morpho/dilation_fast.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/geom/shift.hh> # include <mln/set/diff.hh> Index: mln/io/pfm/save.hh --- mln/io/pfm/save.hh (revision 2172) +++ mln/io/pfm/save.hh (working copy) @@ -40,7 +40,7 @@ # include <iostream> # include <fstream> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/geom/size2d.hh> # include <mln/metal/equal.hh> # include <mln/metal/bexpr.hh> Index: mln/io/pnm/save.hh --- mln/io/pnm/save.hh (revision 2172) +++ mln/io/pnm/save.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <mln/core/concept/image.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/value/rgb.hh> # include <mln/value/rgb8.hh> Index: sandbox/duhamel/main_mesh_image.cc --- sandbox/duhamel/main_mesh_image.cc (revision 2172) +++ sandbox/duhamel/main_mesh_image.cc (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/debug/println.hh> #include <mln/util/graph.hh> #include <mln/core/mesh_p.hh> Index: sandbox/duhamel/graph_labeling.hh --- sandbox/duhamel/graph_labeling.hh (revision 2172) +++ sandbox/duhamel/graph_labeling.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image2d_b.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/debug/println.hh> Index: sandbox/duhamel/translate_image.hh --- sandbox/duhamel/translate_image.hh (revision 2172) +++ sandbox/duhamel/translate_image.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/internal/image_identity.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> namespace mln Index: sandbox/duhamel/labeling_level_generic_10000x1000.cc --- sandbox/duhamel/labeling_level_generic_10000x1000.cc (revision 2172) +++ sandbox/duhamel/labeling_level_generic_10000x1000.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image2d_b.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/pw/all.hh> Index: sandbox/duhamel/slow_seed2tiling.cc --- sandbox/duhamel/slow_seed2tiling.cc (revision 2172) +++ sandbox/duhamel/slow_seed2tiling.cc (working copy) @@ -33,7 +33,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/level/stretch.hh> @@ -52,7 +52,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/make/win_chamfer.hh> Index: sandbox/duhamel/labeling_algo.cc --- sandbox/duhamel/labeling_algo.cc (revision 2172) +++ sandbox/duhamel/labeling_algo.cc (working copy) @@ -32,7 +32,7 @@ # include <mln/core/image2d_b.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/level/stretch.hh> Index: sandbox/duhamel/main.cc --- sandbox/duhamel/main.cc (revision 2172) +++ sandbox/duhamel/main.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image2d_b.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/level/fill.hh> #include <mln/level/stretch.hh> @@ -11,7 +11,7 @@ #include <mln/core/mesh_image.hh> # include <mln/labeling/base.hh> # include <mln/debug/println.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/core/concept/dpoint.hh> # include <mln/core/concept/neighborhood.hh> Index: sandbox/duhamel/color_sub.cc --- sandbox/duhamel/color_sub.cc (revision 2172) +++ sandbox/duhamel/color_sub.cc (working copy) @@ -46,8 +46,8 @@ # include <mln/core/image/inplace.hh> # include <mln/debug/println.hh> -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image_if_interval.hh> # include <mln/make/win_chamfer.hh> Index: sandbox/duhamel/labeling_level_fast_10000x1000.cc --- sandbox/duhamel/labeling_level_fast_10000x1000.cc (revision 2172) +++ sandbox/duhamel/labeling_level_fast_10000x1000.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image2d_b.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/pw/all.hh> Index: sandbox/duhamel/chamfer.cc --- sandbox/duhamel/chamfer.cc (revision 2172) +++ sandbox/duhamel/chamfer.cc (working copy) @@ -5,8 +5,8 @@ #include <mln/level/fill.hh> # include <mln/debug/println.hh> -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image_if_interval.hh> # include "win_chamfer.hh" Index: sandbox/duhamel/labeling_level_fast.cc --- sandbox/duhamel/labeling_level_fast.cc (revision 2172) +++ sandbox/duhamel/labeling_level_fast.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d_b.hh> #include <mln/core/image1d_b.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/pw/all.hh> Index: sandbox/duhamel/labeling_algo.hh --- sandbox/duhamel/labeling_algo.hh (revision 2172) +++ sandbox/duhamel/labeling_algo.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/core/image2d_b.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/debug/println.hh> Index: sandbox/duhamel/mesh_image.hh --- sandbox/duhamel/mesh_image.hh (revision 2172) +++ sandbox/duhamel/mesh_image.hh (working copy) @@ -40,7 +40,7 @@ # include "mesh_p.hh" # include "mesh_psite.hh" # include <vector> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> namespace mln { Index: sandbox/duhamel/chamfer.hh --- sandbox/duhamel/chamfer.hh (revision 2172) +++ sandbox/duhamel/chamfer.hh (working copy) @@ -34,8 +34,8 @@ */ # include <mln/level/fill.hh> -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include "canvas_chamfer.hh" Index: sandbox/duhamel/draw_mesh.hh --- sandbox/duhamel/draw_mesh.hh (revision 2172) +++ sandbox/duhamel/draw_mesh.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/pw/image.hh> # include <mln/core/image2d_b.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/level/fill.hh> # include <mln/draw/line.hh> # include <mln/core/mesh_p.hh> Index: sandbox/duhamel/labeling_level.hh --- sandbox/duhamel/labeling_level.hh (revision 2172) +++ sandbox/duhamel/labeling_level.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/labeling/base.hh> # include <mln/debug/println.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/core/concept/dpoint.hh> # include <mln/core/concept/neighborhood.hh> Index: sandbox/pellegrin/set/test/p_queue_fast.cc --- sandbox/pellegrin/set/test/p_queue_fast.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_queue_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_queue_fast. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/pellegrin/set/test/p_priority_queue_fast.cc --- sandbox/pellegrin/set/test/p_priority_queue_fast.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_priority_queue_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue_fast. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_priority_queue_fast.hh> int main () Index: sandbox/pellegrin/set/test/p_bgraph.cc --- sandbox/pellegrin/set/test/p_bgraph.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_bgraph.cc (working copy) @@ -29,7 +29,7 @@ /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). #include "../core/site_set/p_bgraph.hh" -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/util/internal/boost_graph.hh> #include <boost/typeof/std/utility.hpp> Index: sandbox/pellegrin/set/test/p_queue.cc --- sandbox/pellegrin/set/test/p_queue.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_queue.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_queue. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_queue.hh> Index: sandbox/pellegrin/set/test/p_priority_queue.cc --- sandbox/pellegrin/set/test/p_priority_queue.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_priority_queue.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_priority_queue.hh> int main () Index: sandbox/pellegrin/set/test/p_set.cc --- sandbox/pellegrin/set/test/p_set.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_set.cc (working copy) @@ -32,7 +32,7 @@ #include <iterator> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_set.hh> Index: sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc --- sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue_fast_with_array. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_priority_queue_fast_with_array.hh> int main () Index: sandbox/pellegrin/set/core/line2d.hh --- sandbox/pellegrin/set/core/line2d.hh (revision 2172) +++ sandbox/pellegrin/set/core/line2d.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/p_array_piter.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/math/all.hh> # include <trait/point_set.hh> Index: sandbox/aroumougame/skeleton/mesh-skel_region.cc --- sandbox/aroumougame/skeleton/mesh-skel_region.cc (revision 2172) +++ sandbox/aroumougame/skeleton/mesh-skel_region.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: sandbox/aroumougame/skeleton/test.cc --- sandbox/aroumougame/skeleton/test.cc (revision 2172) +++ sandbox/aroumougame/skeleton/test.cc (working copy) @@ -1,5 +1,5 @@ -#include <mln/core/point3d.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point3d.hh> +#include <mln/core/alias/point2d.hh> #include "thinning.hh" #include <mln/level/paste.hh> #include <mln/level/fill.hh> Index: sandbox/aroumougame/skeleton/neighborhood1.hh --- sandbox/aroumougame/skeleton/neighborhood1.hh (revision 2172) +++ sandbox/aroumougame/skeleton/neighborhood1.hh (working copy) @@ -1,6 +1,6 @@ -#include <mln/core/neighb1d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/neighb3d.hh> +#include <mln/core/alias/neighb1d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/neighb3d.hh> using namespace mln; Index: sandbox/aroumougame/skeleton/mesh-skel.cc --- sandbox/aroumougame/skeleton/mesh-skel.cc (revision 2172) +++ sandbox/aroumougame/skeleton/mesh-skel.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: sandbox/aroumougame/skeleton/test_image3d.cc --- sandbox/aroumougame/skeleton/test_image3d.cc (revision 2172) +++ sandbox/aroumougame/skeleton/test_image3d.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: sandbox/nivault/plugin-gimp/src/gimp-image.hh --- sandbox/nivault/plugin-gimp/src/gimp-image.hh (revision 2172) +++ sandbox/nivault/plugin-gimp/src/gimp-image.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/internal/image_primary.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/value/set.hh> # include <mln/value/rgb8.hh> # include <mln/core/line_piter.hh> Index: sandbox/nivault/plugin-gimp/src/build-image.hh --- sandbox/nivault/plugin-gimp/src/build-image.hh (revision 2172) +++ sandbox/nivault/plugin-gimp/src/build-image.hh (working copy) @@ -32,7 +32,7 @@ # include <libgimp/gimpui.h> # include <src/gimp-image.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/level/fill.hh> # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> Index: sandbox/nivault/extract_score.cc --- sandbox/nivault/extract_score.cc (revision 2172) +++ sandbox/nivault/extract_score.cc (working copy) @@ -49,7 +49,7 @@ # include <mln/win/disk2d.hh> # include <mln/level/fill.hh> # include <mln/labeling/blobs.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/accu/mean.hh> # include <mln/accu/bbox.hh> Index: sandbox/nivault/extract_character.cc --- sandbox/nivault/extract_character.cc (revision 2172) +++ sandbox/nivault/extract_character.cc (working copy) @@ -48,7 +48,7 @@ # include <mln/win/disk2d.hh> # include <mln/level/fill.hh> # include <mln/labeling/blobs.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/accu/mean.hh> # include <mln/accu/bbox.hh> Index: sandbox/nivault/median.hh --- sandbox/nivault/median.hh (revision 2172) +++ sandbox/nivault/median.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/image.hh> # include <mln/geom/size2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/win/hline2d.hh> # include <mln/win/vline2d.hh> # include <mln/core/image/t_image.hh> Index: sandbox/geraud/fllt/fllt.hh --- sandbox/geraud/fllt/fllt.hh (revision 2172) +++ sandbox/geraud/fllt/fllt.hh (working copy) @@ -29,7 +29,7 @@ #include <set> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.1.cc --- sandbox/geraud/fllt/fllt.svg.1.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.1.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/geraud/fllt/fllt.svg.7.hh --- sandbox/geraud/fllt/fllt.svg.7.hh (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.7.hh (working copy) @@ -32,7 +32,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.6.cc --- sandbox/geraud/fllt/fllt.svg.6.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.6.cc (working copy) @@ -28,7 +28,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt_test.hh --- sandbox/geraud/fllt/fllt_test.hh (revision 2172) +++ sandbox/geraud/fllt/fllt_test.hh (working copy) @@ -28,7 +28,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt.svg.7.hh --- sandbox/geraud/fllt.svg.7.hh (revision 2172) +++ sandbox/geraud/fllt.svg.7.hh (working copy) @@ -32,7 +32,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/dmap.cc --- sandbox/geraud/dmap.cc (revision 2172) +++ sandbox/geraud/dmap.cc (working copy) @@ -1,7 +1,7 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/debug/println.hh> #include <mln/level/fill.hh> #include <mln/level/stretch.hh> Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 2172) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -28,7 +28,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/win_fun.cc --- sandbox/geraud/win_fun.cc (revision 2172) +++ sandbox/geraud/win_fun.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/win/rectangle2d.hh> # include <mln/win/fun.hh> Index: sandbox/geraud/irm.cc --- sandbox/geraud/irm.cc (revision 2172) +++ sandbox/geraud/irm.cc (working copy) @@ -5,8 +5,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> Index: sandbox/geraud/cs2d/tuto.cc --- sandbox/geraud/cs2d/tuto.cc (revision 2172) +++ sandbox/geraud/cs2d/tuto.cc (working copy) @@ -1,8 +1,8 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/image_if.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/debug/println.hh> Index: sandbox/geraud/cs2d/kruskal.cc --- sandbox/geraud/cs2d/kruskal.cc (revision 2172) +++ sandbox/geraud/cs2d/kruskal.cc (working copy) @@ -5,8 +5,8 @@ # include <mln/core/image/image_if.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/debug/println.hh> Index: sandbox/geraud/cs2d/dbl_neighb.cc --- sandbox/geraud/cs2d/dbl_neighb.cc (revision 2172) +++ sandbox/geraud/cs2d/dbl_neighb.cc (working copy) @@ -4,8 +4,8 @@ # include <mln/value/rgb8.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_p_set.hh> # include <mln/convert/to_image.hh> Index: sandbox/geraud/cs2d/cs2d.hh --- sandbox/geraud/cs2d/cs2d.hh (revision 2172) +++ sandbox/geraud/cs2d/cs2d.hh (working copy) @@ -1,6 +1,6 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/core/image/image_if.hh> Index: sandbox/geraud/cs2d/tuto_bis.cc --- sandbox/geraud/cs2d/tuto_bis.cc (revision 2172) +++ sandbox/geraud/cs2d/tuto_bis.cc (working copy) @@ -5,8 +5,8 @@ # include <mln/core/image/image_if.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/debug/println.hh> Index: sandbox/geraud/max_tree_nnodes.cc --- sandbox/geraud/max_tree_nnodes.cc (revision 2172) +++ sandbox/geraud/max_tree_nnodes.cc (working copy) @@ -7,7 +7,7 @@ # include <mln/level/sort_psites.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/io/pgm/load.hh> Index: sandbox/vigouroux/convert/value_to_point.hh --- sandbox/vigouroux/convert/value_to_point.hh (revision 2172) +++ sandbox/vigouroux/convert/value_to_point.hh (working copy) @@ -27,8 +27,8 @@ #ifndef OLENA_VALUE_TO_POINT # define OLENA_VALUE_TO_POINT -# include <oln/core/point1d.hh> -# include <oln/core/point3d.hh> +# include <oln/core/alias/point1d.hh> +# include <oln/core/alias/point3d.hh> # include <ntg/int.hh> # include <ntg/color/color.hh> # include <oln/convert/conversion.hh> Index: sandbox/vigouroux/yuv/get_blue.hh --- sandbox/vigouroux/yuv/get_blue.hh (revision 2172) +++ sandbox/vigouroux/yuv/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yuv/get_red.hh --- sandbox/vigouroux/yuv/get_red.hh (revision 2172) +++ sandbox/vigouroux/yuv/get_red.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yuv/rgb_to_yuv.hh --- sandbox/vigouroux/yuv/rgb_to_yuv.hh (revision 2172) +++ sandbox/vigouroux/yuv/rgb_to_yuv.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yuv/get_green.hh --- sandbox/vigouroux/yuv/get_green.hh (revision 2172) +++ sandbox/vigouroux/yuv/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/hsi/get_blue.hh --- sandbox/vigouroux/hsi/get_blue.hh (revision 2172) +++ sandbox/vigouroux/hsi/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/hsi/get_red.hh --- sandbox/vigouroux/hsi/get_red.hh (revision 2172) +++ sandbox/vigouroux/hsi/get_red.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/hsi/rgb_to_hsi.hh --- sandbox/vigouroux/hsi/rgb_to_hsi.hh (revision 2172) +++ sandbox/vigouroux/hsi/rgb_to_hsi.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/hsi/get_green.hh --- sandbox/vigouroux/hsi/get_green.hh (revision 2172) +++ sandbox/vigouroux/hsi/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/function.hh --- sandbox/vigouroux/function.hh (revision 2172) +++ sandbox/vigouroux/function.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/tests.cc --- sandbox/vigouroux/tests.cc (revision 2172) +++ sandbox/vigouroux/tests.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/cmy/rgb_to_cmy.hh --- sandbox/vigouroux/cmy/rgb_to_cmy.hh (revision 2172) +++ sandbox/vigouroux/cmy/rgb_to_cmy.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/cmy/get_blue.hh --- sandbox/vigouroux/cmy/get_blue.hh (revision 2172) +++ sandbox/vigouroux/cmy/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/cmy/fun.hh --- sandbox/vigouroux/cmy/fun.hh (revision 2172) +++ sandbox/vigouroux/cmy/fun.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/cmy/get_green.hh --- sandbox/vigouroux/cmy/get_green.hh (revision 2172) +++ sandbox/vigouroux/cmy/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/xyz/rgb_to_xyz.hh --- sandbox/vigouroux/xyz/rgb_to_xyz.hh (revision 2172) +++ sandbox/vigouroux/xyz/rgb_to_xyz.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/xyz/get_blue.hh --- sandbox/vigouroux/xyz/get_blue.hh (revision 2172) +++ sandbox/vigouroux/xyz/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/xyz/get_red.hh --- sandbox/vigouroux/xyz/get_red.hh (revision 2172) +++ sandbox/vigouroux/xyz/get_red.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/xyz/get_green.hh --- sandbox/vigouroux/xyz/get_green.hh (revision 2172) +++ sandbox/vigouroux/xyz/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yiq/get_blue.hh --- sandbox/vigouroux/yiq/get_blue.hh (revision 2172) +++ sandbox/vigouroux/yiq/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yiq/get_red.hh --- sandbox/vigouroux/yiq/get_red.hh (revision 2172) +++ sandbox/vigouroux/yiq/get_red.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yiq/rgb_to_yiq.hh --- sandbox/vigouroux/yiq/rgb_to_yiq.hh (revision 2172) +++ sandbox/vigouroux/yiq/rgb_to_yiq.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yiq/get_green.hh --- sandbox/vigouroux/yiq/get_green.hh (revision 2172) +++ sandbox/vigouroux/yiq/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/load.cc --- sandbox/vigouroux/load.cc (revision 2172) +++ sandbox/vigouroux/load.cc (working copy) @@ -11,7 +11,7 @@ #include <mln/math/round.hh> #include <mln/level/transform.hh> -#include <mln/core/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_float.hh> #include <mln/border/thickness.hh> #include <mln/linear/convolve.hh> Index: sandbox/vigouroux/conv/getred.hh --- sandbox/vigouroux/conv/getred.hh (revision 2172) +++ sandbox/vigouroux/conv/getred.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/conv/tored.hh --- sandbox/vigouroux/conv/tored.hh (revision 2172) +++ sandbox/vigouroux/conv/tored.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/conv/torgb.hh --- sandbox/vigouroux/conv/torgb.hh (revision 2172) +++ sandbox/vigouroux/conv/torgb.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/conv/rgbto.hh --- sandbox/vigouroux/conv/rgbto.hh (revision 2172) +++ sandbox/vigouroux/conv/rgbto.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_hsl.hh --- sandbox/vigouroux/color/rgb_to_hsl.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_hsl.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_cmy.hh --- sandbox/vigouroux/color/rgb_to_cmy.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_cmy.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_xyz.hh --- sandbox/vigouroux/color/rgb_to_xyz.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_xyz.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/tests.cc --- sandbox/vigouroux/color/tests.cc (revision 2172) +++ sandbox/vigouroux/color/tests.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_hsv.hh --- sandbox/vigouroux/color/rgb_to_hsv.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_hsv.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_yiq.hh --- sandbox/vigouroux/color/rgb_to_yiq.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_yiq.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_hsi.hh --- sandbox/vigouroux/color/rgb_to_hsi.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_hsi.hh (working copy) @@ -3,7 +3,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_yuv.hh --- sandbox/vigouroux/color/rgb_to_yuv.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_yuv.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2172) +++ sandbox/garrigues/level_set.hh (working copy) @@ -40,11 +40,11 @@ # include "upper.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/core/site_set/p_set.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/core/pset_if_piter.hh> # include <mln/core/site_set/pset_if.hh> Index: sandbox/garrigues/fllt/test_fllt_lena_tiles.cc --- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt10.cc --- sandbox/garrigues/fllt/test_fllt10.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt10.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/lower.hh --- sandbox/garrigues/fllt/lower.hh (revision 2172) +++ sandbox/garrigues/fllt/lower.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/labeling/regional_minima.hh> # include <mln/accu/min.hh> Index: sandbox/garrigues/fllt/test_fllt12.cc --- sandbox/garrigues/fllt/test_fllt12.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt12.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/upper.hh --- sandbox/garrigues/fllt/upper.hh (revision 2172) +++ sandbox/garrigues/fllt/upper.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/labeling/regional_maxima.hh> # include <mln/accu/max.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.1.cc --- sandbox/garrigues/fllt/fllt_simple.svg.1.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_simple.svg.1.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.3.cc --- sandbox/garrigues/fllt/fllt_simple.svg.3.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/test_fllt10_inv.cc --- sandbox/garrigues/fllt/test_fllt10_inv.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt10_inv.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/fllt_theo.cc --- sandbox/garrigues/fllt/fllt_theo.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_theo.cc (working copy) @@ -30,7 +30,7 @@ #include <sstream> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/test_fllt3.cc --- sandbox/garrigues/fllt/test_fllt3.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt3.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt5.cc --- sandbox/garrigues/fllt/test_fllt5.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt5.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt7.cc --- sandbox/garrigues/fllt/test_fllt7.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt7.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt9.cc --- sandbox/garrigues/fllt/test_fllt9.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt9.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt3_inv.cc --- sandbox/garrigues/fllt/test_fllt3_inv.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt3_inv.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt_lena.cc --- sandbox/garrigues/fllt/test_fllt_lena.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt_lena.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt.cc --- sandbox/garrigues/fllt/test_fllt.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_flltb.cc --- sandbox/garrigues/fllt/test_flltb.cc (revision 2172) +++ sandbox/garrigues/fllt/test_flltb.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt7_inv.cc --- sandbox/garrigues/fllt/test_fllt7_inv.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt7_inv.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt13.cc --- sandbox/garrigues/fllt/test_fllt13.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt13.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt15.cc --- sandbox/garrigues/fllt/test_fllt15.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt15.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.2.cc --- sandbox/garrigues/fllt/fllt_simple.svg.2.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2172) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_set.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/pset_if_piter.hh> # include <mln/core/site_set/pset_if.hh> # include <mln/core/image/sub_image.hh> Index: sandbox/garrigues/fllt/test.cc --- sandbox/garrigues/fllt/test.cc (revision 2172) +++ sandbox/garrigues/fllt/test.cc (working copy) @@ -9,7 +9,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/give_confs.cc --- sandbox/garrigues/fllt/give_confs.cc (revision 2172) +++ sandbox/garrigues/fllt/give_confs.cc (working copy) @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/core/clock_neighb2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/level.hh> #include <mln/level/fill.hh> Index: sandbox/garrigues/fllt/test_fllt2.cc --- sandbox/garrigues/fllt/test_fllt2.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt2.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt4.cc --- sandbox/garrigues/fllt/test_fllt4.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt4.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt6.cc --- sandbox/garrigues/fllt/test_fllt6.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt6.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt8.cc --- sandbox/garrigues/fllt/test_fllt8.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt8.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/lower.hh --- sandbox/garrigues/lower.hh (revision 2172) +++ sandbox/garrigues/lower.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/accu/min.hh> # include <mln/labeling/regional_minima.hh> Index: sandbox/garrigues/tiled_image2d/tiled_image2d.hh --- sandbox/garrigues/tiled_image2d/tiled_image2d.hh (revision 2172) +++ sandbox/garrigues/tiled_image2d/tiled_image2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/image/inplace.hh> # include <mln/core/init.hh> # include <mln/core/line_piter.hh> Index: sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh --- sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh (revision 2172) +++ sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh (working copy) @@ -28,7 +28,7 @@ #ifndef layout_page2d_lrtb_hh #define layout_page2d_lrtb_hh -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> namespace mln { Index: sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh --- sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh (revision 2172) +++ sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh (working copy) @@ -28,7 +28,7 @@ #ifndef layout_image2d_lrtb_hh #define layout_image2d_lrtb_hh -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> namespace mln { Index: sandbox/garrigues/upper.hh --- sandbox/garrigues/upper.hh (revision 2172) +++ sandbox/garrigues/upper.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/accu/max.hh> # include <mln/labeling/regional_maxima.hh> Index: sandbox/garrigues/factures/extract_array_highlight.cc --- sandbox/garrigues/factures/extract_array_highlight.cc (revision 2172) +++ sandbox/garrigues/factures/extract_array_highlight.cc (working copy) @@ -45,7 +45,7 @@ #include <mln/labeling/level.hh> #include <mln/literal/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/accu/all.hh> Index: sandbox/garrigues/factures/extract_array.cc --- sandbox/garrigues/factures/extract_array.cc (revision 2172) +++ sandbox/garrigues/factures/extract_array.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/labeling/level.hh> #include <mln/literal/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/accu/all.hh> Index: sandbox/folio/test/psn.cc --- sandbox/folio/test/psn.cc (revision 2172) +++ sandbox/folio/test/psn.cc (working copy) @@ -154,7 +154,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/test/psn_log.cc --- sandbox/folio/test/psn_log.cc (revision 2172) +++ sandbox/folio/test/psn_log.cc (working copy) @@ -241,7 +241,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/test/dt_maze.cc --- sandbox/folio/test/dt_maze.cc (revision 2172) +++ sandbox/folio/test/dt_maze.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> Index: sandbox/folio/test/dt_bench.cc --- sandbox/folio/test/dt_bench.cc (revision 2172) +++ sandbox/folio/test/dt_bench.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/test/dt.cc --- sandbox/folio/test/dt.cc (revision 2172) +++ sandbox/folio/test/dt.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/psn.cc --- sandbox/folio/psn.cc (revision 2172) +++ sandbox/folio/psn.cc (working copy) @@ -154,7 +154,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/psn_log.cc --- sandbox/folio/psn_log.cc (revision 2172) +++ sandbox/folio/psn_log.cc (working copy) @@ -241,7 +241,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/dt.cc --- sandbox/folio/dt.cc (revision 2172) +++ sandbox/folio/dt.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/beguin/irm_g.cc --- sandbox/beguin/irm_g.cc (revision 2172) +++ sandbox/beguin/irm_g.cc (working copy) @@ -5,8 +5,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> Index: sandbox/beguin/fusion_graph.hh --- sandbox/beguin/fusion_graph.hh (revision 2172) +++ sandbox/beguin/fusion_graph.hh (working copy) @@ -9,8 +9,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> Index: sandbox/beguin/irm.cc --- sandbox/beguin/irm.cc (revision 2172) +++ sandbox/beguin/irm.cc (working copy) @@ -10,8 +10,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> Index: sandbox/abraham/tests/morpho/test_component_tree.cc --- sandbox/abraham/tests/morpho/test_component_tree.cc (revision 2172) +++ sandbox/abraham/tests/morpho/test_component_tree.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> Index: sandbox/abraham/tests/morpho/test_watershed.cc --- sandbox/abraham/tests/morpho/test_watershed.cc (revision 2172) +++ sandbox/abraham/tests/morpho/test_watershed.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/compare.hh> Index: sandbox/abraham/tests/morpho/test_watershed_topo.cc --- sandbox/abraham/tests/morpho/test_watershed_topo.cc (revision 2172) +++ sandbox/abraham/tests/morpho/test_watershed_topo.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> Index: sandbox/abraham/mln/io/tikz/save.hh --- sandbox/abraham/mln/io/tikz/save.hh (revision 2172) +++ sandbox/abraham/mln/io/tikz/save.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <mln/core/concept/image.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/value/graylevel.hh> # include <mln/value/rgb.hh>

15 years, 8 months

cleanup-2008 2172: Move image files in the proper core sub-directory.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move image files in the proper core sub-directory. Move image files from mln/core/ to mln/core/image/. * mln/core/bgraph_image.hh, * mln/core/bgraph_psite.hh, * mln/core/cast_image.hh, * mln/core/decorated_image.hh, * mln/core/fi_adaptor.hh, * mln/core/graph_elt_neighborhood.hh, * mln/core/graph_elt_window.hh, * mln/core/graph_image.hh, * mln/core/graph_neighborhood_piter.hh, * mln/core/graph_psite.hh, * mln/core/graph_window_piter.hh, * mln/core/hexa.hh, * mln/core/hexa_piter.hh, * mln/core/image1d.hh, * mln/core/image2d.hh, * mln/core/image2d_h.hh, * mln/core/image3d.hh, * mln/core/image_if.hh, * mln/core/inplace.hh, * mln/core/interpolated.hh, * mln/core/line_graph_elt_neighborhood.hh, * mln/core/line_graph_elt_window.hh, * mln/core/line_graph_image.hh, * mln/core/line_graph_neighborhood_piter.hh, * mln/core/line_graph_psite.hh, * mln/core/line_graph_window_piter.hh, * mln/core/mono_obased_rle_encode.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_encode.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_encode.hh, * mln/core/obased_rle_image.hh, * mln/core/plain.hh, * mln/core/rle_encode.hh, * mln/core/rle_image.hh, * mln/core/safe.hh, * mln/core/sparse_encode.hh, * mln/core/sparse_image.hh, * mln/core/sub_image.hh, * mln/core/t_image.hh, * mln/core/tr_image.hh, * mln/core/tr_mesh.hh, * mln/core/translate_image.hh, * mln/core/value_enc_image.hh, * mln/core/value_encode.hh: Rename as... * mln/core/image/bgraph_image.hh, * mln/core/image/bgraph_psite.hh, * mln/core/image/cast_image.hh, * mln/core/image/decorated_image.hh, * mln/core/image/fi_adaptor.hh, * mln/core/image/graph_elt_neighborhood.hh, * mln/core/image/graph_elt_window.hh, * mln/core/image/graph_image.hh, * mln/core/image/graph_neighborhood_piter.hh, * mln/core/image/graph_psite.hh, * mln/core/image/graph_window_piter.hh, * mln/core/image/hexa.hh, * mln/core/image/hexa_piter.hh, * mln/core/image/image1d.hh, * mln/core/image/image2d.hh, * mln/core/image/image2d_h.hh, * mln/core/image/image3d.hh, * mln/core/image/image_if.hh, * mln/core/image/inplace.hh, * mln/core/image/interpolated.hh, * mln/core/image/line_graph_elt_neighborhood.hh, * mln/core/image/line_graph_elt_window.hh, * mln/core/image/line_graph_image.hh, * mln/core/image/line_graph_neighborhood_piter.hh, * mln/core/image/line_graph_psite.hh, * mln/core/image/line_graph_window_piter.hh, * mln/core/image/mono_obased_rle_encode.hh, * mln/core/image/mono_obased_rle_image.hh, * mln/core/image/mono_rle_encode.hh, * mln/core/image/mono_rle_image.hh, * mln/core/image/obased_rle_encode.hh, * mln/core/image/obased_rle_image.hh, * mln/core/image/plain.hh, * mln/core/image/rle_encode.hh, * mln/core/image/rle_image.hh, * mln/core/image/safe.hh, * mln/core/image/sparse_encode.hh, * mln/core/image/sparse_image.hh, * mln/core/image/sub_image.hh, * mln/core/image/t_image.hh, * mln/core/image/tr_image.hh, * mln/core/image/tr_mesh.hh, * mln/core/image/translate_image.hh, * mln/core/image/value_enc_image.hh, * mln/core/image/value_encode.hh: ...these. Update guards and includes. * tools/seed2tiling.cc, * tools/area_flooding.cc, * tests/trait/image/images.cc, * tests/trait/ch_value.cc, * tests/debug/iota.cc, * tests/debug/println_with_border.cc, * tests/debug/println.cc, * tests/histo/compute.cc, * tests/histo/to_image1d.cc, * tests/core/graph_elt_neighborhood.cc, * tests/core/image_if_value.cc, * tests/core/window1d.cc, * tests/core/window2d.cc, * tests/core/clock_neighb2d.cc, * tests/core/window3d.cc, * tests/core/graph_image_wst.cc, * tests/core/image_if_interval.cc, * tests/core/bgraph_image.cc, * tests/core/mono_rle_image.cc, * tests/core/pixter2d_more.cc, * tests/core/cast_image.cc, * tests/core/point_set_compatibility.cc, * tests/core/pixter1d.cc, * tests/core/pixter2d.cc, * tests/core/obased_rle_image.cc, * tests/core/pixter3d.cc, * tests/core/graph_image.cc, * tests/core/pixel.cc, * tests/core/pixter3d_more.cc, * tests/core/pset_if.cc, * tests/core/mono_obased_rle_image.cc, * tests/core/sub_image.cc, * tests/core/graph_elt_window.cc, * tests/core/sparse_image.cc, * tests/core/clone.cc, * tests/core/plain.cc, * tests/core/t_image.cc, * tests/core/p_runs.cc, * tests/core/image1d.cc, * tests/core/fi_adaptor.cc, * tests/core/image2d.cc, * tests/core/image3d.cc, * tests/core/image2d_h.cc, * tests/core/clock_test.cc, * tests/core/decorated_image.cc, * tests/core/translate_image.cc, * tests/core/image_if.cc, * tests/core/initialize.cc, * tests/core/line_graph_elt_window.cc, * tests/core/value_enc_image.cc, * tests/core/line_graph_elt_neighborhood.cc, * tests/core/pset_array.cc, * tests/core/line_graph_image.cc, * tests/core/dpoints_pixter.cc, * tests/core/safe_image.cc, * tests/core/pixter1d_more.cc, * tests/core/rle_image.cc, * tests/core/hexa.cc, * tests/core/tr_image.cc, * tests/core/interpolated.cc, * tests/core/line_piter.cc, * tests/neighb/image.cc, * tests/draw/label.cc, * tests/draw/graph.cc, * tests/draw/line.cc, * tests/level/transform_full.cc, * tests/level/median.cc, * tests/level/compute_full.cc, * tests/level/sort_psites_full.cc, * tests/level/median_hline2d.cc, * tests/level/abs.cc, * tests/level/assign_full.cc, * tests/level/apply_full.cc, * tests/level/fill_full.cc, * tests/level/median_fast.cc, * tests/level/compute.cc, * tests/level/sort_psites.cc, * tests/level/assign.cc, * tests/level/approx/median.cc, * tests/level/fill.cc, * tests/level/abs_full.cc, * tests/level/memcpy_.cc, * tests/level/median_dir.cc, * tests/level/stretch_full.cc, * tests/level/paste_full.cc, * tests/level/compare_full.cc, * tests/level/saturate_full.cc, * tests/level/transform.cc, * tests/level/replace.cc, * tests/level/stretch.cc, * tests/level/paste.cc, * tests/level/fill_with_value.cc, * tests/level/naive/median.cc, * tests/level/take.cc, * tests/level/apply.cc, * tests/level/compare.cc, * tests/level/saturate.cc, * tests/level/memset_.cc, * tests/arith/minus.cc, * tests/arith/minus_full.cc, * tests/arith/times.cc, * tests/arith/times_full.cc, * tests/arith/plus.cc, * tests/arith/plus_full.cc, * tests/arith/revert.cc, * tests/arith/revert_full.cc, * tests/linear/convolve.cc, * tests/linear/lap.cc, * tests/linear/log.cc, * tests/linear/line_convolve.cc, * tests/linear/sobel.cc, * tests/linear/local/convolve.cc, * tests/linear/gaussian.cc, * tests/accu/pair.cc, * tests/accu/median.cc, * tests/accu/compute.cc, * tests/accu/mean.cc, * tests/accu/nil.cc, * tests/accu/min.cc, * tests/accu/max.cc, * tests/value/stack.cc, * tests/value/float01.cc, * tests/border/duplicate_full.cc, * tests/border/mirror_full.cc, * tests/border/equalize_full.cc, * tests/border/get_full.cc, * tests/border/resize.cc, * tests/border/find_full.cc, * tests/border/resize_image1d_1.cc, * tests/border/fill_full.cc, * tests/border/resize_image2d_1.cc, * tests/border/resize_image1d_2.cc, * tests/border/duplicate.cc, * tests/border/resize_image1d_3.cc, * tests/border/mirror.cc, * tests/border/resize_image3d_1.cc, * tests/border/resize_image2d_2.cc, * tests/border/resize_image2d_3.cc, * tests/border/resize_image3d_2.cc, * tests/border/adjust_full.cc, * tests/border/resize_image3d_3.cc, * tests/border/resize_sub_image.cc, * tests/border/equalize.cc, * tests/border/get.cc, * tests/border/find.cc, * tests/border/resize_image_if.cc, * tests/border/resize_full.cc, * tests/border/fill.cc, * tests/border/adjust.cc, * tests/test/positive.cc, * tests/convert/to_p_set.cc, * tests/convert/to_tiles.cc, * tests/convert/to_image.cc, * tests/convert/to_window.cc, * tests/estim/mean.cc, * tests/pw/value.cc, * tests/geom/max_sli.cc, * tests/geom/resize.cc, * tests/geom/nrows.cc, * tests/geom/seed2tiling_roundness.cc, * tests/geom/seed2tiling.cc, * tests/geom/min_row.cc, * tests/geom/ninds.cc, * tests/geom/max_row.cc, * tests/geom/min_ind.cc, * tests/geom/ncols.cc, * tests/geom/max_ind.cc, * tests/geom/min_col.cc, * tests/geom/max_col.cc, * tests/geom/nslis.cc, * tests/geom/min_sli.cc, * tests/fun/x2x/rotation.cc, * tests/fun/v2v/rgb_hsi_conversion.cc, * tests/binarization/threshold.cc, * tests/morpho/contrast.cc, * tests/morpho/meyer_wst_long.cc, * tests/morpho/gradient.cc, * tests/morpho/artificial_line_graph_image_wst.cc, * tests/morpho/rank_filter.cc, * tests/morpho/dilation.cc, * tests/morpho/line_graph_image_wst.cc, * tests/morpho/meyer_wst.cc, * tests/morpho/thinning.cc, * tests/morpho/erosion.cc, * tests/morpho/dilation_max_h.cc, * tests/morpho/hit_or_miss.cc, * tests/morpho/combined.cc, * tests/morpho/gradient_elementary.cc, * tests/morpho/laplacian.cc, * tests/morpho/closing_volume.cc, * tests/morpho/closing_area.cc, * tests/morpho/closing_height.cc, * tests/morpho/opening_volume.cc, * tests/morpho/opening_area.cc, * tests/morpho/lena_line_graph_image_wst1.cc, * tests/morpho/opening_height.cc, * tests/morpho/erosion_min_h.cc, * tests/morpho/lena_line_graph_image_wst2.cc, * tests/display/show.cc, * tests/display/save_and_show.cc, * tests/display/color_pretty.cc, * tests/io/pgm/pgm27.cc, * tests/io/pgm/pgm19.cc, * tests/io/pgm/pgm.cc, * tests/io/pgm/pgm16.cc, * tests/io/fits/fits.cc, * tests/io/ppm/ppm.cc, * tests/io/ppm/ppm23.cc, * tests/io/ppm/ppm16.cc, * tests/io/pbm/pbm.cc, * tests/logical/or.cc, * tests/logical/not.cc, * tests/logical/or_full.cc, * tests/logical/and_not.cc, * tests/logical/and.cc, * tests/logical/not_full.cc, * tests/logical/and_not_full.cc, * tests/logical/and_full.cc, * tests/canvas/chamfer.cc, * tests/canvas/browsing/directional.cc, * tests/canvas/browsing/fwd.cc, * tests/canvas/browsing/snake_fwd.cc, * tests/util/tree_to_image.cc, * tests/util/branch_iter_ind.cc, * tests/util/lemmings.cc, * tests/util/tree_fast_to_image.cc, * tests/util/branch_iter.cc, * tests/labeling/regional_maxima.cc, * tests/labeling/background.cc, * tests/labeling/blobs.cc, * tests/labeling/flat_zones.cc, * tests/labeling/level.cc, * tests/labeling/foreground.cc, * tests/labeling/regional_minima.cc, * apps/statues/mesh-segm.cc, * apps/statues/mesh-skel.cc, * doc/tutorial/examples/sub_image.cc, * doc/tutorial/examples/p_line2d.cc, * doc/tutorial/examples/p_array.cc, * doc/tutorial/examples/p_array.2.cc, * doc/tutorial/examples/image_if.cc, * doc/tutorial/examples/p_image.cc, * doc/tutorial/examples/p_queue.cc, * doc/tutorial/examples/image_plain.cc, * doc/tutorial/examples/p_vaccess.cc, * doc/tutorial/examples/window.cc, * doc/tutorial/examples/p_key.cc, * doc/tutorial/examples/p_key.2.cc, * doc/tutorial/examples/image2d.cc, * doc/tutorial/examples/image_safe.cc, * doc/tutorial/examples/proxy.cc, * doc/tutorial/examples/p_run.cc, * doc/tutorial/examples/box.cc, * doc/tutorial/examples/image_flat.cc, * doc/tutorial/examples/p_mutable_array_of.cc, * doc/benchmark/p_runs.cc, * doc/benchmark/image2d.cc, * doc/examples/labeling_algo.cc, * mln/debug/put_word.hh, * mln/core/internal/graph_vicinity_piter.hh, * mln/core/internal/line_graph_vicinity_piter.hh, * mln/core/p_image2d.hh, * mln/core/site_set/p_bgraph.hh, * mln/core/site_set/p_graph_piter.hh, * mln/core/site_set/p_bgraph_piter.hh, * mln/core/site_set/p_line_graph.hh, * mln/core/site_set/p_line_graph_piter.hh, * mln/core/site_set/p_graph.hh, * mln/draw/graph.hh, * mln/level/fill_with_image.hh, * mln/level/replace.hh, * mln/level/paste.hh, * mln/level/fill.spe.hh, * mln/level/fill_with_value.hh, * mln/linear/line_x2_convolve.hh, * mln/accu/count_adjacent_vertices.hh, * mln/accu/rank.hh, * mln/accu/rank_high_quant.hh, * mln/accu/rank_bool.hh, * mln/border/mirror.hh, * mln/make/image1d.hh, * mln/make/image2d.hh, * mln/convert/to_tiles.hh, * mln/convert/to_image.hh, * mln/convert/to_window.hh, * mln/geom/chamfer.hh, * mln/morpho/opening_area_on_vertices.hh, * mln/morpho/line_gradient.hh, * mln/morpho/closing_area_on_vertices.hh, * mln/display/color_pretty.hh, * mln/display/remove.hh, * mln/display/save.hh, * mln/display/show.hh, * mln/io/pfm/load.hh, * mln/io/pgm/load.hh, * mln/io/fits/load.hh, * mln/io/pnm/load.hh, * mln/io/ppm/load.hh, * mln/io/pbm/load.hh, * sandbox/duhamel/main_mesh_image.cc, * sandbox/duhamel/queue_p_priority.cc, * sandbox/duhamel/graph_labeling.hh, * sandbox/duhamel/translate_image.hh, * sandbox/duhamel/slow_seed2tiling.cc, * sandbox/duhamel/labeling_algo.cc, * sandbox/duhamel/main.cc, * sandbox/duhamel/paste.hh, * sandbox/duhamel/color_sub.cc, * sandbox/duhamel/chamfer.cc, * sandbox/duhamel/mem.hh, * sandbox/duhamel/labeling_algo.hh, * sandbox/duhamel/extract_array.cc, * sandbox/duhamel/abr_to_image.cc, * sandbox/duhamel/translate_image.cc, * sandbox/pellegrin/first_test.cc, * sandbox/pellegrin/set/test/p_runs.cc, * sandbox/pellegrin/set/test/pset_if.cc, * sandbox/pellegrin/set/core/p_bgraph.hh, * sandbox/pellegrin/set/core/p_line_graph.hh, * sandbox/pellegrin/set/core/p_graph.hh, * sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc, * sandbox/aroumougame/skeleton/mesh-skel_region.cc, * sandbox/aroumougame/skeleton/miscellenous.hh, * sandbox/aroumougame/skeleton/test.cc, * sandbox/aroumougame/skeleton/test_image2d.cc, * sandbox/aroumougame/skeleton/mesh-skel.cc, * sandbox/aroumougame/skeleton/test_image3d.cc, * sandbox/aroumougame/skeleton/thinning.hh, * sandbox/aroumougame/skeleton/sedt.hh, * sandbox/nivault/rotation.cc, * sandbox/nivault/plugin-gimp/src/build-image.hh, * sandbox/nivault/extract_score.cc, * sandbox/nivault/extract_character.cc, * sandbox/nivault/median.hh, * sandbox/jardonnet/test/reduce.cc, * sandbox/jardonnet/test/icp_ref.cc, * sandbox/jardonnet/test/gaussian.cc, * sandbox/jardonnet/test/icp.cc, * sandbox/jardonnet/test/gaussian_subsampling.cc, * sandbox/jardonnet/test/test.cc, * sandbox/jardonnet/test/type.cc, * sandbox/jardonnet/test/subsampling.cc, * sandbox/jardonnet/registration/chamfer.hh, * sandbox/geraud/fllt/fllt.hh, * sandbox/geraud/fllt/fllt.svg.1.cc, * sandbox/geraud/fllt/fllt.svg.7.hh, * sandbox/geraud/fllt/fllt.svg.2.cc, * sandbox/geraud/fllt/fllt.svg.3.cc, * sandbox/geraud/fllt/fllt.svg.4.cc, * sandbox/geraud/fllt/fllt.svg.5.cc, * sandbox/geraud/fllt/fllt.svg.6.cc, * sandbox/geraud/fllt/fllt_test.hh, * sandbox/geraud/fllt.svg.7.hh, * sandbox/geraud/dmap.cc, * sandbox/geraud/fllt.svg.6.cc, * sandbox/geraud/win_fun.cc, * sandbox/geraud/irm.cc, * sandbox/geraud/cs2d/tuto.cc, * sandbox/geraud/cs2d/kruskal.cc, * sandbox/geraud/cs2d/dbl_neighb.cc, * sandbox/geraud/cs2d/cs2d.hh, * sandbox/geraud/cs2d/tuto_bis.cc, * sandbox/geraud/max_tree_nnodes.cc, * sandbox/vigouroux/yuv/test.cc, * sandbox/vigouroux/yuv/get_blue.hh, * sandbox/vigouroux/yuv/get_red.hh, * sandbox/vigouroux/yuv/testfun.cc, * sandbox/vigouroux/yuv/rgb_to_yuv.hh, * sandbox/vigouroux/yuv/get_green.hh, * sandbox/vigouroux/hsi/get_blue.hh, * sandbox/vigouroux/hsi/get_red.hh, * sandbox/vigouroux/hsi/rgb_to_hsi.hh, * sandbox/vigouroux/hsi/get_green.hh, * sandbox/vigouroux/function.hh, * sandbox/vigouroux/tests.cc, * sandbox/vigouroux/cmy/rgb_to_cmy.hh, * sandbox/vigouroux/cmy/test.cc, * sandbox/vigouroux/cmy/get_blue.hh, * sandbox/vigouroux/cmy/fun.hh, * sandbox/vigouroux/cmy/testfun.cc, * sandbox/vigouroux/cmy/get_green.hh, * sandbox/vigouroux/xyz/test.cc, * sandbox/vigouroux/xyz/rgb_to_xyz.hh, * sandbox/vigouroux/xyz/get_blue.hh, * sandbox/vigouroux/xyz/get_red.hh, * sandbox/vigouroux/xyz/testfun.cc, * sandbox/vigouroux/xyz/get_green.hh, * sandbox/vigouroux/moyenne.cc, * sandbox/vigouroux/lap.cc, * sandbox/vigouroux/yiq/test.cc, * sandbox/vigouroux/yiq/get_blue.hh, * sandbox/vigouroux/yiq/get_red.hh, * sandbox/vigouroux/yiq/rgb_to_yiq.hh, * sandbox/vigouroux/yiq/testfun.cc, * sandbox/vigouroux/yiq/get_green.hh, * sandbox/vigouroux/color.cc, * sandbox/vigouroux/load.cc, * sandbox/vigouroux/conv/test.cc, * sandbox/vigouroux/conv/getred.hh, * sandbox/vigouroux/conv/tored.hh, * sandbox/vigouroux/conv/torgb.hh, * sandbox/vigouroux/conv/rgbto.hh, * sandbox/vigouroux/gradation.hh, * sandbox/vigouroux/testfun.cc, * sandbox/vigouroux/color/rgb_to_hsl.hh, * sandbox/vigouroux/color/rgb_to_cmy.hh, * sandbox/vigouroux/color/rgb_to_xyz.hh, * sandbox/vigouroux/color/tests.cc, * sandbox/vigouroux/color/rgb_to_hsv.hh, * sandbox/vigouroux/color/rgb_to_yiq.hh, * sandbox/vigouroux/color/rgb_to_hsi.hh, * sandbox/vigouroux/color/rgb_to_yuv.hh, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/test_fllt_lena_tiles.cc, * sandbox/garrigues/fllt/test_fllt10.cc, * sandbox/garrigues/fllt/test_fllt_tiny.cc, * sandbox/garrigues/fllt/test_fllt12.cc, * sandbox/garrigues/fllt/essai.cc, * sandbox/garrigues/fllt/fllt_simple.svg.1.cc, * sandbox/garrigues/fllt/fllt_simple.svg.3.cc, * sandbox/garrigues/fllt/fllt_simple.cc, * sandbox/garrigues/fllt/test_fllt10_inv.cc, * sandbox/garrigues/fllt/fllt_theo.cc, * sandbox/garrigues/fllt/test_fllt3.cc, * sandbox/garrigues/fllt/test_fllt5.cc, * sandbox/garrigues/fllt/test_fllt7.cc, * sandbox/garrigues/fllt/test_fllt9.cc, * sandbox/garrigues/fllt/fllt_merge.hh, * sandbox/garrigues/fllt/test_fllt3_inv.cc, * sandbox/garrigues/fllt/test_fllt_lena.cc, * sandbox/garrigues/fllt/test_fllt.cc, * sandbox/garrigues/fllt/test_flltb.cc, * sandbox/garrigues/fllt/test_fllt7_inv.cc, * sandbox/garrigues/fllt/test_fllt13.cc, * sandbox/garrigues/fllt/test_fllt15.cc, * sandbox/garrigues/fllt/fllt_simple.svg.2.cc, * sandbox/garrigues/fllt/fllt.hh, * sandbox/garrigues/fllt/test.cc, * sandbox/garrigues/fllt/give_confs.cc, * sandbox/garrigues/fllt/test_fllt2.cc, * sandbox/garrigues/fllt/test_fllt4.cc, * sandbox/garrigues/fllt/test_fllt6.cc, * sandbox/garrigues/fllt/test_fllt8.cc, * sandbox/garrigues/tiled_image2d/tiled_image2d.hh, * sandbox/garrigues/tiled_image2d/tiled_image2d.cc, * sandbox/garrigues/image_identity/interpolated.hh, * sandbox/garrigues/factures/extract_array_highlight.cc, * sandbox/garrigues/factures/extract_array.cc, * sandbox/folio/test/psn.cc, * sandbox/folio/test/psn_log.cc, * sandbox/folio/test/naive.cc, * sandbox/folio/test/dt_maze.cc, * sandbox/folio/test/chamfer.cc, * sandbox/folio/test/dt_bench.cc, * sandbox/folio/test/dt.cc, * sandbox/folio/psn.cc, * sandbox/folio/psn_log.cc, * sandbox/folio/naive.cc, * sandbox/folio/chamfer.cc, * sandbox/folio/dt.cc, * sandbox/beguin/irm_g.cc, * sandbox/beguin/fusion_graph.hh, * sandbox/beguin/irm.cc, * sandbox/abraham/tests/morpho/test_component_tree.cc, * sandbox/abraham/tests/morpho/test_watershed.cc, * sandbox/abraham/tests/morpho/test_watershed_topo.cc, * sandbox/abraham/tests/io/tikz/tikz.cc, * sandbox/abraham/mln/morpho/basic_najman.hh: Update. apps/statues/mesh-segm.cc | 4 ++-- apps/statues/mesh-skel.cc | 4 ++-- doc/benchmark/image2d.cc | 2 +- doc/benchmark/p_runs.cc | 2 +- doc/examples/labeling_algo.cc | 4 ++-- doc/tutorial/examples/box.cc | 2 +- doc/tutorial/examples/image2d.cc | 2 +- doc/tutorial/examples/image_flat.cc | 2 +- doc/tutorial/examples/image_if.cc | 4 ++-- doc/tutorial/examples/image_plain.cc | 4 ++-- doc/tutorial/examples/image_safe.cc | 4 ++-- doc/tutorial/examples/p_array.2.cc | 2 +- doc/tutorial/examples/p_array.cc | 2 +- doc/tutorial/examples/p_image.cc | 2 +- doc/tutorial/examples/p_key.2.cc | 2 +- doc/tutorial/examples/p_key.cc | 2 +- doc/tutorial/examples/p_line2d.cc | 4 ++-- doc/tutorial/examples/p_mutable_array_of.cc | 4 ++-- doc/tutorial/examples/p_queue.cc | 2 +- doc/tutorial/examples/p_run.cc | 4 ++-- doc/tutorial/examples/p_vaccess.cc | 4 ++-- doc/tutorial/examples/proxy.cc | 2 +- doc/tutorial/examples/sub_image.cc | 4 ++-- doc/tutorial/examples/window.cc | 2 +- mln/accu/count_adjacent_vertices.hh | 2 +- mln/accu/rank.hh | 2 +- mln/accu/rank_bool.hh | 2 +- mln/accu/rank_high_quant.hh | 2 +- mln/border/mirror.hh | 6 +++--- mln/convert/to_image.hh | 6 +++--- mln/convert/to_tiles.hh | 2 +- mln/convert/to_window.hh | 4 ++-- mln/core/image/bgraph_image.hh | 10 +++++----- mln/core/image/bgraph_psite.hh | 8 ++++---- mln/core/image/cast_image.hh | 8 ++++---- mln/core/image/decorated_image.hh | 8 ++++---- mln/core/image/fi_adaptor.hh | 8 ++++---- mln/core/image/graph_elt_neighborhood.hh | 12 ++++++------ mln/core/image/graph_elt_window.hh | 12 ++++++------ mln/core/image/graph_image.hh | 10 +++++----- mln/core/image/graph_neighborhood_piter.hh | 8 ++++---- mln/core/image/graph_psite.hh | 8 ++++---- mln/core/image/graph_window_piter.hh | 8 ++++---- mln/core/image/hexa.hh | 10 +++++----- mln/core/image/hexa_piter.hh | 10 +++++----- mln/core/image/image1d.hh | 8 ++++---- mln/core/image/image2d.hh | 8 ++++---- mln/core/image/image2d_h.hh | 12 ++++++------ mln/core/image/image3d.hh | 8 ++++---- mln/core/image/image_if.hh | 8 ++++---- mln/core/image/inplace.hh | 8 ++++---- mln/core/image/interpolated.hh | 8 ++++---- mln/core/image/line_graph_elt_neighborhood.hh | 12 ++++++------ mln/core/image/line_graph_elt_window.hh | 12 ++++++------ mln/core/image/line_graph_image.hh | 10 +++++----- mln/core/image/line_graph_neighborhood_piter.hh | 8 ++++---- mln/core/image/line_graph_psite.hh | 8 ++++---- mln/core/image/line_graph_window_piter.hh | 8 ++++---- mln/core/image/mono_obased_rle_encode.hh | 10 +++++----- mln/core/image/mono_obased_rle_image.hh | 10 +++++----- mln/core/image/mono_rle_encode.hh | 10 +++++----- mln/core/image/mono_rle_image.hh | 8 ++++---- mln/core/image/obased_rle_encode.hh | 10 +++++----- mln/core/image/obased_rle_image.hh | 8 ++++---- mln/core/image/plain.hh | 8 ++++---- mln/core/image/rle_encode.hh | 10 +++++----- mln/core/image/rle_image.hh | 8 ++++---- mln/core/image/safe.hh | 8 ++++---- mln/core/image/sparse_encode.hh | 10 +++++----- mln/core/image/sparse_image.hh | 8 ++++---- mln/core/image/sub_image.hh | 8 ++++---- mln/core/image/t_image.hh | 8 ++++---- mln/core/image/tr_image.hh | 8 ++++---- mln/core/image/tr_mesh.hh | 8 ++++---- mln/core/image/translate_image.hh | 8 ++++---- mln/core/image/value_enc_image.hh | 2 +- mln/core/image/value_encode.hh | 10 +++++----- mln/core/internal/graph_vicinity_piter.hh | 2 +- mln/core/internal/line_graph_vicinity_piter.hh | 2 +- mln/core/p_image2d.hh | 4 ++-- mln/core/site_set/p_bgraph.hh | 2 +- mln/core/site_set/p_bgraph_piter.hh | 2 +- mln/core/site_set/p_graph.hh | 2 +- mln/core/site_set/p_graph_piter.hh | 2 +- mln/core/site_set/p_line_graph.hh | 2 +- mln/core/site_set/p_line_graph_piter.hh | 2 +- mln/debug/println.spe.hh | 4 ++-- mln/debug/put_word.hh | 2 +- mln/display/color_pretty.hh | 2 +- mln/display/remove.hh | 2 +- mln/display/save.hh | 2 +- mln/display/show.hh | 2 +- mln/draw/graph.hh | 4 ++-- mln/geom/chamfer.hh | 4 ++-- mln/io/fits/load.hh | 2 +- mln/io/pbm/load.hh | 2 +- mln/io/pfm/load.hh | 2 +- mln/io/pgm/load.hh | 2 +- mln/io/pnm/load.hh | 2 +- mln/io/ppm/load.hh | 2 +- mln/level/fill.spe.hh | 2 +- mln/level/fill_with_image.hh | 2 +- mln/level/fill_with_value.hh | 2 +- mln/level/paste.hh | 2 +- mln/level/replace.hh | 2 +- mln/linear/line_x2_convolve.hh | 2 +- mln/make/image1d.hh | 2 +- mln/make/image2d.hh | 2 +- mln/morpho/closing_area_on_vertices.hh | 2 +- mln/morpho/line_gradient.hh | 4 ++-- mln/morpho/opening_area_on_vertices.hh | 2 +- sandbox/abraham/mln/morpho/basic_najman.hh | 2 +- sandbox/abraham/tests/io/tikz/tikz.cc | 2 +- sandbox/abraham/tests/morpho/test_component_tree.cc | 2 +- sandbox/abraham/tests/morpho/test_watershed.cc | 2 +- sandbox/abraham/tests/morpho/test_watershed_topo.cc | 2 +- sandbox/aroumougame/skeleton/mesh-skel.cc | 4 ++-- sandbox/aroumougame/skeleton/mesh-skel_region.cc | 4 ++-- sandbox/aroumougame/skeleton/miscellenous.hh | 2 +- sandbox/aroumougame/skeleton/sedt.hh | 4 ++-- sandbox/aroumougame/skeleton/test.cc | 2 +- sandbox/aroumougame/skeleton/test_image2d.cc | 4 ++-- sandbox/aroumougame/skeleton/test_image3d.cc | 6 +++--- sandbox/aroumougame/skeleton/thinning.hh | 4 ++-- sandbox/beguin/fusion_graph.hh | 4 ++-- sandbox/beguin/irm.cc | 4 ++-- sandbox/beguin/irm_g.cc | 4 ++-- sandbox/duhamel/abr_to_image.cc | 2 +- sandbox/duhamel/chamfer.cc | 4 ++-- sandbox/duhamel/color_sub.cc | 8 ++++---- sandbox/duhamel/extract_array.cc | 2 +- sandbox/duhamel/graph_labeling.hh | 2 +- sandbox/duhamel/labeling_algo.cc | 2 +- sandbox/duhamel/labeling_algo.hh | 2 +- sandbox/duhamel/main.cc | 2 +- sandbox/duhamel/main_mesh_image.cc | 2 +- sandbox/duhamel/mem.hh | 8 ++++---- sandbox/duhamel/paste.hh | 8 ++++---- sandbox/duhamel/queue_p_priority.cc | 2 +- sandbox/duhamel/slow_seed2tiling.cc | 10 +++++----- sandbox/duhamel/translate_image.cc | 4 ++-- sandbox/duhamel/translate_image.hh | 8 ++++---- sandbox/folio/chamfer.cc | 2 +- sandbox/folio/dt.cc | 6 +++--- sandbox/folio/naive.cc | 2 +- sandbox/folio/psn.cc | 6 +++--- sandbox/folio/psn_log.cc | 6 +++--- sandbox/folio/test/chamfer.cc | 2 +- sandbox/folio/test/dt.cc | 6 +++--- sandbox/folio/test/dt_bench.cc | 6 +++--- sandbox/folio/test/dt_maze.cc | 6 +++--- sandbox/folio/test/naive.cc | 2 +- sandbox/folio/test/psn.cc | 6 +++--- sandbox/folio/test/psn_log.cc | 6 +++--- sandbox/garrigues/factures/extract_array.cc | 4 ++-- sandbox/garrigues/factures/extract_array_highlight.cc | 4 ++-- sandbox/garrigues/fllt/essai.cc | 4 ++-- sandbox/garrigues/fllt/fllt.hh | 8 ++++---- sandbox/garrigues/fllt/fllt_merge.hh | 2 +- sandbox/garrigues/fllt/fllt_simple.cc | 6 +++--- sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 6 +++--- sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 6 +++--- sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 6 +++--- sandbox/garrigues/fllt/fllt_theo.cc | 4 ++-- sandbox/garrigues/fllt/give_confs.cc | 2 +- sandbox/garrigues/fllt/test.cc | 4 ++-- sandbox/garrigues/fllt/test_fllt.cc | 2 +- sandbox/garrigues/fllt/test_fllt10.cc | 2 +- sandbox/garrigues/fllt/test_fllt10_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt12.cc | 2 +- sandbox/garrigues/fllt/test_fllt13.cc | 2 +- sandbox/garrigues/fllt/test_fllt15.cc | 2 +- sandbox/garrigues/fllt/test_fllt2.cc | 2 +- sandbox/garrigues/fllt/test_fllt3.cc | 2 +- sandbox/garrigues/fllt/test_fllt3_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt4.cc | 2 +- sandbox/garrigues/fllt/test_fllt5.cc | 2 +- sandbox/garrigues/fllt/test_fllt6.cc | 2 +- sandbox/garrigues/fllt/test_fllt7.cc | 2 +- sandbox/garrigues/fllt/test_fllt7_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt8.cc | 2 +- sandbox/garrigues/fllt/test_fllt9.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc | 2 +- sandbox/garrigues/fllt/test_fllt_tiny.cc | 2 +- sandbox/garrigues/fllt/test_flltb.cc | 2 +- sandbox/garrigues/image_identity/interpolated.hh | 8 ++++---- sandbox/garrigues/level_set.hh | 8 ++++---- sandbox/garrigues/tiled_image2d/tiled_image2d.cc | 2 +- sandbox/garrigues/tiled_image2d/tiled_image2d.hh | 2 +- sandbox/geraud/cs2d/cs2d.hh | 4 ++-- sandbox/geraud/cs2d/dbl_neighb.cc | 2 +- sandbox/geraud/cs2d/kruskal.cc | 6 +++--- sandbox/geraud/cs2d/tuto.cc | 4 ++-- sandbox/geraud/cs2d/tuto_bis.cc | 6 +++--- sandbox/geraud/dmap.cc | 2 +- sandbox/geraud/fllt.svg.6.cc | 6 +++--- sandbox/geraud/fllt.svg.7.hh | 6 +++--- sandbox/geraud/fllt/fllt.hh | 6 +++--- sandbox/geraud/fllt/fllt.svg.1.cc | 2 +- sandbox/geraud/fllt/fllt.svg.2.cc | 2 +- sandbox/geraud/fllt/fllt.svg.3.cc | 4 ++-- sandbox/geraud/fllt/fllt.svg.4.cc | 4 ++-- sandbox/geraud/fllt/fllt.svg.5.cc | 4 ++-- sandbox/geraud/fllt/fllt.svg.6.cc | 6 +++--- sandbox/geraud/fllt/fllt.svg.7.hh | 6 +++--- sandbox/geraud/fllt/fllt_test.hh | 6 +++--- sandbox/geraud/irm.cc | 4 ++-- sandbox/geraud/max_tree_nnodes.cc | 2 +- sandbox/geraud/win_fun.cc | 2 +- sandbox/jardonnet/registration/chamfer.hh | 2 +- sandbox/jardonnet/test/gaussian.cc | 2 +- sandbox/jardonnet/test/gaussian_subsampling.cc | 2 +- sandbox/jardonnet/test/icp.cc | 2 +- sandbox/jardonnet/test/icp_ref.cc | 2 +- sandbox/jardonnet/test/reduce.cc | 2 +- sandbox/jardonnet/test/subsampling.cc | 2 +- sandbox/jardonnet/test/test.cc | 2 +- sandbox/jardonnet/test/type.cc | 2 +- sandbox/nivault/extract_character.cc | 4 ++-- sandbox/nivault/extract_score.cc | 4 ++-- sandbox/nivault/median.hh | 2 +- sandbox/nivault/plugin-gimp/src/build-image.hh | 2 +- sandbox/nivault/rotation.cc | 2 +- sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc | 2 +- sandbox/pellegrin/first_test.cc | 2 +- sandbox/pellegrin/set/core/p_bgraph.hh | 2 +- sandbox/pellegrin/set/core/p_graph.hh | 2 +- sandbox/pellegrin/set/core/p_line_graph.hh | 2 +- sandbox/pellegrin/set/test/p_runs.cc | 2 +- sandbox/pellegrin/set/test/pset_if.cc | 2 +- sandbox/vigouroux/cmy/fun.hh | 2 +- sandbox/vigouroux/cmy/get_blue.hh | 2 +- sandbox/vigouroux/cmy/get_green.hh | 2 +- sandbox/vigouroux/cmy/rgb_to_cmy.hh | 2 +- sandbox/vigouroux/cmy/test.cc | 2 +- sandbox/vigouroux/cmy/testfun.cc | 2 +- sandbox/vigouroux/color.cc | 2 +- sandbox/vigouroux/color/rgb_to_cmy.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsi.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsl.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsv.hh | 2 +- sandbox/vigouroux/color/rgb_to_xyz.hh | 2 +- sandbox/vigouroux/color/rgb_to_yiq.hh | 2 +- sandbox/vigouroux/color/rgb_to_yuv.hh | 2 +- sandbox/vigouroux/color/tests.cc | 2 +- sandbox/vigouroux/conv/getred.hh | 2 +- sandbox/vigouroux/conv/rgbto.hh | 2 +- sandbox/vigouroux/conv/test.cc | 2 +- sandbox/vigouroux/conv/tored.hh | 2 +- sandbox/vigouroux/conv/torgb.hh | 2 +- sandbox/vigouroux/function.hh | 2 +- sandbox/vigouroux/gradation.hh | 2 +- sandbox/vigouroux/hsi/get_blue.hh | 2 +- sandbox/vigouroux/hsi/get_green.hh | 2 +- sandbox/vigouroux/hsi/get_red.hh | 2 +- sandbox/vigouroux/hsi/rgb_to_hsi.hh | 2 +- sandbox/vigouroux/lap.cc | 2 +- sandbox/vigouroux/load.cc | 4 ++-- sandbox/vigouroux/moyenne.cc | 2 +- sandbox/vigouroux/testfun.cc | 2 +- sandbox/vigouroux/tests.cc | 2 +- sandbox/vigouroux/xyz/get_blue.hh | 2 +- sandbox/vigouroux/xyz/get_green.hh | 2 +- sandbox/vigouroux/xyz/get_red.hh | 2 +- sandbox/vigouroux/xyz/rgb_to_xyz.hh | 2 +- sandbox/vigouroux/xyz/test.cc | 2 +- sandbox/vigouroux/xyz/testfun.cc | 2 +- sandbox/vigouroux/yiq/get_blue.hh | 2 +- sandbox/vigouroux/yiq/get_green.hh | 2 +- sandbox/vigouroux/yiq/get_red.hh | 2 +- sandbox/vigouroux/yiq/rgb_to_yiq.hh | 2 +- sandbox/vigouroux/yiq/test.cc | 2 +- sandbox/vigouroux/yiq/testfun.cc | 2 +- sandbox/vigouroux/yuv/get_blue.hh | 2 +- sandbox/vigouroux/yuv/get_green.hh | 2 +- sandbox/vigouroux/yuv/get_red.hh | 2 +- sandbox/vigouroux/yuv/rgb_to_yuv.hh | 2 +- sandbox/vigouroux/yuv/test.cc | 2 +- sandbox/vigouroux/yuv/testfun.cc | 2 +- tests/accu/compute.cc | 2 +- tests/accu/max.cc | 2 +- tests/accu/mean.cc | 2 +- tests/accu/median.cc | 2 +- tests/accu/min.cc | 2 +- tests/accu/nil.cc | 2 +- tests/accu/pair.cc | 2 +- tests/arith/minus.cc | 2 +- tests/arith/minus_full.cc | 10 +++++----- tests/arith/plus.cc | 4 ++-- tests/arith/plus_full.cc | 10 +++++----- tests/arith/revert.cc | 2 +- tests/arith/revert_full.cc | 10 +++++----- tests/arith/times.cc | 2 +- tests/arith/times_full.cc | 10 +++++----- tests/binarization/threshold.cc | 2 +- tests/border/adjust.cc | 2 +- tests/border/adjust_full.cc | 2 +- tests/border/duplicate.cc | 2 +- tests/border/duplicate_full.cc | 4 ++-- tests/border/equalize.cc | 2 +- tests/border/equalize_full.cc | 6 +++--- tests/border/fill.cc | 2 +- tests/border/fill_full.cc | 6 +++--- tests/border/find.cc | 4 ++-- tests/border/find_full.cc | 10 +++++----- tests/border/get.cc | 6 +++--- tests/border/get_full.cc | 6 +++--- tests/border/mirror.cc | 4 ++-- tests/border/mirror_full.cc | 4 ++-- tests/border/resize.cc | 2 +- tests/border/resize_full.cc | 6 +++--- tests/border/resize_image1d_1.cc | 2 +- tests/border/resize_image1d_2.cc | 2 +- tests/border/resize_image1d_3.cc | 2 +- tests/border/resize_image2d_1.cc | 2 +- tests/border/resize_image2d_2.cc | 2 +- tests/border/resize_image2d_3.cc | 2 +- tests/border/resize_image3d_1.cc | 2 +- tests/border/resize_image3d_2.cc | 2 +- tests/border/resize_image3d_3.cc | 2 +- tests/border/resize_image_if.cc | 6 +++--- tests/border/resize_sub_image.cc | 6 +++--- tests/canvas/browsing/directional.cc | 4 ++-- tests/canvas/browsing/fwd.cc | 2 +- tests/canvas/browsing/snake_fwd.cc | 2 +- tests/canvas/chamfer.cc | 6 +++--- tests/convert/to_image.cc | 2 +- tests/convert/to_p_set.cc | 6 +++--- tests/convert/to_tiles.cc | 4 ++-- tests/convert/to_window.cc | 6 +++--- tests/core/bgraph_image.cc | 4 ++-- tests/core/cast_image.cc | 4 ++-- tests/core/clock_neighb2d.cc | 2 +- tests/core/clock_test.cc | 2 +- tests/core/clone.cc | 4 ++-- tests/core/decorated_image.cc | 4 ++-- tests/core/dpoints_pixter.cc | 6 +++--- tests/core/fi_adaptor.cc | 4 ++-- tests/core/graph_elt_neighborhood.cc | 2 +- tests/core/graph_elt_window.cc | 2 +- tests/core/graph_image.cc | 6 +++--- tests/core/graph_image_wst.cc | 6 +++--- tests/core/hexa.cc | 4 ++-- tests/core/image1d.cc | 2 +- tests/core/image2d.cc | 2 +- tests/core/image2d_h.cc | 2 +- tests/core/image3d.cc | 2 +- tests/core/image_if.cc | 4 ++-- tests/core/image_if_interval.cc | 2 +- tests/core/image_if_value.cc | 2 +- tests/core/initialize.cc | 4 ++-- tests/core/interpolated.cc | 4 ++-- tests/core/line_graph_elt_neighborhood.cc | 2 +- tests/core/line_graph_elt_window.cc | 2 +- tests/core/line_graph_image.cc | 6 +++--- tests/core/line_piter.cc | 6 +++--- tests/core/mono_obased_rle_image.cc | 4 ++-- tests/core/mono_rle_image.cc | 4 ++-- tests/core/obased_rle_image.cc | 4 ++-- tests/core/p_runs.cc | 2 +- tests/core/pixel.cc | 2 +- tests/core/pixter1d.cc | 2 +- tests/core/pixter1d_more.cc | 2 +- tests/core/pixter2d.cc | 2 +- tests/core/pixter2d_more.cc | 2 +- tests/core/pixter3d.cc | 2 +- tests/core/pixter3d_more.cc | 2 +- tests/core/plain.cc | 4 ++-- tests/core/point_set_compatibility.cc | 2 +- tests/core/pset_array.cc | 2 +- tests/core/pset_if.cc | 2 +- tests/core/rle_image.cc | 4 ++-- tests/core/safe_image.cc | 4 ++-- tests/core/sparse_image.cc | 4 ++-- tests/core/sub_image.cc | 6 +++--- tests/core/t_image.cc | 4 ++-- tests/core/tr_image.cc | 4 ++-- tests/core/translate_image.cc | 4 ++-- tests/core/value_enc_image.cc | 6 +++--- tests/core/window1d.cc | 2 +- tests/core/window2d.cc | 2 +- tests/core/window3d.cc | 2 +- tests/debug/iota.cc | 2 +- tests/debug/println.cc | 2 +- tests/debug/println_with_border.cc | 4 ++-- tests/display/color_pretty.cc | 6 +++--- tests/display/save_and_show.cc | 6 +++--- tests/display/show.cc | 6 +++--- tests/draw/graph.cc | 6 +++--- tests/draw/label.cc | 4 ++-- tests/draw/line.cc | 6 +++--- tests/estim/mean.cc | 2 +- tests/fun/v2v/rgb_hsi_conversion.cc | 2 +- tests/fun/x2x/rotation.cc | 4 ++-- tests/geom/max_col.cc | 2 +- tests/geom/max_ind.cc | 2 +- tests/geom/max_row.cc | 2 +- tests/geom/max_sli.cc | 2 +- tests/geom/min_col.cc | 2 +- tests/geom/min_ind.cc | 2 +- tests/geom/min_row.cc | 2 +- tests/geom/min_sli.cc | 2 +- tests/geom/ncols.cc | 2 +- tests/geom/ninds.cc | 2 +- tests/geom/nrows.cc | 2 +- tests/geom/nslis.cc | 2 +- tests/geom/resize.cc | 6 +++--- tests/geom/seed2tiling.cc | 2 +- tests/geom/seed2tiling_roundness.cc | 2 +- tests/histo/compute.cc | 2 +- tests/histo/to_image1d.cc | 4 ++-- tests/io/fits/fits.cc | 2 +- tests/io/pbm/pbm.cc | 2 +- tests/io/pgm/pgm.cc | 2 +- tests/io/pgm/pgm16.cc | 2 +- tests/io/pgm/pgm19.cc | 2 +- tests/io/pgm/pgm27.cc | 2 +- tests/io/ppm/ppm.cc | 2 +- tests/io/ppm/ppm16.cc | 2 +- tests/io/ppm/ppm23.cc | 2 +- tests/labeling/background.cc | 2 +- tests/labeling/blobs.cc | 2 +- tests/labeling/flat_zones.cc | 2 +- tests/labeling/foreground.cc | 2 +- tests/labeling/level.cc | 4 ++-- tests/labeling/regional_maxima.cc | 2 +- tests/labeling/regional_minima.cc | 2 +- tests/level/abs.cc | 2 +- tests/level/abs_full.cc | 10 +++++----- tests/level/apply.cc | 2 +- tests/level/apply_full.cc | 6 +++--- tests/level/approx/median.cc | 2 +- tests/level/assign.cc | 2 +- tests/level/assign_full.cc | 10 +++++----- tests/level/compare.cc | 2 +- tests/level/compare_full.cc | 6 +++--- tests/level/compute.cc | 2 +- tests/level/compute_full.cc | 10 +++++----- tests/level/fill.cc | 2 +- tests/level/fill_full.cc | 10 +++++----- tests/level/fill_with_value.cc | 2 +- tests/level/median.cc | 2 +- tests/level/median_dir.cc | 2 +- tests/level/median_fast.cc | 2 +- tests/level/median_hline2d.cc | 2 +- tests/level/memcpy_.cc | 4 ++-- tests/level/memset_.cc | 2 +- tests/level/naive/median.cc | 2 +- tests/level/paste.cc | 6 +++--- tests/level/paste_full.cc | 10 +++++----- tests/level/replace.cc | 2 +- tests/level/saturate.cc | 2 +- tests/level/saturate_full.cc | 6 +++--- tests/level/sort_psites.cc | 2 +- tests/level/sort_psites_full.cc | 10 +++++----- tests/level/stretch.cc | 2 +- tests/level/stretch_full.cc | 6 +++--- tests/level/take.cc | 2 +- tests/level/transform.cc | 2 +- tests/level/transform_full.cc | 10 +++++----- tests/linear/convolve.cc | 2 +- tests/linear/gaussian.cc | 2 +- tests/linear/lap.cc | 2 +- tests/linear/line_convolve.cc | 2 +- tests/linear/local/convolve.cc | 2 +- tests/linear/log.cc | 2 +- tests/linear/sobel.cc | 2 +- tests/logical/and.cc | 2 +- tests/logical/and_full.cc | 6 +++--- tests/logical/and_not.cc | 2 +- tests/logical/and_not_full.cc | 6 +++--- tests/logical/not.cc | 2 +- tests/logical/not_full.cc | 6 +++--- tests/logical/or.cc | 2 +- tests/logical/or_full.cc | 6 +++--- tests/morpho/artificial_line_graph_image_wst.cc | 8 ++++---- tests/morpho/closing_area.cc | 2 +- tests/morpho/closing_height.cc | 2 +- tests/morpho/closing_volume.cc | 2 +- tests/morpho/combined.cc | 2 +- tests/morpho/contrast.cc | 2 +- tests/morpho/dilation.cc | 2 +- tests/morpho/dilation_max_h.cc | 2 +- tests/morpho/erosion.cc | 2 +- tests/morpho/erosion_min_h.cc | 2 +- tests/morpho/gradient.cc | 2 +- tests/morpho/gradient_elementary.cc | 2 +- tests/morpho/hit_or_miss.cc | 2 +- tests/morpho/laplacian.cc | 4 ++-- tests/morpho/lena_line_graph_image_wst1.cc | 8 ++++---- tests/morpho/lena_line_graph_image_wst2.cc | 8 ++++---- tests/morpho/line_graph_image_wst.cc | 6 +++--- tests/morpho/meyer_wst.cc | 2 +- tests/morpho/meyer_wst_long.cc | 4 ++-- tests/morpho/opening_area.cc | 2 +- tests/morpho/opening_height.cc | 2 +- tests/morpho/opening_volume.cc | 2 +- tests/morpho/rank_filter.cc | 2 +- tests/morpho/thinning.cc | 2 +- tests/neighb/image.cc | 2 +- tests/pw/value.cc | 2 +- tests/test/positive.cc | 2 +- tests/trait/ch_value.cc | 2 +- tests/trait/image/images.cc | 6 +++--- tests/util/branch_iter.cc | 2 +- tests/util/branch_iter_ind.cc | 2 +- tests/util/lemmings.cc | 2 +- tests/util/tree_fast_to_image.cc | 2 +- tests/util/tree_to_image.cc | 2 +- tests/value/float01.cc | 2 +- tests/value/stack.cc | 2 +- tools/area_flooding.cc | 8 ++++---- tools/seed2tiling.cc | 10 +++++----- 514 files changed, 946 insertions(+), 946 deletions(-) Index: tools/seed2tiling.cc --- tools/seed2tiling.cc (revision 2171) +++ tools/seed2tiling.cc (working copy) @@ -31,8 +31,8 @@ */ -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> @@ -46,10 +46,10 @@ # include <mln/geom/seeds2tiling_roundness.hh> # include <mln/make/voronoi.hh> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/make/win_chamfer.hh> Index: tools/area_flooding.cc --- tools/area_flooding.cc (revision 2171) +++ tools/area_flooding.cc (working copy) @@ -51,12 +51,12 @@ #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing_area_on_vertices.hh> Index: tests/trait/image/images.cc --- tests/trait/image/images.cc (revision 2171) +++ tests/trait/image/images.cc (working copy) @@ -30,10 +30,10 @@ * \brief Tests on mln::trait::images. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> Index: tests/trait/ch_value.cc --- tests/trait/ch_value.cc (revision 2171) +++ tests/trait/ch_value.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/trait/ch_value.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/stack.hh> Index: tests/debug/iota.cc --- tests/debug/iota.cc (revision 2171) +++ tests/debug/iota.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::debug::iota. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> Index: tests/debug/println_with_border.cc --- tests/debug/println_with_border.cc (revision 2171) +++ tests/debug/println_with_border.cc (working copy) @@ -30,8 +30,8 @@ * \brief Test on mln::debug::println_with_border. */ -#include <mln/core/image2d.hh> -#include <mln/core/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image1d.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> #include <mln/debug/println_with_border.hh> Index: tests/debug/println.cc --- tests/debug/println.cc (revision 2171) +++ tests/debug/println.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::debug::println. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> Index: tests/histo/compute.cc --- tests/histo/compute.cc (revision 2171) +++ tests/histo/compute.cc (working copy) @@ -33,7 +33,7 @@ #include <iterator> #include <sstream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_s.hh> Index: tests/histo/to_image1d.cc --- tests/histo/to_image1d.cc (revision 2171) +++ tests/histo/to_image1d.cc (working copy) @@ -32,8 +32,8 @@ #include <iterator> -#include <mln/core/image2d.hh> -#include <mln/core/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image1d.hh> #include <mln/value/int_u8.hh> Index: tests/core/graph_elt_neighborhood.cc --- tests/core/graph_elt_neighborhood.cc (revision 2171) +++ tests/core/graph_elt_neighborhood.cc (working copy) @@ -33,7 +33,7 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/image_if_value.cc --- tests/core/image_if_value.cc (revision 2171) +++ tests/core/image_if_value.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image_if_value. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/image_if_value.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/window1d.cc --- tests/core/window1d.cc (revision 2171) +++ tests/core/window1d.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/window1d.hh> -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> Index: tests/core/window2d.cc --- tests/core/window2d.cc (revision 2171) +++ tests/core/window2d.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/window2d.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> #include <mln/logical/not.hh> Index: tests/core/clock_neighb2d.cc --- tests/core/clock_neighb2d.cc (revision 2171) +++ tests/core/clock_neighb2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/clock_neighb2d.hh> #include <mln/debug/println.hh> Index: tests/core/window3d.cc --- tests/core/window3d.cc (revision 2171) +++ tests/core/window3d.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/window3d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> Index: tests/core/graph_image_wst.cc --- tests/core/graph_image_wst.cc (revision 2171) +++ tests/core/graph_image_wst.cc (working copy) @@ -31,9 +31,9 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_window.hh> -#include <mln/core/graph_window_piter.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_window.hh> +#include <mln/core/image/graph_window_piter.hh> #include <mln/morpho/dilation.hh> Index: tests/core/image_if_interval.cc --- tests/core/image_if_interval.cc (revision 2171) +++ tests/core/image_if_interval.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image_if_interval. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/image_if_interval.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/bgraph_image.cc --- tests/core/bgraph_image.cc (revision 2171) +++ tests/core/bgraph_image.cc (working copy) @@ -31,8 +31,8 @@ #include <vector> #include <mln/value/int_u8.hh> -#include <mln/core/image2d.hh> -#include <mln/core/bgraph_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/bgraph_image.hh> #include <mln/level/fill.hh> #include <mln/level/paste.hh> #include <mln/debug/println.hh> Index: tests/core/mono_rle_image.cc --- tests/core/mono_rle_image.cc (revision 2171) +++ tests/core/mono_rle_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::blobs. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/mono_rle_encode.hh> +#include <mln/core/image/mono_rle_encode.hh> #include "tests/data.hh" Index: tests/core/pixter2d_more.cc --- tests/core/pixter2d_more.cc (revision 2171) +++ tests/core/pixter2d_more.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::fwd_pixter2d. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> const unsigned size = 20; Index: tests/core/cast_image.cc --- tests/core/cast_image.cc (revision 2171) +++ tests/core/cast_image.cc (working copy) @@ -30,11 +30,11 @@ * \brief Tests on mln::cast_image. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/fun/p2b/chess.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> int main() Index: tests/core/point_set_compatibility.cc --- tests/core/point_set_compatibility.cc (revision 2171) +++ tests/core/point_set_compatibility.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/graph_psite.hh> +#include <mln/core/image/graph_psite.hh> #include <mln/core/site_set/p_graph_piter.hh> Index: tests/core/pixter1d.cc --- tests/core/pixter1d.cc (revision 2171) +++ tests/core/pixter1d.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/pixter1d.cc /// \brief Tests on 1-D image pixters. -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/debug/iota.hh> Index: tests/core/pixter2d.cc --- tests/core/pixter2d.cc (revision 2171) +++ tests/core/pixter2d.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/pixter2d.cc /// \brief Tests on 2-D image pixters. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> Index: tests/core/obased_rle_image.cc --- tests/core/obased_rle_image.cc (revision 2171) +++ tests/core/obased_rle_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::obased_rle_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/obased_rle_encode.hh> +#include <mln/core/image/obased_rle_encode.hh> #include "tests/data.hh" Index: tests/core/pixter3d.cc --- tests/core/pixter3d.cc (revision 2171) +++ tests/core/pixter3d.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/pixter3d.cc /// \brief Tests on 3-D image pixters. -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/debug/iota.hh> Index: tests/core/graph_image.cc --- tests/core/graph_image.cc (revision 2171) +++ tests/core/graph_image.cc (working copy) @@ -31,9 +31,9 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_window.hh> -#include <mln/core/graph_window_piter.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_window.hh> +#include <mln/core/image/graph_window_piter.hh> #include <mln/morpho/dilation.hh> Index: tests/core/pixel.cc --- tests/core/pixel.cc (revision 2171) +++ tests/core/pixel.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::pixel. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/pixel.hh> #include <mln/metal/equal.hh> Index: tests/core/pixter3d_more.cc --- tests/core/pixter3d_more.cc (revision 2171) +++ tests/core/pixter3d_more.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::fwd_pixter3d. */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> const unsigned size = 5; Index: tests/core/pset_if.cc --- tests/core/pset_if.cc (revision 2171) +++ tests/core/pset_if.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::pset_if. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> Index: tests/core/mono_obased_rle_image.cc --- tests/core/mono_obased_rle_image.cc (revision 2171) +++ tests/core/mono_obased_rle_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::mono_obased_rle_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/mono_obased_rle_encode.hh> +#include <mln/core/image/mono_obased_rle_encode.hh> #include "tests/data.hh" Index: tests/core/sub_image.cc --- tests/core/sub_image.cc (revision 2171) +++ tests/core/sub_image.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::sub_image. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> Index: tests/core/graph_elt_window.cc --- tests/core/graph_elt_window.cc (revision 2171) +++ tests/core/graph_elt_window.cc (working copy) @@ -33,7 +33,7 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/graph_elt_window.hh> +#include <mln/core/image/graph_elt_window.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/sparse_image.cc --- tests/core/sparse_image.cc (revision 2171) +++ tests/core/sparse_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::sparse_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/sparse_encode.hh> +#include <mln/core/image/sparse_encode.hh> #include "tests/data.hh" Index: tests/core/clone.cc --- tests/core/clone.cc (revision 2171) +++ tests/core/clone.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::clone. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/plain.cc --- tests/core/plain.cc (revision 2171) +++ tests/core/plain.cc (working copy) @@ -30,8 +30,8 @@ * \brief Test on mln::plain. */ -#include <mln/core/image2d.hh> -#include <mln/core/plain.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/plain.hh> #include <mln/value/int_u8.hh> #include <mln/level/compare.hh> Index: tests/core/t_image.cc --- tests/core/t_image.cc (revision 2171) +++ tests/core/t_image.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::t_image. */ -#include <mln/core/image2d.hh> -#include <mln/core/t_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/t_image.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/p_runs.cc --- tests/core/p_runs.cc (revision 2171) +++ tests/core/p_runs.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::p_runs_ and related tools. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/p_runs.hh> Index: tests/core/image1d.cc --- tests/core/image1d.cc (revision 2171) +++ tests/core/image1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image1d. */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/geom/size1d.hh> Index: tests/core/fi_adaptor.cc --- tests/core/fi_adaptor.cc (revision 2171) +++ tests/core/fi_adaptor.cc (working copy) @@ -28,8 +28,8 @@ /// \file tests/core/fi_adaptor.cc /// \brief Test on mln::fi_adaptor. -#include <mln/core/fi_adaptor.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/fi_adaptor.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/value/int_u8.hh> Index: tests/core/image2d.cc --- tests/core/image2d.cc (revision 2171) +++ tests/core/image2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image2d. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/size2d.hh> #include <mln/core/init.hh> Index: tests/core/image3d.cc --- tests/core/image3d.cc (revision 2171) +++ tests/core/image3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image3d. */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/size3d.hh> Index: tests/core/image2d_h.cc --- tests/core/image2d_h.cc (revision 2171) +++ tests/core/image2d_h.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image2d_h */ -#include <mln/core/image2d_h.hh> +#include <mln/core/image/image2d_h.hh> #include <mln/value/int_u16.hh> #include <mln/trait/image/print.hh> Index: tests/core/clock_test.cc --- tests/core/clock_test.cc (revision 2171) +++ tests/core/clock_test.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/clock_neighb2d.hh> #include <mln/debug/println.hh> #include <mln/level/fill.hh> Index: tests/core/decorated_image.cc --- tests/core/decorated_image.cc (revision 2171) +++ tests/core/decorated_image.cc (working copy) @@ -28,8 +28,8 @@ /// \file tests/core/decorated_image.cc /// \brief Tests on mln::decorated_image. -#include <mln/core/image2d.hh> -#include <mln/core/decorated_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/decorated_image.hh> unsigned count_read = 0, count_write = 0; Index: tests/core/translate_image.cc --- tests/core/translate_image.cc (revision 2171) +++ tests/core/translate_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::core::translate_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> #include <mln/level/fill.hh> @@ -38,7 +38,7 @@ #include <mln/border/fill.hh> #include <mln/debug/println_with_border.hh> #include <mln/debug/println.hh> -#include <mln/core/translate_image.hh> +#include <mln/core/image/translate_image.hh> int main () Index: tests/core/image_if.cc --- tests/core/image_if.cc (revision 2171) +++ tests/core/image_if.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::image_if. */ -#include <mln/core/image2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/debug/println.hh> Index: tests/core/initialize.cc --- tests/core/initialize.cc (revision 2171) +++ tests/core/initialize.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::initialize. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/debug/println.hh> Index: tests/core/line_graph_elt_window.cc --- tests/core/line_graph_elt_window.cc (revision 2171) +++ tests/core/line_graph_elt_window.cc (working copy) @@ -31,7 +31,7 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/line_graph_elt_window.hh> +#include <mln/core/image/line_graph_elt_window.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/value_enc_image.cc --- tests/core/value_enc_image.cc (revision 2171) +++ tests/core/value_enc_image.cc (working copy) @@ -30,8 +30,8 @@ * \brief Test on mln::core::value_enc_image.hh. */ -#include <mln/core/image2d.hh> -#include <mln/core/value_enc_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/value_enc_image.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> @@ -46,7 +46,7 @@ #include "tests/data.hh" -#include <mln/core/value_encode.hh> +#include <mln/core/image/value_encode.hh> struct fold_t : public mln::Function_v2v< fold_t > { Index: tests/core/line_graph_elt_neighborhood.cc --- tests/core/line_graph_elt_neighborhood.cc (revision 2171) +++ tests/core/line_graph_elt_neighborhood.cc (working copy) @@ -31,7 +31,7 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/pset_array.cc --- tests/core/pset_array.cc (revision 2171) +++ tests/core/pset_array.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/pset_array.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/p_runs.hh> #include <iostream> Index: tests/core/line_graph_image.cc --- tests/core/line_graph_image.cc (revision 2171) +++ tests/core/line_graph_image.cc (working copy) @@ -31,9 +31,9 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_window.hh> -#include <mln/core/line_graph_window_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_window.hh> +#include <mln/core/image/line_graph_window_piter.hh> #include <mln/morpho/dilation.hh> Index: tests/core/dpoints_pixter.cc --- tests/core/dpoints_pixter.cc (revision 2171) +++ tests/core/dpoints_pixter.cc (working copy) @@ -28,9 +28,9 @@ /// \file tests/dpoints_pixter.cc /// \brief Test on mln::dpoints_fwd_pixter and mln::dpoints_bkd_pixter. -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/win/segment1d.hh> #include <mln/win/rectangle2d.hh> Index: tests/core/safe_image.cc --- tests/core/safe_image.cc (revision 2171) +++ tests/core/safe_image.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::safe_image. */ -#include <mln/core/image2d.hh> -#include <mln/core/safe.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/safe.hh> int main() Index: tests/core/pixter1d_more.cc --- tests/core/pixter1d_more.cc (revision 2171) +++ tests/core/pixter1d_more.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::fwd_pixter1d. */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> const unsigned size = 20; Index: tests/core/rle_image.cc --- tests/core/rle_image.cc (revision 2171) +++ tests/core/rle_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::rle_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/rle_encode.hh> +#include <mln/core/image/rle_encode.hh> #include "tests/data.hh" Index: tests/core/hexa.cc --- tests/core/hexa.cc (revision 2171) +++ tests/core/hexa.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::hexa */ -#include <mln/core/image2d.hh> -#include <mln/core/hexa.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/hexa.hh> #include <mln/value/int_u8.hh> #include <mln/trait/image/print.hh> Index: tests/core/tr_image.cc --- tests/core/tr_image.cc (revision 2171) +++ tests/core/tr_image.cc (working copy) @@ -33,9 +33,9 @@ #include <iostream> #include <mln/fun/x2x/rotation.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/tr_image.hh> +#include <mln/core/image/tr_image.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/interpolated.cc --- tests/core/interpolated.cc (revision 2171) +++ tests/core/interpolated.cc (working copy) @@ -32,8 +32,8 @@ #include <iostream> -#include <mln/core/image2d.hh> -#include <mln/core/interpolated.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/interpolated.hh> #include <mln/algebra/vec.hh> Index: tests/core/line_piter.cc --- tests/core/line_piter.cc (revision 2171) +++ tests/core/line_piter.cc (working copy) @@ -31,9 +31,9 @@ */ //FIXME: replace by the necessary include -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/core/line_piter.hh> int main() Index: tests/neighb/image.cc --- tests/neighb/image.cc (revision 2171) +++ tests/neighb/image.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/neighb/image.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/metal/has_neighborhood.hh> Index: tests/draw/label.cc --- tests/draw/label.cc (revision 2171) +++ tests/draw/label.cc (working copy) @@ -31,14 +31,14 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/value/rgb8.hh> #include <mln/io/ppm/save.hh> #include <mln/draw/label.hh> #include <mln/literal/all.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> #include <mln/labeling/blobs.hh> Index: tests/draw/graph.cc --- tests/draw/graph.cc (revision 2171) +++ tests/draw/graph.cc (working copy) @@ -36,14 +36,14 @@ #include <vector> #include <utility> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/debug/println.hh> #include <mln/util/graph.hh> #include <mln/core/site_set/p_graph.hh> -#include <mln/core/graph_psite.hh> +#include <mln/core/image/graph_psite.hh> #include <mln/draw/graph.hh> -#include <mln/core/graph_image.hh> +#include <mln/core/image/graph_image.hh> #include <mln/level/compare.hh> Index: tests/draw/line.cc --- tests/draw/line.cc (revision 2171) +++ tests/draw/line.cc (working copy) @@ -32,9 +32,9 @@ #include <iterator> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> #include <mln/level/compare.hh> Index: tests/level/transform_full.cc --- tests/level/transform_full.cc (revision 2171) +++ tests/level/transform_full.cc (working copy) @@ -32,12 +32,12 @@ #include <cmath> -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/median.cc --- tests/level/median.cc (revision 2171) +++ tests/level/median.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/level/compute_full.cc --- tests/level/compute_full.cc (revision 2171) +++ tests/level/compute_full.cc (working copy) @@ -30,17 +30,17 @@ * \brief Tests on mln::level::compute. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> #include <mln/value/int_s8.hh> #include <mln/value/int_s16.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/accu/min.hh> Index: tests/level/sort_psites_full.cc --- tests/level/sort_psites_full.cc (revision 2171) +++ tests/level/sort_psites_full.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::level::sort_points. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/median_hline2d.cc --- tests/level/median_hline2d.cc (revision 2171) +++ tests/level/median_hline2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on the hline2d version of mln::level::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/level/abs.cc --- tests/level/abs.cc (revision 2171) +++ tests/level/abs.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::abs. */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/level/abs.hh> int main() Index: tests/level/assign_full.cc --- tests/level/assign_full.cc (revision 2171) +++ tests/level/assign_full.cc (working copy) @@ -31,9 +31,9 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> @@ -41,9 +41,9 @@ #include <mln/value/int_s16.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> Index: tests/level/apply_full.cc --- tests/level/apply_full.cc (revision 2171) +++ tests/level/apply_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::level::apply. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/level/fill_full.cc --- tests/level/fill_full.cc (revision 2171) +++ tests/level/fill_full.cc (working copy) @@ -32,12 +32,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/median_fast.cc --- tests/level/median_fast.cc (revision 2171) +++ tests/level/median_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::fast_median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/level/compute.cc --- tests/level/compute.cc (revision 2171) +++ tests/level/compute.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::compute. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/compute.hh> #include <mln/debug/iota.hh> #include <mln/accu/min.hh> Index: tests/level/sort_psites.cc --- tests/level/sort_psites.cc (revision 2171) +++ tests/level/sort_psites.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::sort_psites. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/level/sort_psites.hh> #include <mln/core/site_set/p_array.hh> Index: tests/level/assign.cc --- tests/level/assign.cc (revision 2171) +++ tests/level/assign.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::assign. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/assign.hh> #include <mln/level/compare.hh> #include <mln/debug/iota.hh> Index: tests/level/approx/median.cc --- tests/level/approx/median.cc (revision 2171) +++ tests/level/approx/median.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::approx::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/win/octagon2d.hh> Index: tests/level/fill.cc --- tests/level/fill.cc (revision 2171) +++ tests/level/fill.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::fill */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> int main() Index: tests/level/abs_full.cc --- tests/level/abs_full.cc (revision 2171) +++ tests/level/abs_full.cc (working copy) @@ -31,12 +31,12 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/memcpy_.cc --- tests/level/memcpy_.cc (revision 2171) +++ tests/level/memcpy_.cc (working copy) @@ -32,8 +32,8 @@ * \todo Make this test not dummy! */ -#include <mln/core/image2d.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/inplace.hh> #include <mln/debug/iota.hh> #include <mln/level/memcpy_.hh> Index: tests/level/median_dir.cc --- tests/level/median_dir.cc (revision 2171) +++ tests/level/median_dir.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/level/stretch_full.cc --- tests/level/stretch_full.cc (revision 2171) +++ tests/level/stretch_full.cc (working copy) @@ -31,9 +31,9 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/level/paste_full.cc --- tests/level/paste_full.cc (revision 2171) +++ tests/level/paste_full.cc (working copy) @@ -32,12 +32,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/compare_full.cc --- tests/level/compare_full.cc (revision 2171) +++ tests/level/compare_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::level::compare. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/level/saturate_full.cc --- tests/level/saturate_full.cc (revision 2171) +++ tests/level/saturate_full.cc (working copy) @@ -31,9 +31,9 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/level/transform.cc --- tests/level/transform.cc (revision 2171) +++ tests/level/transform.cc (working copy) @@ -32,7 +32,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/transform.hh> #include <mln/debug/iota.hh> Index: tests/level/replace.cc --- tests/level/replace.cc (revision 2171) +++ tests/level/replace.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::replace. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/replace.hh> #include <mln/level/compare.hh> Index: tests/level/stretch.cc --- tests/level/stretch.cc (revision 2171) +++ tests/level/stretch.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/stretch.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> Index: tests/level/paste.cc --- tests/level/paste.cc (revision 2171) +++ tests/level/paste.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::level::paste. */ -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/level/fill.hh> #include <mln/level/paste.hh> Index: tests/level/fill_with_value.cc --- tests/level/fill_with_value.cc (revision 2171) +++ tests/level/fill_with_value.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::fill_with_value */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill_with_value.hh> Index: tests/level/naive/median.cc --- tests/level/naive/median.cc (revision 2171) +++ tests/level/naive/median.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::naive::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/level/take.cc --- tests/level/take.cc (revision 2171) +++ tests/level/take.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::take. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/take.hh> #include <mln/level/compare.hh> #include <mln/debug/iota.hh> Index: tests/level/apply.cc --- tests/level/apply.cc (revision 2171) +++ tests/level/apply.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::apply. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/apply.hh> #include <mln/debug/iota.hh> #include <mln/fun/v2v/saturate.hh> Index: tests/level/compare.cc --- tests/level/compare.cc (revision 2171) +++ tests/level/compare.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::compare. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/compare.hh> #include <mln/debug/iota.hh> Index: tests/level/saturate.cc --- tests/level/saturate.cc (revision 2171) +++ tests/level/saturate.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/saturate.hh> #include <mln/debug/iota.hh> Index: tests/level/memset_.cc --- tests/level/memset_.cc (revision 2171) +++ tests/level/memset_.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::memset_. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/ncols.hh> #include <mln/level/fill.hh> #include <mln/level/memset_.hh> Index: tests/arith/minus.cc --- tests/arith/minus.cc (revision 2171) +++ tests/arith/minus.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::arith::minus. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/arith/minus.hh> #include <mln/level/compare.hh> Index: tests/arith/minus_full.cc --- tests/arith/minus_full.cc (revision 2171) +++ tests/arith/minus_full.cc (working copy) @@ -31,12 +31,12 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/arith/times.cc --- tests/arith/times.cc (revision 2171) +++ tests/arith/times.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::arith::times. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/arith/times.hh> #include <mln/level/compare.hh> Index: tests/arith/times_full.cc --- tests/arith/times_full.cc (revision 2171) +++ tests/arith/times_full.cc (working copy) @@ -33,12 +33,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/arith/plus.cc --- tests/arith/plus.cc (revision 2171) +++ tests/arith/plus.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::arith::plus. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/arith/plus.hh> #include <mln/level/compare.hh> @@ -61,7 +61,7 @@ -// #include <mln/core/image2d.hh> +// #include <mln/core/image/image2d.hh> // #include <mln/core/clone.hh> // #include <mln/value/int_u8.hh> Index: tests/arith/plus_full.cc --- tests/arith/plus_full.cc (revision 2171) +++ tests/arith/plus_full.cc (working copy) @@ -34,12 +34,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/arith/revert.cc --- tests/arith/revert.cc (revision 2171) +++ tests/arith/revert.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::arith::revert. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/arith/revert.hh> #include <mln/level/compare.hh> Index: tests/arith/revert_full.cc --- tests/arith/revert_full.cc (revision 2171) +++ tests/arith/revert_full.cc (working copy) @@ -34,12 +34,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/linear/convolve.cc --- tests/linear/convolve.cc (revision 2171) +++ tests/linear/convolve.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::convolve. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/linear/lap.cc --- tests/linear/lap.cc (revision 2171) +++ tests/linear/lap.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::lap_4. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/linear/log.cc --- tests/linear/log.cc (revision 2171) +++ tests/linear/log.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/linear/line_convolve.cc --- tests/linear/line_convolve.cc (revision 2171) +++ tests/linear/line_convolve.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::line_convolve. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/linear/sobel.cc --- tests/linear/sobel.cc (revision 2171) +++ tests/linear/sobel.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::sobel. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/level/saturate.hh> #include <mln/level/stretch.hh> Index: tests/linear/local/convolve.cc --- tests/linear/local/convolve.cc (revision 2171) +++ tests/linear/local/convolve.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::local::convolve. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/w_window2d_int.hh> Index: tests/linear/gaussian.cc --- tests/linear/gaussian.cc (revision 2171) +++ tests/linear/gaussian.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::linear::gaussian. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u_sat.hh> Index: tests/accu/pair.cc --- tests/accu/pair.cc (revision 2171) +++ tests/accu/pair.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::mean. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/pair.hh> Index: tests/accu/median.cc --- tests/accu/median.cc (revision 2171) +++ tests/accu/median.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/median.hh> Index: tests/accu/compute.cc --- tests/accu/compute.cc (revision 2171) +++ tests/accu/compute.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::compute. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/compute.hh> Index: tests/accu/mean.cc --- tests/accu/mean.cc (revision 2171) +++ tests/accu/mean.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::mean. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/mean.hh> Index: tests/accu/nil.cc --- tests/accu/nil.cc (revision 2171) +++ tests/accu/nil.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::nil. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/nil.hh> Index: tests/accu/min.cc --- tests/accu/min.cc (revision 2171) +++ tests/accu/min.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::min. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/accu/nil.hh> Index: tests/accu/max.cc --- tests/accu/max.cc (revision 2171) +++ tests/accu/max.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::max. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/accu/nil.hh> Index: tests/value/stack.cc --- tests/value/stack.cc (revision 2171) +++ tests/value/stack.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::value::stack. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/stack.hh> Index: tests/value/float01.cc --- tests/value/float01.cc (revision 2171) +++ tests/value/float01.cc (working copy) @@ -32,7 +32,7 @@ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/border/duplicate_full.cc --- tests/border/duplicate_full.cc (revision 2171) +++ tests/border/duplicate_full.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::border::duplicate. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/duplicate.hh> #include <mln/value/int_u8.hh> Index: tests/border/mirror_full.cc --- tests/border/mirror_full.cc (revision 2171) +++ tests/border/mirror_full.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::border::mirror. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/mirror.hh> #include <mln/value/int_u8.hh> Index: tests/border/equalize_full.cc --- tests/border/equalize_full.cc (revision 2171) +++ tests/border/equalize_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::equalize. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/border/get.hh> #include <mln/border/equalize.hh> Index: tests/border/get_full.cc --- tests/border/get_full.cc (revision 2171) +++ tests/border/get_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::get. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/get.hh> Index: tests/border/resize.cc --- tests/border/resize.cc (revision 2171) +++ tests/border/resize.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> #include <mln/border/get.hh> Index: tests/border/find_full.cc --- tests/border/find_full.cc (revision 2171) +++ tests/border/find_full.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::border::find. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/find.hh> #include <mln/literal/origin.hh> Index: tests/border/resize_image1d_1.cc --- tests/border/resize_image1d_1.cc (revision 2171) +++ tests/border/resize_image1d_1.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/fill_full.cc --- tests/border/fill_full.cc (revision 2171) +++ tests/border/fill_full.cc (working copy) @@ -32,9 +32,9 @@ #include <mln/border/fill.hh> #include <mln/level/fill.hh> -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> #include <mln/value/int_s8.hh> Index: tests/border/resize_image2d_1.cc --- tests/border/resize_image2d_1.cc (revision 2171) +++ tests/border/resize_image2d_1.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_image1d_2.cc --- tests/border/resize_image1d_2.cc (revision 2171) +++ tests/border/resize_image1d_2.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/duplicate.cc --- tests/border/duplicate.cc (revision 2171) +++ tests/border/duplicate.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::border::duplicate. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/duplicate.hh> Index: tests/border/resize_image1d_3.cc --- tests/border/resize_image1d_3.cc (revision 2171) +++ tests/border/resize_image1d_3.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/mirror.cc --- tests/border/mirror.cc (revision 2171) +++ tests/border/mirror.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::border::mirror. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/mirror.hh> Index: tests/border/resize_image3d_1.cc --- tests/border/resize_image3d_1.cc (revision 2171) +++ tests/border/resize_image3d_1.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_image2d_2.cc --- tests/border/resize_image2d_2.cc (revision 2171) +++ tests/border/resize_image2d_2.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_image2d_3.cc --- tests/border/resize_image2d_3.cc (revision 2171) +++ tests/border/resize_image2d_3.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_image3d_2.cc --- tests/border/resize_image3d_2.cc (revision 2171) +++ tests/border/resize_image3d_2.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/adjust_full.cc --- tests/border/adjust_full.cc (revision 2171) +++ tests/border/adjust_full.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::border::adjust. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/border/get.hh> #include <mln/border/adjust.hh> Index: tests/border/resize_image3d_3.cc --- tests/border/resize_image3d_3.cc (revision 2171) +++ tests/border/resize_image3d_3.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_sub_image.cc --- tests/border/resize_sub_image.cc (revision 2171) +++ tests/border/resize_sub_image.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::resize. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/get.hh> Index: tests/border/equalize.cc --- tests/border/equalize.cc (revision 2171) +++ tests/border/equalize.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::border::equalize. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/border/get.hh> #include <mln/border/equalize.hh> Index: tests/border/get.cc --- tests/border/get.cc (revision 2171) +++ tests/border/get.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::get. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/get.hh> Index: tests/border/find.cc --- tests/border/find.cc (revision 2171) +++ tests/border/find.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::border::find. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/debug/iota.hh> #include <mln/border/find.hh> Index: tests/border/resize_image_if.cc --- tests/border/resize_image_if.cc (revision 2171) +++ tests/border/resize_image_if.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::resize. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/get.hh> Index: tests/border/resize_full.cc --- tests/border/resize_full.cc (revision 2171) +++ tests/border/resize_full.cc (working copy) @@ -31,9 +31,9 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> #include <mln/border/get.hh> Index: tests/border/fill.cc --- tests/border/fill.cc (revision 2171) +++ tests/border/fill.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/border/fill.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/println_with_border.hh> Index: tests/border/adjust.cc --- tests/border/adjust.cc (revision 2171) +++ tests/border/adjust.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::border::adjust. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/border/get.hh> #include <mln/border/adjust.hh> Index: tests/test/positive.cc --- tests/test/positive.cc (revision 2171) +++ tests/test/positive.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::test::positive. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/test/positive.hh> Index: tests/convert/to_p_set.cc --- tests/convert/to_p_set.cc (revision 2171) +++ tests/convert/to_p_set.cc (working copy) @@ -31,12 +31,12 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/window2d.hh> #include <mln/core/box2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> Index: tests/convert/to_tiles.cc --- tests/convert/to_tiles.cc (revision 2171) +++ tests/convert/to_tiles.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::convert::to_tiles. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> #include <mln/level/fill.hh> @@ -38,7 +38,7 @@ #include <mln/border/fill.hh> #include <mln/debug/println_with_border.hh> #include <mln/debug/println.hh> -#include <mln/core/translate_image.hh> +#include <mln/core/image/translate_image.hh> #include <mln/convert/to_tiles.hh> int main () Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2171) +++ tests/convert/to_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::convert::to_image. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> Index: tests/convert/to_window.cc --- tests/convert/to_window.cc (revision 2171) +++ tests/convert/to_window.cc (working copy) @@ -31,12 +31,12 @@ */ #include <mln/core/dpoint2d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/window2d.hh> #include <mln/core/box2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> Index: tests/estim/mean.cc --- tests/estim/mean.cc (revision 2171) +++ tests/estim/mean.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::estim::mean. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> Index: tests/pw/value.cc --- tests/pw/value.cc (revision 2171) +++ tests/pw/value.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::pw::value_. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/pw/all.hh> Index: tests/geom/max_sli.cc --- tests/geom/max_sli.cc (revision 2171) +++ tests/geom/max_sli.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/max_sli.hh> Index: tests/geom/resize.cc --- tests/geom/resize.cc (revision 2171) +++ tests/geom/resize.cc (working copy) @@ -32,9 +32,9 @@ * \brief Tests on mln::geom::resize. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/resize.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/geom/nrows.cc --- tests/geom/nrows.cc (revision 2171) +++ tests/geom/nrows.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/nrows.hh> Index: tests/geom/seed2tiling_roundness.cc --- tests/geom/seed2tiling_roundness.cc (revision 2171) +++ tests/geom/seed2tiling_roundness.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::geom::seed2tiling_roundness. */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/core/w_window2d_int.hh> # include <mln/make/win_chamfer.hh> Index: tests/geom/seed2tiling.cc --- tests/geom/seed2tiling.cc (revision 2171) +++ tests/geom/seed2tiling.cc (working copy) @@ -31,7 +31,7 @@ */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/geom/seeds2tiling.hh> # include <mln/level/compare.hh> Index: tests/geom/min_row.cc --- tests/geom/min_row.cc (revision 2171) +++ tests/geom/min_row.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/min_row.hh> Index: tests/geom/ninds.cc --- tests/geom/ninds.cc (revision 2171) +++ tests/geom/ninds.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/geom/ninds.hh> Index: tests/geom/max_row.cc --- tests/geom/max_row.cc (revision 2171) +++ tests/geom/max_row.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/max_row.hh> Index: tests/geom/min_ind.cc --- tests/geom/min_ind.cc (revision 2171) +++ tests/geom/min_ind.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/geom/min_ind.hh> Index: tests/geom/ncols.cc --- tests/geom/ncols.cc (revision 2171) +++ tests/geom/ncols.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/ncols.hh> Index: tests/geom/max_ind.cc --- tests/geom/max_ind.cc (revision 2171) +++ tests/geom/max_ind.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/geom/max_ind.hh> Index: tests/geom/min_col.cc --- tests/geom/min_col.cc (revision 2171) +++ tests/geom/min_col.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/min_col.hh> Index: tests/geom/max_col.cc --- tests/geom/max_col.cc (revision 2171) +++ tests/geom/max_col.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/max_col.hh> Index: tests/geom/nslis.cc --- tests/geom/nslis.cc (revision 2171) +++ tests/geom/nslis.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/nslis.hh> Index: tests/geom/min_sli.cc --- tests/geom/min_sli.cc (revision 2171) +++ tests/geom/min_sli.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/min_sli.hh> Index: tests/fun/x2x/rotation.cc --- tests/fun/x2x/rotation.cc (revision 2171) +++ tests/fun/x2x/rotation.cc (working copy) @@ -32,11 +32,11 @@ #include <iostream> #include <mln/fun/x2x/rotation.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/interpolated.hh> +#include <mln/core/image/interpolated.hh> #include <mln/make/vec.hh> #include "tests/data.hh" Index: tests/fun/v2v/rgb_hsi_conversion.cc --- tests/fun/v2v/rgb_hsi_conversion.cc (revision 2171) +++ tests/fun/v2v/rgb_hsi_conversion.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/value/hsi.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <mln/io/ppm/load.hh> Index: tests/binarization/threshold.cc --- tests/binarization/threshold.cc (revision 2171) +++ tests/binarization/threshold.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/binarization/thresholding.cc /// \brief Test on mln::binarization::threshold. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/binarization/threshold.hh> #include <mln/level/all.hh> Index: tests/morpho/contrast.cc --- tests/morpho/contrast.cc (revision 2171) +++ tests/morpho/contrast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::contrast. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/morpho/meyer_wst_long.cc --- tests/morpho/meyer_wst_long.cc (revision 2171) +++ tests/morpho/meyer_wst_long.cc (working copy) @@ -30,8 +30,8 @@ #include <iostream> -#include <mln/core/image_if.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/gradient.cc --- tests/morpho/gradient.cc (revision 2171) +++ tests/morpho/gradient.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::gradient. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/morpho/artificial_line_graph_image_wst.cc --- tests/morpho/artificial_line_graph_image_wst.cc (revision 2171) +++ tests/morpho/artificial_line_graph_image_wst.cc (working copy) @@ -49,14 +49,14 @@ #include <vector> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing_area_on_vertices.hh> Index: tests/morpho/rank_filter.cc --- tests/morpho/rank_filter.cc (revision 2171) +++ tests/morpho/rank_filter.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::rank_filter. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> Index: tests/morpho/dilation.cc --- tests/morpho/dilation.cc (revision 2171) +++ tests/morpho/dilation.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::dilation. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> Index: tests/morpho/line_graph_image_wst.cc --- tests/morpho/line_graph_image_wst.cc (revision 2171) +++ tests/morpho/line_graph_image_wst.cc (working copy) @@ -31,9 +31,9 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/meyer_wst.hh> Index: tests/morpho/meyer_wst.cc --- tests/morpho/meyer_wst.cc (revision 2171) +++ tests/morpho/meyer_wst.cc (working copy) @@ -30,7 +30,7 @@ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/thinning.cc --- tests/morpho/thinning.cc (revision 2171) +++ tests/morpho/thinning.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::thinning. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/win/rectangle2d.hh> Index: tests/morpho/erosion.cc --- tests/morpho/erosion.cc (revision 2171) +++ tests/morpho/erosion.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::erosion. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> Index: tests/morpho/dilation_max_h.cc --- tests/morpho/dilation_max_h.cc (revision 2171) +++ tests/morpho/dilation_max_h.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::dilatation_fast. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/core/window2d.hh> Index: tests/morpho/hit_or_miss.cc --- tests/morpho/hit_or_miss.cc (revision 2171) +++ tests/morpho/hit_or_miss.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::hit_or_miss. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/win/rectangle2d.hh> Index: tests/morpho/combined.cc --- tests/morpho/combined.cc (revision 2171) +++ tests/morpho/combined.cc (working copy) @@ -30,7 +30,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> Index: tests/morpho/gradient_elementary.cc --- tests/morpho/gradient_elementary.cc (revision 2171) +++ tests/morpho/gradient_elementary.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::gradient_elementary. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/io/pbm/load.hh> Index: tests/morpho/laplacian.cc --- tests/morpho/laplacian.cc (revision 2171) +++ tests/morpho/laplacian.cc (working copy) @@ -30,14 +30,14 @@ * \brief Test on mln::morpho::laplacian. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> #include <mln/value/int_u_sat.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/pw/image.hh> #include <mln/arith/plus.hh> Index: tests/morpho/closing_volume.cc --- tests/morpho/closing_volume.cc (revision 2171) +++ tests/morpho/closing_volume.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/morpho/closing_volume.cc /// \brief Test on mln::morpho::closing_volume. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/closing_area.cc --- tests/morpho/closing_area.cc (revision 2171) +++ tests/morpho/closing_area.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::closing_area. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/closing_height.cc --- tests/morpho/closing_height.cc (revision 2171) +++ tests/morpho/closing_height.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/morpho/closing_height.cc /// \brief Test on mln::morpho::closing_height. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/opening_volume.cc --- tests/morpho/opening_volume.cc (revision 2171) +++ tests/morpho/opening_volume.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/morpho/opening_volume.cc /// \brief Test on mln::morpho::opening_volume. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/opening_area.cc --- tests/morpho/opening_area.cc (revision 2171) +++ tests/morpho/opening_area.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::opening_area. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/lena_line_graph_image_wst1.cc --- tests/morpho/lena_line_graph_image_wst1.cc (revision 2171) +++ tests/morpho/lena_line_graph_image_wst1.cc (working copy) @@ -48,14 +48,14 @@ #include <vector> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/gradient.hh> #include <mln/morpho/closing_area.hh> Index: tests/morpho/opening_height.cc --- tests/morpho/opening_height.cc (revision 2171) +++ tests/morpho/opening_height.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/morpho/opening_height.cc /// \brief Test on mln::morpho::opening_height. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/erosion_min_h.cc --- tests/morpho/erosion_min_h.cc (revision 2171) +++ tests/morpho/erosion_min_h.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::erosion_fast */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/core/window2d.hh> Index: tests/morpho/lena_line_graph_image_wst2.cc --- tests/morpho/lena_line_graph_image_wst2.cc (revision 2171) +++ tests/morpho/lena_line_graph_image_wst2.cc (working copy) @@ -51,14 +51,14 @@ #include <vector> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing_area_on_vertices.hh> Index: tests/display/show.cc --- tests/display/show.cc (revision 2171) +++ tests/display/show.cc (working copy) @@ -30,14 +30,14 @@ * \brief Tests on mln::display::show. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/make/win_chamfer.hh> #include <mln/geom/chamfer.hh> #include <mln/value/rgb8.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/display/save.hh> Index: tests/display/save_and_show.cc --- tests/display/save_and_show.cc (revision 2171) +++ tests/display/save_and_show.cc (working copy) @@ -30,14 +30,14 @@ * \brief Tests on mln::display::save_and_show. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/make/win_chamfer.hh> #include <mln/geom/chamfer.hh> #include <mln/value/rgb8.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: tests/display/color_pretty.cc --- tests/display/color_pretty.cc (revision 2171) +++ tests/display/color_pretty.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::display::color::pretty. */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/inplace.hh> # include <mln/value/rgb8.hh> # include <mln/display/color_pretty.hh> # include <mln/level/compare.hh> Index: tests/io/pgm/pgm27.cc --- tests/io/pgm/pgm27.cc (revision 2171) +++ tests/io/pgm/pgm27.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> Index: tests/io/pgm/pgm19.cc --- tests/io/pgm/pgm19.cc (revision 2171) +++ tests/io/pgm/pgm19.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> Index: tests/io/pgm/pgm.cc --- tests/io/pgm/pgm.cc (revision 2171) +++ tests/io/pgm/pgm.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> Index: tests/io/pgm/pgm16.cc --- tests/io/pgm/pgm16.cc (revision 2171) +++ tests/io/pgm/pgm16.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/value/int_u8.hh> Index: tests/io/fits/fits.cc --- tests/io/fits/fits.cc (revision 2171) +++ tests/io/fits/fits.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::fits::load. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> Index: tests/io/ppm/ppm.cc --- tests/io/ppm/ppm.cc (revision 2171) +++ tests/io/ppm/ppm.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <mln/io/ppm/load.hh> Index: tests/io/ppm/ppm23.cc --- tests/io/ppm/ppm23.cc (revision 2171) +++ tests/io/ppm/ppm23.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/value/rgb8.hh> Index: tests/io/ppm/ppm16.cc --- tests/io/ppm/ppm16.cc (revision 2171) +++ tests/io/ppm/ppm16.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/value/rgb8.hh> Index: tests/io/pbm/pbm.cc --- tests/io/pbm/pbm.cc (revision 2171) +++ tests/io/pbm/pbm.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::pbm::. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: tests/logical/or.cc --- tests/logical/or.cc (revision 2171) +++ tests/logical/or.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::logical::or. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/logical/or.hh> #include <mln/level/compare.hh> Index: tests/logical/not.cc --- tests/logical/not.cc (revision 2171) +++ tests/logical/not.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::logical::not. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/logical/not.hh> #include <mln/level/compare.hh> Index: tests/logical/or_full.cc --- tests/logical/or_full.cc (revision 2171) +++ tests/logical/or_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::logical::or. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/logical/or.hh> #include <mln/level/compare.hh> #include <mln/level/apply.hh> Index: tests/logical/and_not.cc --- tests/logical/and_not.cc (revision 2171) +++ tests/logical/and_not.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::logical::and_not. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/logical/and_not.hh> #include <mln/level/compare.hh> Index: tests/logical/and.cc --- tests/logical/and.cc (revision 2171) +++ tests/logical/and.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::logical::and. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/logical/and.hh> #include <mln/level/compare.hh> Index: tests/logical/not_full.cc --- tests/logical/not_full.cc (revision 2171) +++ tests/logical/not_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::logical::not. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/logical/not.hh> #include <mln/level/compare.hh> #include <mln/level/apply.hh> Index: tests/logical/and_not_full.cc --- tests/logical/and_not_full.cc (revision 2171) +++ tests/logical/and_not_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::logical::and_not. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/logical/and_not.hh> #include <mln/level/compare.hh> #include <mln/level/apply.hh> Index: tests/logical/and_full.cc --- tests/logical/and_full.cc (revision 2171) +++ tests/logical/and_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::logical::and. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/logical/and.hh> #include <mln/level/compare.hh> #include <mln/level/apply.hh> Index: tests/canvas/chamfer.cc --- tests/canvas/chamfer.cc (revision 2171) +++ tests/canvas/chamfer.cc (working copy) @@ -30,10 +30,10 @@ * \brief Tests on mln::geom::chamfer. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> Index: tests/canvas/browsing/directional.cc --- tests/canvas/browsing/directional.cc (revision 2171) +++ tests/canvas/browsing/directional.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::canvas::browsing::directional. */ -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/canvas/browsing/directional.hh> #include <mln/fun/p2v/iota.hh> #include <mln/debug/println.hh> Index: tests/canvas/browsing/fwd.cc --- tests/canvas/browsing/fwd.cc (revision 2171) +++ tests/canvas/browsing/fwd.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::canvas::browsing::fwd.hh */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/canvas/browsing/fwd.hh> #include <mln/fun/p2v/iota.hh> #include <mln/debug/println.hh> Index: tests/canvas/browsing/snake_fwd.cc --- tests/canvas/browsing/snake_fwd.cc (revision 2171) +++ tests/canvas/browsing/snake_fwd.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::canvas::browsing::snake_fwd. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/canvas/browsing/snake_fwd.hh> #include <mln/fun/p2v/iota.hh> #include <mln/debug/println.hh> Index: tests/util/tree_to_image.cc --- tests/util/tree_to_image.cc (revision 2171) +++ tests/util/tree_to_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/util/tree.hh> #include <mln/core/contract.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> Index: tests/util/branch_iter_ind.cc --- tests/util/branch_iter_ind.cc (revision 2171) +++ tests/util/branch_iter_ind.cc (working copy) @@ -32,7 +32,7 @@ * */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/util/tree.hh> #include <mln/util/branch_iter_ind.hh> Index: tests/util/lemmings.cc --- tests/util/lemmings.cc (revision 2171) +++ tests/util/lemmings.cc (working copy) @@ -33,7 +33,7 @@ */ #include <mln/util/lemmings.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> int main () { Index: tests/util/tree_fast_to_image.cc --- tests/util/tree_fast_to_image.cc (revision 2171) +++ tests/util/tree_fast_to_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/util/tree_fast.hh> #include <mln/core/contract.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> Index: tests/util/branch_iter.cc --- tests/util/branch_iter.cc (revision 2171) +++ tests/util/branch_iter.cc (working copy) @@ -32,7 +32,7 @@ * */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/util/tree.hh> #include <mln/util/branch_iter.hh> Index: tests/labeling/regional_maxima.cc --- tests/labeling/regional_maxima.cc (revision 2171) +++ tests/labeling/regional_maxima.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::regional_maxima. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> #include <mln/io/pgm/load.hh> Index: tests/labeling/background.cc --- tests/labeling/background.cc (revision 2171) +++ tests/labeling/background.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::background. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> #include <mln/labeling/background.hh> Index: tests/labeling/blobs.cc --- tests/labeling/blobs.cc (revision 2171) +++ tests/labeling/blobs.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::blobs. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> #include <mln/labeling/blobs.hh> Index: tests/labeling/flat_zones.cc --- tests/labeling/flat_zones.cc (revision 2171) +++ tests/labeling/flat_zones.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::flat_zones. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/core/neighb2d.hh> Index: tests/labeling/level.cc --- tests/labeling/level.cc (revision 2171) +++ tests/labeling/level.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::level. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> @@ -40,7 +40,7 @@ #include <mln/labeling/level.hh> #include <mln/level/paste.hh> #include <mln/pw/all.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/debug/println.hh> Index: tests/labeling/foreground.cc --- tests/labeling/foreground.cc (revision 2171) +++ tests/labeling/foreground.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::foreground. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> #include <mln/labeling/foreground.hh> Index: tests/labeling/regional_minima.cc --- tests/labeling/regional_minima.cc (revision 2171) +++ tests/labeling/regional_minima.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::regional_minima. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> #include <mln/io/pgm/load.hh> Index: apps/statues/mesh-segm.cc --- apps/statues/mesh-segm.cc (revision 2171) +++ apps/statues/mesh-segm.cc (working copy) @@ -45,8 +45,8 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/morpho/closing_area.hh> #include <mln/morpho/meyer_wst.hh> Index: apps/statues/mesh-skel.cc --- apps/statues/mesh-skel.cc (revision 2171) +++ apps/statues/mesh-skel.cc (working copy) @@ -45,8 +45,8 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/morpho/closing_area.hh> #include <mln/labeling/regional_minima.hh> Index: doc/tutorial/examples/sub_image.cc --- doc/tutorial/examples/sub_image.cc (revision 2171) +++ doc/tutorial/examples/sub_image.cc (working copy) @@ -1,6 +1,6 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_line2d.cc --- doc/tutorial/examples/p_line2d.cc (revision 2171) +++ doc/tutorial/examples/p_line2d.cc (working copy) @@ -1,10 +1,10 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/pw/all.hh> # include <mln/core/site_set/line2d.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/level/fill.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_array.cc --- doc/tutorial/examples/p_array.cc (revision 2171) +++ doc/tutorial/examples/p_array.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_array.2.cc --- doc/tutorial/examples/p_array.2.cc (revision 2171) +++ doc/tutorial/examples/p_array.2.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/core/window.hh> Index: doc/tutorial/examples/image_if.cc --- doc/tutorial/examples/image_if.cc (revision 2171) +++ doc/tutorial/examples/image_if.cc (working copy) @@ -1,6 +1,6 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image_if.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_image.cc --- doc/tutorial/examples/p_image.cc (revision 2171) +++ doc/tutorial/examples/p_image.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/core/site_set/p_image.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_queue.cc --- doc/tutorial/examples/p_queue.cc (revision 2171) +++ doc/tutorial/examples/p_queue.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_queue.hh> # include <mln/core/site_set/p_queue_fast.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/image_plain.cc --- doc/tutorial/examples/image_plain.cc (revision 2171) +++ doc/tutorial/examples/image_plain.cc (working copy) @@ -1,5 +1,5 @@ -# include <mln/core/image2d.hh> -# include <mln/core/plain.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/plain.hh> # include <mln/debug/println.hh> # include <mln/debug/iota.hh> # include <mln/level/fill_with_value.hh> Index: doc/tutorial/examples/p_vaccess.cc --- doc/tutorial/examples/p_vaccess.cc (revision 2171) +++ doc/tutorial/examples/p_vaccess.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> @@ -10,7 +10,7 @@ # include <mln/core/alias/p_runs2d.hh> # include <mln/core/site_set/p_vaccess.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image_if.hh> # include <mln/pw/all.hh> # include <mln/convert/from_to.hh> Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2171) +++ doc/tutorial/examples/window.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/window2d.hh> # include <mln/core/site_set/p_array.hh> Index: doc/tutorial/examples/p_key.cc --- doc/tutorial/examples/p_key.cc (revision 2171) +++ doc/tutorial/examples/p_key.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_key.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_key.2.cc --- doc/tutorial/examples/p_key.2.cc (revision 2171) +++ doc/tutorial/examples/p_key.2.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_key.hh> # include <mln/value/int_u8.hh> # include <mln/io/pgm/load.hh> Index: doc/tutorial/examples/image2d.cc --- doc/tutorial/examples/image2d.cc (revision 2171) +++ doc/tutorial/examples/image2d.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/window2d.hh> # include <mln/core/site_set/p_array.hh> Index: doc/tutorial/examples/image_safe.cc --- doc/tutorial/examples/image_safe.cc (revision 2171) +++ doc/tutorial/examples/image_safe.cc (working copy) @@ -1,6 +1,6 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/line2d.hh> -# include <mln/core/safe.hh> +# include <mln/core/image/safe.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> Index: doc/tutorial/examples/proxy.cc --- doc/tutorial/examples/proxy.cc (revision 2171) +++ doc/tutorial/examples/proxy.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_run.cc --- doc/tutorial/examples/p_run.cc (revision 2171) +++ doc/tutorial/examples/p_run.cc (working copy) @@ -1,10 +1,10 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/alias/p_run2d.hh> # include <mln/core/site_set/p_set_of.hh> # include <mln/convert/from_to.hh> # include <mln/debug/println.hh> -// # include <mln/core/sparse_image.hh> +// # include <mln/core/image/sparse_image.hh> template <typename I> Index: doc/tutorial/examples/box.cc --- doc/tutorial/examples/box.cc (revision 2171) +++ doc/tutorial/examples/box.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/image_flat.cc --- doc/tutorial/examples/image_flat.cc (revision 2171) +++ doc/tutorial/examples/image_flat.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/image/flat_image.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_mutable_array_of.cc --- doc/tutorial/examples/p_mutable_array_of.cc (revision 2171) +++ doc/tutorial/examples/p_mutable_array_of.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_mutable_array_of.hh> # include <mln/core/site_set/p_run.hh> # include <mln/convert/from_to.hh> @@ -6,7 +6,7 @@ // Used by display. # include <mln/geom/bbox.hh> # include <mln/debug/println.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> template <typename S> Index: doc/benchmark/p_runs.cc --- doc/benchmark/p_runs.cc (revision 2171) +++ doc/benchmark/p_runs.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/io/pbm/load.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/alias/p_run2d.hh> # include <mln/core/p_set_of.hh> # include <mln/convert/from_to.hh> Index: doc/benchmark/image2d.cc --- doc/benchmark/image2d.cc (revision 2171) +++ doc/benchmark/image2d.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/util/timer.hh> # include <mln/core/pixter2d.hh> Index: doc/examples/labeling_algo.cc --- doc/examples/labeling_algo.cc (revision 2171) +++ doc/examples/labeling_algo.cc (working copy) @@ -30,8 +30,8 @@ * \brief Test on mln::geom::seeds2tiling. */ -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> Index: mln/debug/put_word.hh --- mln/debug/put_word.hh (revision 2171) +++ mln/debug/put_word.hh (working copy) @@ -34,7 +34,7 @@ */ # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> namespace mln Index: mln/debug/println.spe.hh --- mln/debug/println.spe.hh (revision 2171) +++ mln/debug/println.spe.hh (working copy) @@ -114,7 +114,7 @@ # endif // MLN_CORE_SITE_SET_BOX2D_HH -# ifdef MLN_CORE_IMAGE2D_H_HH +# ifdef MLN_CORE_IMAGE_IMAGE2D_H_HH // Hexa version. template <typename I> @@ -147,7 +147,7 @@ std::cout << std::endl; } -# endif // MLN_CORE_IMAGE2D_H_HH +# endif // MLN_CORE_IMAGE_IMAGE2D_H_HH # ifdef MLN_CORE_SITE_SET_BOX3D_HH Index: mln/core/internal/graph_vicinity_piter.hh --- mln/core/internal/graph_vicinity_piter.hh (revision 2171) +++ mln/core/internal/graph_vicinity_piter.hh (working copy) @@ -39,7 +39,7 @@ # include <mln/core/concept/site_iterator.hh> # include <mln/core/site_set/p_graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> /* FIXME: Due to the poor interface of mln::p_graph and mln::util::graph, we show to much implementation details here. Index: mln/core/internal/line_graph_vicinity_piter.hh --- mln/core/internal/line_graph_vicinity_piter.hh (revision 2171) +++ mln/core/internal/line_graph_vicinity_piter.hh (working copy) @@ -41,7 +41,7 @@ # include <mln/core/concept/site_iterator.hh> # include <mln/core/site_set/p_line_graph.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> namespace mln { Index: mln/core/image/mono_rle_encode.hh --- mln/core/image/mono_rle_encode.hh (revision 2171) +++ mln/core/image/mono_rle_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_MONO_RLE_ENCODE_HH -# define MLN_CORE_MONO_RLE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_MONO_RLE_ENCODE_HH +# define MLN_CORE_IMAGE_MONO_RLE_ENCODE_HH -/*! \file mln/core/mono_rle_encode.hh +/*! \file mln/core/image/mono_rle_encode.hh * * \brief Definintion of function which encodes an image in mono_rle_image. */ -# include <mln/core/mono_rle_image.hh> +# include <mln/core/image/mono_rle_image.hh> namespace mln { @@ -107,4 +107,4 @@ } -#endif // ! MLN_CORE_MONO_RLE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_MONO_RLE_ENCODE_HH Index: mln/core/image/value_encode.hh --- mln/core/image/value_encode.hh (revision 2171) +++ mln/core/image/value_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_VALUE_ENCODE_HH_ -# define MLN_CORE_VALUE_ENCODE_HH_ +#ifndef MLN_CORE_IMAGE_VALUE_ENCODE_HH_ +# define MLN_CORE_IMAGE_VALUE_ENCODE_HH_ -/*! \file mln/core/value_encode.hh +/*! \file mln/core/image/value_encode.hh * * \brief Definition of function which encodes an image in value_enc_image. */ -# include <mln/core/value_enc_image.hh> +# include <mln/core/image/value_enc_image.hh> namespace mln { @@ -112,4 +112,4 @@ } -#endif // ! MLN_CORE_VALUE_ENCODE_HH_ +#endif // ! MLN_CORE_IMAGE_VALUE_ENCODE_HH_ Index: mln/core/image/decorated_image.hh --- mln/core/image/decorated_image.hh (revision 2171) +++ mln/core/image/decorated_image.hh (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DECORATED_IMAGE_HH -# define MLN_CORE_DECORATED_IMAGE_HH +#ifndef MLN_CORE_IMAGE_DECORATED_IMAGE_HH +# define MLN_CORE_IMAGE_DECORATED_IMAGE_HH # include <mln/core/internal/image_identity.hh> # include <mln/value/proxy.hh> -/*! \file mln/core/decorated_image.hh +/*! \file mln/core/image/decorated_image.hh * * \brief Definition of an image that can have additional features. */ @@ -278,4 +278,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DECORATED_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_DECORATED_IMAGE_HH Index: mln/core/image/cast_image.hh --- mln/core/image/cast_image.hh (revision 2171) +++ mln/core/image/cast_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_CAST_IMAGE_HH -# define MLN_CORE_CAST_IMAGE_HH +#ifndef MLN_CORE_IMAGE_CAST_IMAGE_HH +# define MLN_CORE_IMAGE_CAST_IMAGE_HH -/*! \file mln/core/cast_image.hh +/*! \file mln/core/image/cast_image.hh * * \brief Definition of an image morpher that make the user see the * same image but with another data type. @@ -184,4 +184,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_CAST_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_CAST_IMAGE_HH Index: mln/core/image/translate_image.hh --- mln/core/image/translate_image.hh (revision 2171) +++ mln/core/image/translate_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TRANSLATE_IMAGE_HH -# define MLN_CORE_TRANSLATE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH +# define MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH -/*! \file mln/core/translate_image.hh +/*! \file mln/core/image/translate_image.hh * * \brief Definition of an image which be translated by a delta point. */ @@ -213,4 +213,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TRANSLATE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH Index: mln/core/image/image_if.hh --- mln/core/image/image_if.hh (revision 2171) +++ mln/core/image/image_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE_IF_HH -# define MLN_CORE_IMAGE_IF_HH +#ifndef MLN_CORE_IMAGE_IMAGE_IF_HH +# define MLN_CORE_IMAGE_IMAGE_IF_HH -/*! \file mln/core/image_if.hh +/*! \file mln/core/image/image_if.hh * * \brief Definition of a image which domain is restricted by a * function. @@ -239,4 +239,4 @@ # undef Super -#endif // ! MLN_CORE_IMAGE_IF_HH +#endif // ! MLN_CORE_IMAGE_IMAGE_IF_HH Index: mln/core/image/obased_rle_image.hh --- mln/core/image/obased_rle_image.hh (revision 2171) +++ mln/core/image/obased_rle_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_OBASED_RLE_IMAGE_HH -# define MLN_CORE_OBASED_RLE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_OBASED_RLE_IMAGE_HH +# define MLN_CORE_IMAGE_OBASED_RLE_IMAGE_HH -/*! \file mln/core/obased_rle_image.hh +/*! \file mln/core/image/obased_rle_image.hh * * \brief Definition of an image with rle encoding. */ @@ -287,4 +287,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_OBASED_RLE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_OBASED_RLE_IMAGE_HH Index: mln/core/image/line_graph_neighborhood_piter.hh --- mln/core/image/line_graph_neighborhood_piter.hh (revision 2171) +++ mln/core/image/line_graph_neighborhood_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH -# define MLN_CORE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH -/// \file mln/core/line_graph_neighborhood_piter.hh +/// \file mln/core/image/line_graph_neighborhood_piter.hh /// \brief Definition of a point iterator on a line graph neighborhood. # include <mln/core/internal/line_graph_vicinity_piter.hh> @@ -295,4 +295,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH Index: mln/core/image/line_graph_window_piter.hh --- mln/core/image/line_graph_window_piter.hh (revision 2171) +++ mln/core/image/line_graph_window_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_WINDOW_PITER_HH -# define MLN_CORE_LINE_GRAPH_WINDOW_PITER_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_WINDOW_PITER_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_WINDOW_PITER_HH -/// \file mln/core/line_graph_window_piter.hh +/// \file mln/core/image/line_graph_window_piter.hh /// \brief Definition of a point iterator on a line_graph window. # include <mln/core/internal/line_graph_vicinity_piter.hh> @@ -292,4 +292,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_WINDOW_PITER_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_WINDOW_PITER_HH Index: mln/core/image/value_enc_image.hh --- mln/core/image/value_enc_image.hh (revision 2171) +++ mln/core/image/value_enc_image.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_VALUE_ENC_IMAGE_CC_ # define MLN_CORE_VALUE_ENC_IMAGE_CC_ -/*! \file mln/core/value_enc_image.hh +/*! \file mln/core/image/value_enc_image.hh * * \brief Define the class value_enc_image. */ Index: mln/core/image/graph_image.hh --- mln/core/image/graph_image.hh (revision 2171) +++ mln/core/image/graph_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_IMAGE_HH -# define MLN_CORE_GRAPH_IMAGE_HH +#ifndef MLN_CORE_IMAGE_GRAPH_IMAGE_HH +# define MLN_CORE_IMAGE_GRAPH_IMAGE_HH -/// \file mln/core/graph_image.hh +/// \file mln/core/image/graph_image.hh /// \brief Definition of a graph-based image. # include <mln/trait/images.hh> @@ -36,7 +36,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> # include <mln/core/site_set/p_graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> # include <mln/value/set.hh> # include <vector> @@ -297,4 +297,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_IMAGE_HH Index: mln/core/image/line_graph_elt_neighborhood.hh --- mln/core/image/line_graph_elt_neighborhood.hh (revision 2171) +++ mln/core/image/line_graph_elt_neighborhood.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH -# define MLN_CORE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH -/// \file mln/core/line_graph_elt_neighborhood.hh +/// \file mln/core/image/line_graph_elt_neighborhood.hh /// \brief Definition of the elementary ``neighborhood'' on a line graph. /* FIXME: Have a consistent naming: we have window (without '_') but @@ -47,8 +47,8 @@ # include <set> # include <mln/core/concept/neighborhood.hh> -# include <mln/core/line_graph_psite.hh> -# include <mln/core/line_graph_neighborhood_piter.hh> +# include <mln/core/image/line_graph_psite.hh> +# include <mln/core/image/line_graph_neighborhood_piter.hh> namespace mln @@ -140,4 +140,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH Index: mln/core/image/line_graph_elt_window.hh --- mln/core/image/line_graph_elt_window.hh (revision 2171) +++ mln/core/image/line_graph_elt_window.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_ELT_WINDOW_HH -# define MLN_CORE_LINE_GRAPH_ELT_WINDOW_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_ELT_WINDOW_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_ELT_WINDOW_HH -/// \file mln/core/line_graph_elt_window.hh +/// \file mln/core/image/line_graph_elt_window.hh /// \brief Definition of the elementary ``window'' on a line graph. /* FIXME: Have a consistent naming: we have window (without '_') but @@ -45,8 +45,8 @@ Enrich their interfaces to avoid that. */ # include <mln/core/concept/window.hh> -# include <mln/core/line_graph_psite.hh> -# include <mln/core/line_graph_window_piter.hh> +# include <mln/core/image/line_graph_psite.hh> +# include <mln/core/image/line_graph_window_piter.hh> namespace mln @@ -201,4 +201,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_ELT_WINDOW_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_ELT_WINDOW_HH Index: mln/core/image/mono_obased_rle_encode.hh --- mln/core/image/mono_obased_rle_encode.hh (revision 2171) +++ mln/core/image/mono_obased_rle_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_MONO_OBASED_RLE_ENCODE_HH -# define MLN_CORE_MONO_OBASED_RLE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_MONO_OBASED_RLE_ENCODE_HH +# define MLN_CORE_IMAGE_MONO_OBASED_RLE_ENCODE_HH -/*! \file mln/core/mono_obased_rle_encode.hh +/*! \file mln/core/image/mono_obased_rle_encode.hh * * \brief Definintion of function which encodes an image in mono_obased_rle_image. */ -# include <mln/core/mono_obased_rle_image.hh> +# include <mln/core/image/mono_obased_rle_image.hh> namespace mln { @@ -119,4 +119,4 @@ } -#endif // ! MLN_CORE_MONO_OBASED_RLE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_MONO_OBASED_RLE_ENCODE_HH Index: mln/core/image/graph_psite.hh --- mln/core/image/graph_psite.hh (revision 2171) +++ mln/core/image/graph_psite.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_PSITE_HH -# define MLN_CORE_GRAPH_PSITE_HH +#ifndef MLN_CORE_IMAGE_GRAPH_PSITE_HH +# define MLN_CORE_IMAGE_GRAPH_PSITE_HH -/// \file mln/core/graph_psite.hh +/// \file mln/core/image/graph_psite.hh /// \brief Definition of a graph-based point site. # include <mln/core/concept/point_site.hh> @@ -235,4 +235,4 @@ } // end of mln -#endif // MLN_CORE_GRAPH_PSITE_HH +#endif // MLN_CORE_IMAGE_GRAPH_PSITE_HH Index: mln/core/image/sparse_encode.hh --- mln/core/image/sparse_encode.hh (revision 2171) +++ mln/core/image/sparse_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SPARSE_ENCODE_HH -# define MLN_CORE_SPARSE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_SPARSE_ENCODE_HH +# define MLN_CORE_IMAGE_SPARSE_ENCODE_HH -/*! \file mln/core/sparse_encode.hh +/*! \file mln/core/image/sparse_encode.hh * * \brief Definintion of function which encodes an image in sparse_image. */ -# include <mln/core/sparse_image.hh> +# include <mln/core/image/sparse_image.hh> namespace mln { @@ -117,4 +117,4 @@ } -#endif // ! MLN_CORE_SPARSE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_SPARSE_ENCODE_HH Index: mln/core/image/line_graph_image.hh --- mln/core/image/line_graph_image.hh (revision 2171) +++ mln/core/image/line_graph_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_IMAGE_HH -# define MLN_CORE_LINE_GRAPH_IMAGE_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_IMAGE_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_IMAGE_HH -/// \file mln/core/line_graph_image.hh +/// \file mln/core/image/line_graph_image.hh /// \brief Definition of a line graph-based image. # include <mln/trait/images.hh> @@ -36,7 +36,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> # include <mln/core/site_set/p_line_graph.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> # include <mln/value/set.hh> # include <vector> @@ -345,4 +345,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_IMAGE_HH Index: mln/core/image/line_graph_psite.hh --- mln/core/image/line_graph_psite.hh (revision 2171) +++ mln/core/image/line_graph_psite.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_PSITE_HH -# define MLN_CORE_LINE_GRAPH_PSITE_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_PSITE_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_PSITE_HH -/// \file mln/core/line_graph_psite.hh +/// \file mln/core/image/line_graph_psite.hh /// \brief Definition of a line graph-based point site. # include <mln/core/site_set/p_line_graph.hh> @@ -325,4 +325,4 @@ } // end of mln -#endif // MLN_CORE_LINE_GRAPH_PSITE_HH +#endif // MLN_CORE_IMAGE_LINE_GRAPH_PSITE_HH Index: mln/core/image/safe.hh --- mln/core/image/safe.hh (revision 2171) +++ mln/core/image/safe.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SAFE_HH -# define MLN_CORE_SAFE_HH +#ifndef MLN_CORE_IMAGE_SAFE_HH +# define MLN_CORE_IMAGE_SAFE_HH /*! - * \file mln/core/safe.hh + * \file mln/core/image/safe.hh * * \brief Definition of a morpher that makes image become accessible * at undefined location. @@ -210,4 +210,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SAFE_HH +#endif // ! MLN_CORE_IMAGE_SAFE_HH Index: mln/core/image/rle_image.hh --- mln/core/image/rle_image.hh (revision 2171) +++ mln/core/image/rle_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_RLE_IMAGE_HH -# define MLN_CORE_RLE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_RLE_IMAGE_HH +# define MLN_CORE_IMAGE_RLE_IMAGE_HH -/*! \file mln/core/rle_image.hh +/*! \file mln/core/image/rle_image.hh * * \brief Definition of an image with rle encoding. */ @@ -240,4 +240,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_RLE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_RLE_IMAGE_HH Index: mln/core/image/hexa.hh --- mln/core/image/hexa.hh (revision 2171) +++ mln/core/image/hexa.hh (working copy) @@ -26,11 +26,11 @@ // Public License. -#ifndef MLN_CORE_HEXA_HH -# define MLN_CORE_HEXA_HH +#ifndef MLN_CORE_IMAGE_HEXA_HH +# define MLN_CORE_IMAGE_HEXA_HH -/*! \file mln/core/hexa.hh +/*! \file mln/core/image/hexa.hh * * \brief Definition of a morpher that makes hexagonal the mesh of an * image. @@ -39,7 +39,7 @@ # include <mln/core/internal/image_domain_morpher.hh> # include <mln/core/point2d_h.hh> # include <mln/core/box2d_h.hh> -# include <mln/core/hexa_piter.hh> +# include <mln/core/image/hexa_piter.hh> namespace mln @@ -279,4 +279,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_HEXA_HH +#endif // ! MLN_CORE_IMAGE_HEXA_HH Index: mln/core/image/tr_image.hh --- mln/core/image/tr_image.hh (revision 2171) +++ mln/core/image/tr_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TR_IMAGE_HH -# define MLN_CORE_TR_IMAGE_HH +#ifndef MLN_CORE_IMAGE_TR_IMAGE_HH +# define MLN_CORE_IMAGE_TR_IMAGE_HH -/*! \file mln/core/tr_image.hh +/*! \file mln/core/image/tr_image.hh * * \brief Definition of the morpher mln::tr_image presenting an image * through a (bijective) transformation. @@ -219,4 +219,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TR_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_TR_IMAGE_HH Index: mln/core/image/hexa_piter.hh --- mln/core/image/hexa_piter.hh (revision 2171) +++ mln/core/image/hexa_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_HEXA_PITER_HH -# define MLN_CORE_HEXA_PITER_HH +#ifndef MLN_CORE_IMAGE_HEXA_PITER_HH +# define MLN_CORE_IMAGE_HEXA_PITER_HH -/*! \file mln/core/hexa_piter.hh +/*! \file mln/core/image/hexa_piter.hh * * \brief Definition of iterators on hexagonal points. */ @@ -37,7 +37,7 @@ # include <mln/core/box2d.hh> # include <mln/core/box2d_h.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln { @@ -140,4 +140,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_HEXA_PITER_HH +#endif // ! MLN_CORE_IMAGE_HEXA_PITER_HH Index: mln/core/image/mono_obased_rle_image.hh --- mln/core/image/mono_obased_rle_image.hh (revision 2171) +++ mln/core/image/mono_obased_rle_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_MONO_OBASED_RLE_IMAGE_HH -# define MLN_CORE_MONO_OBASED_RLE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_MONO_OBASED_RLE_IMAGE_HH +# define MLN_CORE_IMAGE_MONO_OBASED_RLE_IMAGE_HH -/*! \file mln/core/mono_obased_rle_image.hh +/*! \file mln/core/image/mono_obased_rle_image.hh * * \brief Definition of an image with rle encoding. */ @@ -38,7 +38,7 @@ # include <mln/core/runs_psite.hh> # include <mln/core/site_set/box.hh> # include <mln/value/set.hh> -# include <mln/core/mono_rle_image.hh> +# include <mln/core/image/mono_rle_image.hh> # include <vector> namespace mln @@ -264,4 +264,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_MONO_OBASED_RLE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_MONO_OBASED_RLE_IMAGE_HH Index: mln/core/image/interpolated.hh --- mln/core/image/interpolated.hh (revision 2171) +++ mln/core/image/interpolated.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERPOLATED_HH -# define MLN_CORE_INTERPOLATED_HH +#ifndef MLN_CORE_IMAGE_INTERPOLATED_HH +# define MLN_CORE_IMAGE_INTERPOLATED_HH -/*! \file mln/core/interpolated.hh +/*! \file mln/core/image/interpolated.hh * * \brief Definition of a morpher that makes an image become readable * with floating coordinates. @@ -191,4 +191,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERPOLATED_HH +#endif // ! MLN_CORE_IMAGE_INTERPOLATED_HH Index: mln/core/image/graph_neighborhood_piter.hh --- mln/core/image/graph_neighborhood_piter.hh (revision 2171) +++ mln/core/image/graph_neighborhood_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_NEIGHBORHOOD_PITER_HH -# define MLN_CORE_GRAPH_NEIGHBORHOOD_PITER_HH +#ifndef MLN_CORE_IMAGE_GRAPH_NEIGHBORHOOD_PITER_HH +# define MLN_CORE_IMAGE_GRAPH_NEIGHBORHOOD_PITER_HH -/// \file mln/core/graph_neighborhood_piter.hh +/// \file mln/core/image/graph_neighborhood_piter.hh /// \brief Definition of a point iterator on a graph neighborhood. # include <mln/core/internal/graph_vicinity_piter.hh> @@ -294,4 +294,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_NEIGHBORHOOD_PITER_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_NEIGHBORHOOD_PITER_HH Index: mln/core/image/graph_window_piter.hh --- mln/core/image/graph_window_piter.hh (revision 2171) +++ mln/core/image/graph_window_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_WINDOW_PITER_HH -# define MLN_CORE_GRAPH_WINDOW_PITER_HH +#ifndef MLN_CORE_IMAGE_GRAPH_WINDOW_PITER_HH +# define MLN_CORE_IMAGE_GRAPH_WINDOW_PITER_HH -/// \file mln/core/graph_window_piter.hh +/// \file mln/core/image/graph_window_piter.hh /// \brief Definition of a point iterator on a graph window. # include <mln/core/internal/graph_vicinity_piter.hh> @@ -290,4 +290,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_WINDOW_PITER_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_WINDOW_PITER_HH Index: mln/core/image/sub_image.hh --- mln/core/image/sub_image.hh (revision 2171) +++ mln/core/image/sub_image.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SUB_IMAGE_HH -# define MLN_CORE_SUB_IMAGE_HH +#ifndef MLN_CORE_IMAGE_SUB_IMAGE_HH +# define MLN_CORE_IMAGE_SUB_IMAGE_HH /*! - * \file mln/core/sub_image.hh + * \file mln/core/image/sub_image.hh * * \brief Definition of morpher that makes an image become restricted * given by a point set. @@ -264,4 +264,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SUB_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_SUB_IMAGE_HH Index: mln/core/image/graph_elt_window.hh --- mln/core/image/graph_elt_window.hh (revision 2171) +++ mln/core/image/graph_elt_window.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_ELT_WINDOW_HH -# define MLN_CORE_GRAPH_ELT_WINDOW_HH +#ifndef MLN_CORE_IMAGE_GRAPH_ELT_WINDOW_HH +# define MLN_CORE_IMAGE_GRAPH_ELT_WINDOW_HH -/// \file mln/core/graph_elt_window.hh +/// \file mln/core/image/graph_elt_window.hh /// \brief Definition of the elementary ``window'' on a graph. /* FIXME: Have a consistent naming: we have window (without '_') but @@ -45,8 +45,8 @@ Enrich their interfaces to avoid that. */ # include <mln/core/concept/window.hh> -# include <mln/core/graph_psite.hh> -# include <mln/core/graph_window_piter.hh> +# include <mln/core/image/graph_psite.hh> +# include <mln/core/image/graph_window_piter.hh> namespace mln @@ -202,4 +202,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_ELT_WINDOW_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_ELT_WINDOW_HH Index: mln/core/image/graph_elt_neighborhood.hh --- mln/core/image/graph_elt_neighborhood.hh (revision 2171) +++ mln/core/image/graph_elt_neighborhood.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_ELT_NEIGHBORHOOD_HH -# define MLN_CORE_GRAPH_ELT_NEIGHBORHOOD_HH +#ifndef MLN_CORE_IMAGE_GRAPH_ELT_NEIGHBORHOOD_HH +# define MLN_CORE_IMAGE_GRAPH_ELT_NEIGHBORHOOD_HH -/// \file mln/core/graph_elt_neighborhood.hh +/// \file mln/core/image/graph_elt_neighborhood.hh /// \brief Definition of the elementary ``neighborhood'' on a graph. /* FIXME: Have a consistent naming: we have neighborhood (without '_') @@ -45,8 +45,8 @@ Enrich their interfaces to avoid that. */ # include <mln/core/concept/neighborhood.hh> -# include <mln/core/graph_psite.hh> -# include <mln/core/graph_neighborhood_piter.hh> +# include <mln/core/image/graph_psite.hh> +# include <mln/core/image/graph_neighborhood_piter.hh> namespace mln @@ -136,4 +136,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_ELT_NEIGHBORHOOD_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_ELT_NEIGHBORHOOD_HH Index: mln/core/image/sparse_image.hh --- mln/core/image/sparse_image.hh (revision 2171) +++ mln/core/image/sparse_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SPARSE_IMAGE_HH -# define MLN_CORE_SPARSE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_SPARSE_IMAGE_HH +# define MLN_CORE_IMAGE_SPARSE_IMAGE_HH -/*! \file mln/core/sparse_image.hh +/*! \file mln/core/image/sparse_image.hh * * \brief Definition of an image with sparse encoding. */ @@ -260,4 +260,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SPARSE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_SPARSE_IMAGE_HH Index: mln/core/image/rle_encode.hh --- mln/core/image/rle_encode.hh (revision 2171) +++ mln/core/image/rle_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_RLE_ENCODE_HH -# define MLN_CORE_RLE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_RLE_ENCODE_HH +# define MLN_CORE_IMAGE_RLE_ENCODE_HH -/*! \file mln/core/rle_encode.hh +/*! \file mln/core/image/rle_encode.hh * * \brief Definintion of function which encodes an image in rle_image. */ -# include <mln/core/rle_image.hh> +# include <mln/core/image/rle_image.hh> namespace mln { @@ -112,4 +112,4 @@ } -#endif // ! MLN_CORE_RLE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_RLE_ENCODE_HH Index: mln/core/image/tr_mesh.hh --- mln/core/image/tr_mesh.hh (revision 2171) +++ mln/core/image/tr_mesh.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TR_MESH_HH -# define MLN_CORE_TR_MESH_HH +#ifndef MLN_CORE_IMAGE_TR_MESH_HH +# define MLN_CORE_IMAGE_TR_MESH_HH -/*! \file mln/core/tr_mesh.hh +/*! \file mln/core/image/tr_mesh.hh * * \brief Definition of a mesh that is transformed by a given * transformation. @@ -65,4 +65,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TR_MESH_HH +#endif // ! MLN_CORE_IMAGE_TR_MESH_HH Index: mln/core/image/plain.hh --- mln/core/image/plain.hh (revision 2171) +++ mln/core/image/plain.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_PLAIN_HH -# define MLN_CORE_PLAIN_HH +#ifndef MLN_CORE_IMAGE_PLAIN_HH +# define MLN_CORE_IMAGE_PLAIN_HH -/*! \file mln/core/plain.hh +/*! \file mln/core/image/plain.hh * * \brief Definition of a morpher that prevents an image from sharing * his data. @@ -204,4 +204,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_PLAIN_HH +#endif // ! MLN_CORE_IMAGE_PLAIN_HH Index: mln/core/image/bgraph_image.hh --- mln/core/image/bgraph_image.hh (revision 2171) +++ mln/core/image/bgraph_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BGRAPH_IMAGE_HH -# define MLN_CORE_BGRAPH_IMAGE_HH +#ifndef MLN_CORE_IMAGE_BGRAPH_IMAGE_HH +# define MLN_CORE_IMAGE_BGRAPH_IMAGE_HH -/// \file mln/core/bgraph_image.hh +/// \file mln/core/image/bgraph_image.hh /// \brief Definition of a boost-graph-based image. # include <mln/trait/images.hh> @@ -36,7 +36,7 @@ # include <mln/algebra/vec.hh> # include <mln/core/site_set/p_bgraph.hh> -# include <mln/core/bgraph_psite.hh> +# include <mln/core/image/bgraph_psite.hh> # include <mln/value/set.hh> # include <vector> @@ -297,4 +297,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_BGRAPH_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_BGRAPH_IMAGE_HH Index: mln/core/image/t_image.hh --- mln/core/image/t_image.hh (revision 2171) +++ mln/core/image/t_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_T_IMAGE_HH -# define MLN_CORE_T_IMAGE_HH +#ifndef MLN_CORE_IMAGE_T_IMAGE_HH +# define MLN_CORE_IMAGE_T_IMAGE_HH -/*! \file mln/core/t_image.hh +/*! \file mln/core/image/t_image.hh * * \brief Definition of the "transposed" image class mln::t_image. */ @@ -303,4 +303,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_T_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_T_IMAGE_HH Index: mln/core/image/image1d.hh --- mln/core/image/image1d.hh (revision 2171) +++ mln/core/image/image1d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE1D_HH -# define MLN_CORE_IMAGE1D_HH +#ifndef MLN_CORE_IMAGE_IMAGE1D_HH +# define MLN_CORE_IMAGE_IMAGE1D_HH -/// \file mln/core/image1d.hh +/// \file mln/core/image/image1d.hh /// \brief Definition of the basic mln::image1d class. # include <mln/core/internal/fixme.hh> @@ -592,4 +592,4 @@ # include <mln/make/image1d.hh> -#endif // ! MLN_CORE_IMAGE1D_HH +#endif // ! MLN_CORE_IMAGE_IMAGE1D_HH Index: mln/core/image/bgraph_psite.hh --- mln/core/image/bgraph_psite.hh (revision 2171) +++ mln/core/image/bgraph_psite.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BGRAPH_PSITE_HH -# define MLN_CORE_BGRAPH_PSITE_HH +#ifndef MLN_CORE_IMAGE_BGRAPH_PSITE_HH +# define MLN_CORE_IMAGE_BGRAPH_PSITE_HH -/// \file mln/core/bgraph_psite.hh +/// \file mln/core/image/bgraph_psite.hh /// \brief Definition of a boost-graph-based point site. # include <mln/core/site_set/p_graph.hh> @@ -173,4 +173,4 @@ } // end of mln -#endif // MLN_CORE_BGRAPH_PSITE_HH +#endif // MLN_CORE_IMAGE_BGRAPH_PSITE_HH Index: mln/core/image/fi_adaptor.hh --- mln/core/image/fi_adaptor.hh (revision 2171) +++ mln/core/image/fi_adaptor.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_FI_ADAPTOR_HH -# define MLN_CORE_FI_ADAPTOR_HH +#ifndef MLN_CORE_IMAGE_FI_ADAPTOR_HH +# define MLN_CORE_IMAGE_FI_ADAPTOR_HH -/*! \file mln/core/fi_adaptor.hh +/*! \file mln/core/image/fi_adaptor.hh * * \brief Definition of the fi_adaptor image class. This class aims * to use the fipImage class (Main FreeImagePlus class) through one of @@ -487,4 +487,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_FI_ADAPTOR_HH +#endif // ! MLN_CORE_IMAGE_FI_ADAPTOR_HH Index: mln/core/image/image2d.hh --- mln/core/image/image2d.hh (revision 2171) +++ mln/core/image/image2d.hh (working copy) @@ -26,10 +26,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE2D_HH -# define MLN_CORE_IMAGE2D_HH +#ifndef MLN_CORE_IMAGE_IMAGE2D_HH +# define MLN_CORE_IMAGE_IMAGE2D_HH -/// \file mln/core/image2d.hh +/// \file mln/core/image/image2d.hh /// \brief Definition of the basic mln::image2d class. # include <mln/core/internal/image_primary.hh> @@ -700,4 +700,4 @@ # include <mln/make/image2d.hh> -#endif // ! MLN_CORE_IMAGE2D_HH +#endif // ! MLN_CORE_IMAGE_IMAGE2D_HH Index: mln/core/image/image3d.hh --- mln/core/image/image3d.hh (revision 2171) +++ mln/core/image/image3d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE3D_HH -# define MLN_CORE_IMAGE3D_HH +#ifndef MLN_CORE_IMAGE_IMAGE3D_HH +# define MLN_CORE_IMAGE_IMAGE3D_HH -/// \file mln/core/image3d.hh +/// \file mln/core/image/image3d.hh /// \brief Definition of the basic mln::image3d class. # include <mln/core/internal/fixme.hh> @@ -631,4 +631,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_IMAGE3D_HH +#endif // ! MLN_CORE_IMAGE_IMAGE3D_HH Index: mln/core/image/inplace.hh --- mln/core/image/inplace.hh (revision 2171) +++ mln/core/image/inplace.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INPLACE_HH -# define MLN_CORE_INPLACE_HH +#ifndef MLN_CORE_IMAGE_INPLACE_HH +# define MLN_CORE_IMAGE_INPLACE_HH -/*! \file mln/core/inplace.hh +/*! \file mln/core/image/inplace.hh * * \brief Definition of routine that make temporary objects become * mutable. @@ -63,4 +63,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INPLACE_HH +#endif // ! MLN_CORE_IMAGE_INPLACE_HH Index: mln/core/image/obased_rle_encode.hh --- mln/core/image/obased_rle_encode.hh (revision 2171) +++ mln/core/image/obased_rle_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_OBASED_RLE_ENCODE_HH -# define MLN_CORE_OBASED_RLE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_OBASED_RLE_ENCODE_HH +# define MLN_CORE_IMAGE_OBASED_RLE_ENCODE_HH -/*! \file mln/core/obased_rle_encode.hh +/*! \file mln/core/image/obased_rle_encode.hh * * \brief Definintion of function which encodes an image in obased_rle_image. */ -# include <mln/core/obased_rle_image.hh> +# include <mln/core/image/obased_rle_image.hh> namespace mln { @@ -119,4 +119,4 @@ } -#endif // ! MLN_CORE_OBASED_RLE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_OBASED_RLE_ENCODE_HH Index: mln/core/image/mono_rle_image.hh --- mln/core/image/mono_rle_image.hh (revision 2171) +++ mln/core/image/mono_rle_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_MONO_RLE_IMAGE_HH -# define MLN_CORE_MONO_RLE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_MONO_RLE_IMAGE_HH +# define MLN_CORE_IMAGE_MONO_RLE_IMAGE_HH -/*! \file mln/core/mono_rle_image.hh +/*! \file mln/core/image/mono_rle_image.hh * * \brief Definition of an image with rle encoding. */ @@ -249,4 +249,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_MONO_RLE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_MONO_RLE_IMAGE_HH Index: mln/core/image/image2d_h.hh --- mln/core/image/image2d_h.hh (revision 2171) +++ mln/core/image/image2d_h.hh (working copy) @@ -25,17 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE2D_H_HH -# define MLN_CORE_IMAGE2D_H_HH +#ifndef MLN_CORE_IMAGE_IMAGE2D_H_HH +# define MLN_CORE_IMAGE_IMAGE2D_H_HH -/*! \file mln/core/image2d_h.hh +/*! \file mln/core/image/image2d_h.hh * * \brief Definition of an alias for a 2d image based on an hexagonal * mesh. */ -# include <mln/core/image2d.hh> -# include <mln/core/hexa.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/hexa.hh> # include <mln/border/thickness.hh> @@ -94,4 +94,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_IMAGE2D_H_HH +#endif // ! MLN_CORE_IMAGE_IMAGE2D_H_HH Index: mln/core/p_image2d.hh --- mln/core/p_image2d.hh (revision 2171) +++ mln/core/p_image2d.hh (working copy) @@ -36,8 +36,8 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/core/box2d.hh> -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> # include <mln/accu/bbox.hh> # include <mln/geom/ncols.hh> Index: mln/core/site_set/p_bgraph.hh --- mln/core/site_set/p_bgraph.hh (revision 2171) +++ mln/core/site_set/p_bgraph.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> -# include <mln/core/bgraph_psite.hh> +# include <mln/core/image/bgraph_psite.hh> # include <mln/core/site_set/p_bgraph_piter.hh> Index: mln/core/site_set/p_graph_piter.hh --- mln/core/site_set/p_graph_piter.hh (revision 2171) +++ mln/core/site_set/p_graph_piter.hh (working copy) @@ -30,7 +30,7 @@ # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/site_set/p_graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> /// \file mln/core/site_set/p_graph_piter.hh /// \brief Definition of point iterator on graph-based point set. Index: mln/core/site_set/p_bgraph_piter.hh --- mln/core/site_set/p_bgraph_piter.hh (revision 2171) +++ mln/core/site_set/p_bgraph_piter.hh (working copy) @@ -32,7 +32,7 @@ # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/site_set/p_bgraph.hh> -# include <mln/core/bgraph_psite.hh> +# include <mln/core/image/bgraph_psite.hh> /*! \file mln/core/site_set/p_bgraph_piter.hh * Index: mln/core/site_set/p_line_graph.hh --- mln/core/site_set/p_line_graph.hh (revision 2171) +++ mln/core/site_set/p_line_graph.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> # include <mln/util/tracked_ptr.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> # include <mln/core/site_set/p_line_graph_piter.hh> /* FIXME: This class shares a lot with p_graph. Factor as much as Index: mln/core/site_set/p_line_graph_piter.hh --- mln/core/site_set/p_line_graph_piter.hh (revision 2171) +++ mln/core/site_set/p_line_graph_piter.hh (working copy) @@ -30,7 +30,7 @@ # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/site_set/p_line_graph.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> /// \file mln/core/site_set/p_line_graph_piter.hh /// \brief Definition of point iterator on line graph-based point set. Index: mln/core/site_set/p_graph.hh --- mln/core/site_set/p_graph.hh (revision 2171) +++ mln/core/site_set/p_graph.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/util/tracked_ptr.hh> # include <mln/util/graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> # include <mln/core/site_set/p_graph_piter.hh> Index: mln/draw/graph.hh --- mln/draw/graph.hh (revision 2171) +++ mln/draw/graph.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/level/fill.hh> # include <mln/draw/line.hh> # include <mln/core/site_set/p_graph.hh> -# include <mln/core/graph_image.hh> +# include <mln/core/image/graph_image.hh> namespace mln { @@ -98,7 +98,7 @@ for (size_t l = 0; l < pg.nedges(); ++l) line (exact(ima), // FIXME: Too low-level. See similar remarks - // in mln/core/graph_image.hh + // in mln/core/image/graph_image.hh pg.gr_->vertex_data(pg.gr_->edge(l).v1()), pg.gr_->vertex_data(pg.gr_->edge(l).v2()), edge_v); Index: mln/level/fill_with_image.hh --- mln/level/fill_with_image.hh (revision 2171) +++ mln/level/fill_with_image.hh (working copy) @@ -36,7 +36,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln Index: mln/level/replace.hh --- mln/level/replace.hh (revision 2171) +++ mln/level/replace.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image_if.hh> # include <mln/level/fill.hh> # include <mln/pw/value.hh> Index: mln/level/paste.hh --- mln/level/paste.hh (revision 2171) +++ mln/level/paste.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> // Specializations are in: Index: mln/level/fill.spe.hh --- mln/level/fill.spe.hh (revision 2171) +++ mln/level/fill.spe.hh (working copy) @@ -42,7 +42,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # ifndef MLN_INCLUDE_ONLY Index: mln/level/fill_with_value.hh --- mln/level/fill_with_value.hh (revision 2171) +++ mln/level/fill_with_value.hh (working copy) @@ -41,7 +41,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/image/instant.hh> Index: mln/linear/line_x2_convolve.hh --- mln/linear/line_x2_convolve.hh (revision 2171) +++ mln/linear/line_x2_convolve.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/linear/line_convolve.hh> -# include <mln/core/t_image.hh> +# include <mln/core/image/t_image.hh> Index: mln/accu/count_adjacent_vertices.hh --- mln/accu/count_adjacent_vertices.hh (revision 2171) +++ mln/accu/count_adjacent_vertices.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/accu/internal/base.hh> # include <mln/core/concept/meta_accumulator.hh> -# include <mln/core/line_graph_image.hh> +# include <mln/core/image/line_graph_image.hh> # include <mln/util/pix.hh> namespace mln Index: mln/accu/rank.hh --- mln/accu/rank.hh (revision 2171) +++ mln/accu/rank.hh (working copy) @@ -39,7 +39,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/trait/value_.hh> # include <mln/util/pix.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln { Index: mln/accu/rank_high_quant.hh --- mln/accu/rank_high_quant.hh (revision 2171) +++ mln/accu/rank_high_quant.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/trait/value_.hh> # include <mln/util/pix.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln { Index: mln/accu/rank_bool.hh --- mln/accu/rank_bool.hh (revision 2171) +++ mln/accu/rank_bool.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/trait/value_.hh> # include <mln/util/pix.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln { Index: mln/border/mirror.hh --- mln/border/mirror.hh (revision 2171) +++ mln/border/mirror.hh (working copy) @@ -34,9 +34,9 @@ * mirroring effect. */ -# include <mln/core/image1d.hh> -# include <mln/core/image2d.hh> -# include <mln/core/image3d.hh> +# include <mln/core/image/image1d.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/image3d.hh> # include <mln/core/concept/image.hh> # include <mln/core/internal/fixme.hh> Index: mln/make/image1d.hh --- mln/make/image1d.hh (revision 2171) +++ mln/make/image1d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create an mln::image1d. */ -# include <mln/core/image1d.hh> +# include <mln/core/image/image1d.hh> namespace mln Index: mln/make/image2d.hh --- mln/make/image2d.hh (revision 2171) +++ mln/make/image2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create an mln::image2d in the 2D case. */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> namespace mln Index: mln/convert/to_tiles.hh --- mln/convert/to_tiles.hh (revision 2171) +++ mln/convert/to_tiles.hh (working copy) @@ -33,7 +33,7 @@ * \brief Conversion of a vector of image2d into a tiled image with ratio. */ -# include <mln/core/translate_image.hh> +# include <mln/core/image/translate_image.hh> # include <mln/level/paste.hh> # include <mln/geom/nrows.hh> # include <mln/geom/ncols.hh> Index: mln/convert/to_image.hh --- mln/convert/to_image.hh (revision 2171) +++ mln/convert/to_image.hh (working copy) @@ -33,9 +33,9 @@ * \brief Conversions to mln::Image. */ -# include <mln/core/image1d.hh> -# include <mln/core/image2d.hh> -# include <mln/core/image3d.hh> +# include <mln/core/image/image1d.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/image3d.hh> # include <mln/core/concept/site_set.hh> # include <mln/core/concept/window.hh> Index: mln/convert/to_window.hh --- mln/convert/to_window.hh (revision 2171) +++ mln/convert/to_window.hh (working copy) @@ -42,8 +42,8 @@ # include <mln/pw/cst.hh> # include <mln/metal/is_a.hh> -# include <mln/core/line_graph_elt_neighborhood.hh> -# include <mln/core/line_graph_elt_window.hh> +# include <mln/core/image/line_graph_elt_neighborhood.hh> +# include <mln/core/image/line_graph_elt_window.hh> namespace mln Index: mln/geom/chamfer.hh --- mln/geom/chamfer.hh (revision 2171) +++ mln/geom/chamfer.hh (working copy) @@ -36,9 +36,9 @@ # include <mln/level/fill.hh> # include <mln/core/w_window2d_int.hh> # include <mln/core/w_window2d_float.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/canvas/chamfer.hh> namespace mln Index: mln/morpho/opening_area_on_vertices.hh --- mln/morpho/opening_area_on_vertices.hh (revision 2171) +++ mln/morpho/opening_area_on_vertices.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Morphological area opening on a line graph image computing /// the area in terms of adjacent vertices. -# include <mln/core/line_graph_image.hh> +# include <mln/core/image/line_graph_image.hh> # include <mln/morpho/opening_attribute.hh> # include <mln/accu/count_adjacent_vertices.hh> Index: mln/morpho/line_gradient.hh --- mln/morpho/line_gradient.hh (revision 2171) +++ mln/morpho/line_gradient.hh (working copy) @@ -36,9 +36,9 @@ # include <mln/math/abs.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/window2d.hh> -# include <mln/core/line_graph_image.hh> +# include <mln/core/image/line_graph_image.hh> // FIXME: Generalize to other (input) images as well (image1d, // image3d, etc.). Index: mln/morpho/closing_area_on_vertices.hh --- mln/morpho/closing_area_on_vertices.hh (revision 2171) +++ mln/morpho/closing_area_on_vertices.hh (working copy) @@ -33,7 +33,7 @@ /// \brief Morphological area closing on a line graph image computing /// the area in terms of adjacent vertices. -# include <mln/core/line_graph_image.hh> +# include <mln/core/image/line_graph_image.hh> # include <mln/morpho/closing_attribute.hh> # include <mln/accu/count_adjacent_vertices.hh> Index: mln/display/color_pretty.hh --- mln/display/color_pretty.hh (revision 2171) +++ mln/display/color_pretty.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> Index: mln/display/remove.hh --- mln/display/remove.hh (revision 2171) +++ mln/display/remove.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/display/save.hh> # include <map> Index: mln/display/save.hh --- mln/display/save.hh (revision 2171) +++ mln/display/save.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> Index: mln/display/show.hh --- mln/display/show.hh (revision 2171) +++ mln/display/show.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/display/save.hh> # include <map> Index: mln/io/pfm/load.hh --- mln/io/pfm/load.hh (revision 2171) +++ mln/io/pfm/load.hh (working copy) @@ -40,7 +40,7 @@ # include <iostream> # include <fstream> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> Index: mln/io/pgm/load.hh --- mln/io/pgm/load.hh (revision 2171) +++ mln/io/pgm/load.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> Index: mln/io/fits/load.hh --- mln/io/fits/load.hh (revision 2171) +++ mln/io/fits/load.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> # include <fitsio.h> Index: mln/io/pnm/load.hh --- mln/io/pnm/load.hh (revision 2171) +++ mln/io/pnm/load.hh (working copy) @@ -40,7 +40,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> # include <mln/value/rgb.hh> Index: mln/io/ppm/load.hh --- mln/io/ppm/load.hh (revision 2171) +++ mln/io/ppm/load.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/io/pnm/load.hh> Index: mln/io/pbm/load.hh --- mln/io/pbm/load.hh (revision 2171) +++ mln/io/pbm/load.hh (working copy) @@ -42,7 +42,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/io/pnm/load_header.hh> namespace mln Index: sandbox/duhamel/main_mesh_image.cc --- sandbox/duhamel/main_mesh_image.cc (revision 2171) +++ sandbox/duhamel/main_mesh_image.cc (working copy) @@ -6,7 +6,7 @@ #include <mln/core/mesh_psite.hh> #include <mln/draw/mesh.hh> #include <mln/core/mesh_image.hh> -#include <mln/core/interpolated.hh> +#include <mln/core/image/interpolated.hh> using namespace mln; Index: sandbox/duhamel/queue_p_priority.cc --- sandbox/duhamel/queue_p_priority.cc (revision 2171) +++ sandbox/duhamel/queue_p_priority.cc (working copy) @@ -1,5 +1,5 @@ #include "queue_p_priority.hh" -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> int main () { Index: sandbox/duhamel/graph_labeling.hh --- sandbox/duhamel/graph_labeling.hh (revision 2171) +++ sandbox/duhamel/graph_labeling.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: sandbox/duhamel/translate_image.hh --- sandbox/duhamel/translate_image.hh (revision 2171) +++ sandbox/duhamel/translate_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TRANSLATE_IMAGE_HH -# define MLN_CORE_TRANSLATE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH +# define MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH -/*! \file mln/core/translate_image.hh +/*! \file mln/core/image/translate_image.hh * * \brief Definition of an image class FIXME */ @@ -193,4 +193,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TRANSLATE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH Index: sandbox/duhamel/slow_seed2tiling.cc --- sandbox/duhamel/slow_seed2tiling.cc (revision 2171) +++ sandbox/duhamel/slow_seed2tiling.cc (working copy) @@ -31,8 +31,8 @@ */ -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> @@ -47,10 +47,10 @@ # include <mln/geom/seeds2tiling_with_chamfer.hh> # include <mln/make/voronoi.hh> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/make/win_chamfer.hh> Index: sandbox/duhamel/labeling_algo.cc --- sandbox/duhamel/labeling_algo.cc (revision 2171) +++ sandbox/duhamel/labeling_algo.cc (working copy) @@ -31,7 +31,7 @@ */ # include <mln/core/image2d_b.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> Index: sandbox/duhamel/main.cc --- sandbox/duhamel/main.cc (revision 2171) +++ sandbox/duhamel/main.cc (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/level/fill.hh> Index: sandbox/duhamel/paste.hh --- sandbox/duhamel/paste.hh (revision 2171) +++ sandbox/duhamel/paste.hh (working copy) @@ -2,10 +2,10 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/fast_image.hh> -# include <mln/core/sparse_image.hh> -# include <mln/core/sparse_encode.hh> -# include <mln/core/rle_image.hh> -# include <mln/core/rle_encode.hh> +# include <mln/core/image/sparse_image.hh> +# include <mln/core/image/sparse_encode.hh> +# include <mln/core/image/rle_image.hh> +# include <mln/core/image/rle_encode.hh> namespace mln { Index: sandbox/duhamel/color_sub.cc --- sandbox/duhamel/color_sub.cc (revision 2171) +++ sandbox/duhamel/color_sub.cc (working copy) @@ -31,8 +31,8 @@ */ # include <mln/core/image2d_b.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/inplace.hh> # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> @@ -41,9 +41,9 @@ # include <mln/debug/println.hh> # include <mln/io/ppm/save.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/debug/println.hh> # include <mln/core/w_window2d_int.hh> Index: sandbox/duhamel/chamfer.cc --- sandbox/duhamel/chamfer.cc (revision 2171) +++ sandbox/duhamel/chamfer.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> # include <mln/debug/println.hh> Index: sandbox/duhamel/mem.hh --- sandbox/duhamel/mem.hh (revision 2171) +++ sandbox/duhamel/mem.hh (working copy) @@ -10,11 +10,11 @@ #include <mln/debug/println_with_border.hh> -# include <mln/core/sparse_image.hh> -# include <mln/core/sparse_encode.hh> +# include <mln/core/image/sparse_image.hh> +# include <mln/core/image/sparse_encode.hh> -# include <mln/core/rle_image.hh> -# include <mln/core/rle_encode.hh> +# include <mln/core/image/rle_image.hh> +# include <mln/core/image/rle_encode.hh> namespace mln { Index: sandbox/duhamel/labeling_algo.hh --- sandbox/duhamel/labeling_algo.hh (revision 2171) +++ sandbox/duhamel/labeling_algo.hh (working copy) @@ -5,7 +5,7 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: sandbox/duhamel/extract_array.cc --- sandbox/duhamel/extract_array.cc (revision 2171) +++ sandbox/duhamel/extract_array.cc (working copy) @@ -26,7 +26,7 @@ // Public License. # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/io/pbm/load.hh> # include <mln/debug/println.hh> # include <mln/logical/not.hh> Index: sandbox/duhamel/abr_to_image.cc --- sandbox/duhamel/abr_to_image.cc (revision 2171) +++ sandbox/duhamel/abr_to_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/util/abr.hh> #include <mln/core/contract.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/set_p.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> Index: sandbox/duhamel/translate_image.cc --- sandbox/duhamel/translate_image.cc (revision 2171) +++ sandbox/duhamel/translate_image.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> #include <mln/level/fill.hh> @@ -6,7 +6,7 @@ #include <mln/border/fill.hh> #include <mln/debug/println_with_border.hh> #include <mln/debug/println.hh> -#include <mln/core/translate_image.hh> +#include <mln/core/image/translate_image.hh> int main () { Index: sandbox/pellegrin/first_test.cc --- sandbox/pellegrin/first_test.cc (revision 2171) +++ sandbox/pellegrin/first_test.cc (working copy) @@ -30,7 +30,7 @@ * \brief My first test. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> int main () Index: sandbox/pellegrin/set/test/p_runs.cc --- sandbox/pellegrin/set/test/p_runs.cc (revision 2171) +++ sandbox/pellegrin/set/test/p_runs.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::p_runs_ and related tools. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/p_runs.hh> Index: sandbox/pellegrin/set/test/pset_if.cc --- sandbox/pellegrin/set/test/pset_if.cc (revision 2171) +++ sandbox/pellegrin/set/test/pset_if.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::pset_if. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> Index: sandbox/pellegrin/set/core/p_bgraph.hh --- sandbox/pellegrin/set/core/p_bgraph.hh (revision 2171) +++ sandbox/pellegrin/set/core/p_bgraph.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> -# include <mln/core/bgraph_psite.hh> +# include <mln/core/image/bgraph_psite.hh> # include <mln/core/site_set/p_bgraph_piter.hh> # include <trait/point_set.hh> Index: sandbox/pellegrin/set/core/p_line_graph.hh --- sandbox/pellegrin/set/core/p_line_graph.hh (revision 2171) +++ sandbox/pellegrin/set/core/p_line_graph.hh (working copy) @@ -32,7 +32,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> # include <mln/core/site_set/p_line_graph_piter.hh> # include <mln/core/point_pair.hh> # include <trait/point_set.hh> Index: sandbox/pellegrin/set/core/p_graph.hh --- sandbox/pellegrin/set/core/p_graph.hh (revision 2171) +++ sandbox/pellegrin/set/core/p_graph.hh (working copy) @@ -32,7 +32,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> # include <mln/core/site_set/p_graph_piter.hh> # include <trait/point_set.hh> Index: sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc --- sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc (revision 2171) +++ sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc (working copy) @@ -32,7 +32,7 @@ #include <iostream> #include <string> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include "p_set.hh" Index: sandbox/aroumougame/skeleton/mesh-skel_region.cc --- sandbox/aroumougame/skeleton/mesh-skel_region.cc (revision 2171) +++ sandbox/aroumougame/skeleton/mesh-skel_region.cc (working copy) @@ -45,8 +45,8 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/morpho/closing_area.hh> #include <mln/labeling/regional_minima.hh> Index: sandbox/aroumougame/skeleton/miscellenous.hh --- sandbox/aroumougame/skeleton/miscellenous.hh (revision 2171) +++ sandbox/aroumougame/skeleton/miscellenous.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/site_set/p_set.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u.hh> #include <vector> Index: sandbox/aroumougame/skeleton/test.cc --- sandbox/aroumougame/skeleton/test.cc (revision 2171) +++ sandbox/aroumougame/skeleton/test.cc (working copy) @@ -3,7 +3,7 @@ #include "thinning.hh" #include <mln/level/paste.hh> #include <mln/level/fill.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> Index: sandbox/aroumougame/skeleton/test_image2d.cc --- sandbox/aroumougame/skeleton/test_image2d.cc (revision 2171) +++ sandbox/aroumougame/skeleton/test_image2d.cc (working copy) @@ -1,6 +1,6 @@ #include "thinning.hh" -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> #include <mln/level/paste.hh> Index: sandbox/aroumougame/skeleton/mesh-skel.cc --- sandbox/aroumougame/skeleton/mesh-skel.cc (revision 2171) +++ sandbox/aroumougame/skeleton/mesh-skel.cc (working copy) @@ -45,8 +45,8 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/morpho/closing_area.hh> #include <mln/labeling/regional_minima.hh> Index: sandbox/aroumougame/skeleton/test_image3d.cc --- sandbox/aroumougame/skeleton/test_image3d.cc (revision 2171) +++ sandbox/aroumougame/skeleton/test_image3d.cc (working copy) @@ -6,9 +6,9 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> int main() Index: sandbox/aroumougame/skeleton/thinning.hh --- sandbox/aroumougame/skeleton/thinning.hh (revision 2171) +++ sandbox/aroumougame/skeleton/thinning.hh (working copy) @@ -1,7 +1,7 @@ #include "neighborhood1.hh" #include <mln/core/site_set/p_set.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/math/min.hh> #include <mln/math/sqrt.hh> #include <mln/make/dpoint2d.hh> Index: sandbox/aroumougame/skeleton/sedt.hh --- sandbox/aroumougame/skeleton/sedt.hh (revision 2171) +++ sandbox/aroumougame/skeleton/sedt.hh (working copy) @@ -1,11 +1,11 @@ #include <string> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/clone.hh> #include <mln/math/max.hh> #include <mln/math/min.hh> #include <mln/math/sqr.hh> # include <mln/value/int_u.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> Index: sandbox/nivault/rotation.cc --- sandbox/nivault/rotation.cc (revision 2171) +++ sandbox/nivault/rotation.cc (working copy) @@ -37,7 +37,7 @@ #include <mln/io/pgm/load.hh> #include <mln/core/image2d_b.hh> #include <mln/value/int_u8.hh> -#include <mln/core/interpolated.hh> +#include <mln/core/image/interpolated.hh> int main() Index: sandbox/nivault/plugin-gimp/src/build-image.hh --- sandbox/nivault/plugin-gimp/src/build-image.hh (revision 2171) +++ sandbox/nivault/plugin-gimp/src/build-image.hh (working copy) @@ -34,7 +34,7 @@ # include <src/gimp-image.hh> # include <mln/core/point2d.hh> # include <mln/level/fill.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/literal/all.hh> # include <mln/core/concept/function.hh> Index: sandbox/nivault/extract_score.cc --- sandbox/nivault/extract_score.cc (revision 2171) +++ sandbox/nivault/extract_score.cc (working copy) @@ -27,7 +27,7 @@ # include <vector> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/save.hh> @@ -67,7 +67,7 @@ # include <mln/linear/gaussian.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/level/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> Index: sandbox/nivault/extract_character.cc --- sandbox/nivault/extract_character.cc (revision 2171) +++ sandbox/nivault/extract_character.cc (working copy) @@ -27,7 +27,7 @@ # include <vector> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/io/pbm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/ppm/save.hh> @@ -64,7 +64,7 @@ # include <mln/level/stretch.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/level/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> Index: sandbox/nivault/median.hh --- sandbox/nivault/median.hh (revision 2171) +++ sandbox/nivault/median.hh (working copy) @@ -39,7 +39,7 @@ # include <mln/core/window2d.hh> # include <mln/win/hline2d.hh> # include <mln/win/vline2d.hh> -# include <mln/core/t_image.hh> +# include <mln/core/image/t_image.hh> # include <mln/core/dpoint.hh> # include <mln/accu/median.hh> Index: sandbox/jardonnet/test/reduce.cc --- sandbox/jardonnet/test/reduce.cc (revision 2171) +++ sandbox/jardonnet/test/reduce.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: sandbox/jardonnet/test/icp_ref.cc --- sandbox/jardonnet/test/icp_ref.cc (revision 2171) +++ sandbox/jardonnet/test/icp_ref.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: sandbox/jardonnet/test/gaussian.cc --- sandbox/jardonnet/test/gaussian.cc (revision 2171) +++ sandbox/jardonnet/test/gaussian.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> Index: sandbox/jardonnet/test/icp.cc --- sandbox/jardonnet/test/icp.cc (revision 2171) +++ sandbox/jardonnet/test/icp.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: sandbox/jardonnet/test/gaussian_subsampling.cc --- sandbox/jardonnet/test/gaussian_subsampling.cc (revision 2171) +++ sandbox/jardonnet/test/gaussian_subsampling.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/jardonnet/test/test.cc --- sandbox/jardonnet/test/test.cc (revision 2171) +++ sandbox/jardonnet/test/test.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> Index: sandbox/jardonnet/test/type.cc --- sandbox/jardonnet/test/type.cc (revision 2171) +++ sandbox/jardonnet/test/type.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/sub_sampled_image.hh> Index: sandbox/jardonnet/test/subsampling.cc --- sandbox/jardonnet/test/subsampling.cc (revision 2171) +++ sandbox/jardonnet/test/subsampling.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/jardonnet/registration/chamfer.hh --- sandbox/jardonnet/registration/chamfer.hh (revision 2171) +++ sandbox/jardonnet/registration/chamfer.hh (working copy) @@ -157,7 +157,7 @@ // #include <iostream> // #include <mln/debug/println.hh> -// #include <mln/core/image2d.hh> +// #include <mln/core/image/image2d.hh> // #include <mln/make/win_chamfer.hh> // #include <mln/level/fill.hh> Index: sandbox/geraud/fllt/fllt.hh --- sandbox/geraud/fllt/fllt.hh (revision 2171) +++ sandbox/geraud/fllt/fllt.hh (working copy) @@ -28,14 +28,14 @@ #include <iomanip> #include <set> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.1.cc --- sandbox/geraud/fllt/fllt.svg.1.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.1.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/geraud/fllt/fllt.svg.7.hh --- sandbox/geraud/fllt/fllt.svg.7.hh (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.7.hh (working copy) @@ -31,14 +31,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -25,12 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -25,12 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -25,12 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.6.cc --- sandbox/geraud/fllt/fllt.svg.6.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.6.cc (working copy) @@ -27,14 +27,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt_test.hh --- sandbox/geraud/fllt/fllt_test.hh (revision 2171) +++ sandbox/geraud/fllt/fllt_test.hh (working copy) @@ -27,14 +27,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt.svg.7.hh --- sandbox/geraud/fllt.svg.7.hh (revision 2171) +++ sandbox/geraud/fllt.svg.7.hh (working copy) @@ -31,14 +31,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/dmap.cc --- sandbox/geraud/dmap.cc (revision 2171) +++ sandbox/geraud/dmap.cc (working copy) @@ -1,6 +1,6 @@ #include <vector> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/w_window2d_int.hh> #include <mln/debug/println.hh> #include <mln/level/fill.hh> Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 2171) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -27,14 +27,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/win_fun.cc --- sandbox/geraud/win_fun.cc (revision 2171) +++ sandbox/geraud/win_fun.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/window2d.hh> # include <mln/win/rectangle2d.hh> # include <mln/win/fun.hh> Index: sandbox/geraud/irm.cc --- sandbox/geraud/irm.cc (revision 2171) +++ sandbox/geraud/irm.cc (working copy) @@ -3,11 +3,11 @@ #include <iostream> #include <algorithm> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: sandbox/geraud/cs2d/tuto.cc --- sandbox/geraud/cs2d/tuto.cc (revision 2171) +++ sandbox/geraud/cs2d/tuto.cc (working copy) @@ -1,5 +1,5 @@ -# include <mln/core/image2d.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/neighb2d.hh> # include <mln/core/window2d.hh> Index: sandbox/geraud/cs2d/kruskal.cc --- sandbox/geraud/cs2d/kruskal.cc (revision 2171) +++ sandbox/geraud/cs2d/kruskal.cc (working copy) @@ -1,8 +1,8 @@ # include <vector> -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/image_if_value.hh> # include <mln/core/neighb2d.hh> Index: sandbox/geraud/cs2d/dbl_neighb.cc --- sandbox/geraud/cs2d/dbl_neighb.cc (revision 2171) +++ sandbox/geraud/cs2d/dbl_neighb.cc (working copy) @@ -3,7 +3,7 @@ # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/core/window2d.hh> Index: sandbox/geraud/cs2d/cs2d.hh --- sandbox/geraud/cs2d/cs2d.hh (revision 2171) +++ sandbox/geraud/cs2d/cs2d.hh (working copy) @@ -1,9 +1,9 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/core/window2d.hh> # include <mln/convert/to_window.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image_if.hh> # include <mln/debug/println.hh> Index: sandbox/geraud/cs2d/tuto_bis.cc --- sandbox/geraud/cs2d/tuto_bis.cc (revision 2171) +++ sandbox/geraud/cs2d/tuto_bis.cc (working copy) @@ -1,8 +1,8 @@ # include <vector> -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/image_if_value.hh> # include <mln/core/neighb2d.hh> Index: sandbox/geraud/max_tree_nnodes.cc --- sandbox/geraud/max_tree_nnodes.cc (revision 2171) +++ sandbox/geraud/max_tree_nnodes.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/morpho/includes.hh> # include <mln/level/sort_psites.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/io/pgm/load.hh> Index: sandbox/vigouroux/yuv/test.cc --- sandbox/vigouroux/yuv/test.cc (revision 2171) +++ sandbox/vigouroux/yuv/test.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/yuv/get_blue.hh --- sandbox/vigouroux/yuv/get_blue.hh (revision 2171) +++ sandbox/vigouroux/yuv/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yuv/get_red.hh --- sandbox/vigouroux/yuv/get_red.hh (revision 2171) +++ sandbox/vigouroux/yuv/get_red.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yuv/testfun.cc --- sandbox/vigouroux/yuv/testfun.cc (revision 2171) +++ sandbox/vigouroux/yuv/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/yuv/rgb_to_yuv.hh --- sandbox/vigouroux/yuv/rgb_to_yuv.hh (revision 2171) +++ sandbox/vigouroux/yuv/rgb_to_yuv.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yuv/get_green.hh --- sandbox/vigouroux/yuv/get_green.hh (revision 2171) +++ sandbox/vigouroux/yuv/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/hsi/get_blue.hh --- sandbox/vigouroux/hsi/get_blue.hh (revision 2171) +++ sandbox/vigouroux/hsi/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/hsi/get_red.hh --- sandbox/vigouroux/hsi/get_red.hh (revision 2171) +++ sandbox/vigouroux/hsi/get_red.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/hsi/rgb_to_hsi.hh --- sandbox/vigouroux/hsi/rgb_to_hsi.hh (revision 2171) +++ sandbox/vigouroux/hsi/rgb_to_hsi.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/hsi/get_green.hh --- sandbox/vigouroux/hsi/get_green.hh (revision 2171) +++ sandbox/vigouroux/hsi/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/function.hh --- sandbox/vigouroux/function.hh (revision 2171) +++ sandbox/vigouroux/function.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/tests.cc --- sandbox/vigouroux/tests.cc (revision 2171) +++ sandbox/vigouroux/tests.cc (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/cmy/rgb_to_cmy.hh --- sandbox/vigouroux/cmy/rgb_to_cmy.hh (revision 2171) +++ sandbox/vigouroux/cmy/rgb_to_cmy.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/cmy/test.cc --- sandbox/vigouroux/cmy/test.cc (revision 2171) +++ sandbox/vigouroux/cmy/test.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/cmy/get_blue.hh --- sandbox/vigouroux/cmy/get_blue.hh (revision 2171) +++ sandbox/vigouroux/cmy/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/cmy/fun.hh --- sandbox/vigouroux/cmy/fun.hh (revision 2171) +++ sandbox/vigouroux/cmy/fun.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/cmy/testfun.cc --- sandbox/vigouroux/cmy/testfun.cc (revision 2171) +++ sandbox/vigouroux/cmy/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/cmy/get_green.hh --- sandbox/vigouroux/cmy/get_green.hh (revision 2171) +++ sandbox/vigouroux/cmy/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/xyz/test.cc --- sandbox/vigouroux/xyz/test.cc (revision 2171) +++ sandbox/vigouroux/xyz/test.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/xyz/rgb_to_xyz.hh --- sandbox/vigouroux/xyz/rgb_to_xyz.hh (revision 2171) +++ sandbox/vigouroux/xyz/rgb_to_xyz.hh (working copy) @@ -2,7 +2,7 @@ # define OLENA_CONVERT_RGBXYZ_HH # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/xyz/get_blue.hh --- sandbox/vigouroux/xyz/get_blue.hh (revision 2171) +++ sandbox/vigouroux/xyz/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/xyz/get_red.hh --- sandbox/vigouroux/xyz/get_red.hh (revision 2171) +++ sandbox/vigouroux/xyz/get_red.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/xyz/testfun.cc --- sandbox/vigouroux/xyz/testfun.cc (revision 2171) +++ sandbox/vigouroux/xyz/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/xyz/get_green.hh --- sandbox/vigouroux/xyz/get_green.hh (revision 2171) +++ sandbox/vigouroux/xyz/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/moyenne.cc --- sandbox/vigouroux/moyenne.cc (revision 2171) +++ sandbox/vigouroux/moyenne.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include "rgb.hh" #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/lap.cc --- sandbox/vigouroux/lap.cc (revision 2171) +++ sandbox/vigouroux/lap.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: sandbox/vigouroux/yiq/test.cc --- sandbox/vigouroux/yiq/test.cc (revision 2171) +++ sandbox/vigouroux/yiq/test.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/yiq/get_blue.hh --- sandbox/vigouroux/yiq/get_blue.hh (revision 2171) +++ sandbox/vigouroux/yiq/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yiq/get_red.hh --- sandbox/vigouroux/yiq/get_red.hh (revision 2171) +++ sandbox/vigouroux/yiq/get_red.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yiq/rgb_to_yiq.hh --- sandbox/vigouroux/yiq/rgb_to_yiq.hh (revision 2171) +++ sandbox/vigouroux/yiq/rgb_to_yiq.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yiq/testfun.cc --- sandbox/vigouroux/yiq/testfun.cc (revision 2171) +++ sandbox/vigouroux/yiq/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/yiq/get_green.hh --- sandbox/vigouroux/yiq/get_green.hh (revision 2171) +++ sandbox/vigouroux/yiq/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color.cc --- sandbox/vigouroux/color.cc (revision 2171) +++ sandbox/vigouroux/color.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/value/hsi.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <iostream> Index: sandbox/vigouroux/load.cc --- sandbox/vigouroux/load.cc (revision 2171) +++ sandbox/vigouroux/load.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include "color/my_hsi.hh" #include "color/rgb_to_hsi.hh" @@ -18,7 +18,7 @@ # include <mln/display/save.hh> # include <mln/display/show.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/make/pixel.hh> Index: sandbox/vigouroux/conv/test.cc --- sandbox/vigouroux/conv/test.cc (revision 2171) +++ sandbox/vigouroux/conv/test.cc (working copy) @@ -5,7 +5,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/conv/getred.hh --- sandbox/vigouroux/conv/getred.hh (revision 2171) +++ sandbox/vigouroux/conv/getred.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/conv/tored.hh --- sandbox/vigouroux/conv/tored.hh (revision 2171) +++ sandbox/vigouroux/conv/tored.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/conv/torgb.hh --- sandbox/vigouroux/conv/torgb.hh (revision 2171) +++ sandbox/vigouroux/conv/torgb.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/conv/rgbto.hh --- sandbox/vigouroux/conv/rgbto.hh (revision 2171) +++ sandbox/vigouroux/conv/rgbto.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/gradation.hh --- sandbox/vigouroux/gradation.hh (revision 2171) +++ sandbox/vigouroux/gradation.hh (working copy) @@ -1,7 +1,7 @@ #ifndef GRADATION_HH # define GRADATION_HH -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/debug/println.hh> Index: sandbox/vigouroux/testfun.cc --- sandbox/vigouroux/testfun.cc (revision 2171) +++ sandbox/vigouroux/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/color/rgb_to_hsl.hh --- sandbox/vigouroux/color/rgb_to_hsl.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_hsl.hh (working copy) @@ -2,7 +2,7 @@ # define OLENA_CONVERT_NRGBHSL_HH # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_cmy.hh --- sandbox/vigouroux/color/rgb_to_cmy.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_cmy.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_xyz.hh --- sandbox/vigouroux/color/rgb_to_xyz.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_xyz.hh (working copy) @@ -2,7 +2,7 @@ # define OLENA_CONVERT_RGBXYZ_HH # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/tests.cc --- sandbox/vigouroux/color/tests.cc (revision 2171) +++ sandbox/vigouroux/color/tests.cc (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_hsv.hh --- sandbox/vigouroux/color/rgb_to_hsv.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_hsv.hh (working copy) @@ -2,7 +2,7 @@ # define OLENA_CONVERT_NRGBHSV_HH # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_yiq.hh --- sandbox/vigouroux/color/rgb_to_yiq.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_yiq.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_hsi.hh --- sandbox/vigouroux/color/rgb_to_hsi.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_hsi.hh (working copy) @@ -2,7 +2,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_yuv.hh --- sandbox/vigouroux/color/rgb_to_yuv.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_yuv.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2171) +++ sandbox/garrigues/level_set.hh (working copy) @@ -39,17 +39,17 @@ # include "lower.hh" # include "upper.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/point2d.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/core/pset_if_piter.hh> # include <mln/core/site_set/pset_if.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/clone.hh> # include <mln/core/a_point_of.hh> Index: sandbox/garrigues/fllt/test_fllt_lena_tiles.cc --- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt_optimized.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt10.cc --- sandbox/garrigues/fllt/test_fllt10.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt10.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt_tiny.cc --- sandbox/garrigues/fllt/test_fllt_tiny.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt_tiny.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> Index: sandbox/garrigues/fllt/test_fllt12.cc --- sandbox/garrigues/fllt/test_fllt12.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt12.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/essai.cc --- sandbox/garrigues/fllt/essai.cc (revision 2171) +++ sandbox/garrigues/fllt/essai.cc (working copy) @@ -1,6 +1,6 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.1.cc --- sandbox/garrigues/fllt/fllt_simple.svg.1.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_simple.svg.1.cc (working copy) @@ -29,8 +29,8 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> @@ -47,7 +47,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> namespace mln { Index: sandbox/garrigues/fllt/fllt_simple.svg.3.cc --- sandbox/garrigues/fllt/fllt_simple.svg.3.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -29,8 +29,8 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> @@ -51,7 +51,7 @@ #include <mln/util/tree_to_image.hh> #include <mln/util/branch_iter_ind.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> namespace mln Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -29,13 +29,13 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/dp_array.hh> Index: sandbox/garrigues/fllt/test_fllt10_inv.cc --- sandbox/garrigues/fllt/test_fllt10_inv.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt10_inv.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/fllt_theo.cc --- sandbox/garrigues/fllt/fllt_theo.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_theo.cc (working copy) @@ -29,7 +29,7 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> @@ -46,7 +46,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> namespace mln { Index: sandbox/garrigues/fllt/test_fllt3.cc --- sandbox/garrigues/fllt/test_fllt3.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt3.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt5.cc --- sandbox/garrigues/fllt/test_fllt5.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt5.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt7.cc --- sandbox/garrigues/fllt/test_fllt7.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt7.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt9.cc --- sandbox/garrigues/fllt/test_fllt9.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt9.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/fllt_merge.hh --- sandbox/garrigues/fllt/fllt_merge.hh (revision 2171) +++ sandbox/garrigues/fllt/fllt_merge.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/set/is_subset_of.hh> Index: sandbox/garrigues/fllt/test_fllt3_inv.cc --- sandbox/garrigues/fllt/test_fllt3_inv.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt3_inv.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt_lena.cc --- sandbox/garrigues/fllt/test_fllt_lena.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt_lena.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt.cc --- sandbox/garrigues/fllt/test_fllt.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_flltb.cc --- sandbox/garrigues/fllt/test_flltb.cc (revision 2171) +++ sandbox/garrigues/fllt/test_flltb.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt7_inv.cc --- sandbox/garrigues/fllt/test_fllt7_inv.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt7_inv.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt13.cc --- sandbox/garrigues/fllt/test_fllt13.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt13.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt15.cc --- sandbox/garrigues/fllt/test_fllt15.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt15.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.2.cc --- sandbox/garrigues/fllt/fllt_simple.svg.2.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -29,8 +29,8 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> @@ -47,7 +47,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> namespace mln { Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2171) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -35,14 +35,14 @@ * */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/pset_if_piter.hh> # include <mln/core/site_set/pset_if.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/clone.hh> # include <mln/core/a_point_of.hh> Index: sandbox/garrigues/fllt/test.cc --- sandbox/garrigues/fllt/test.cc (revision 2171) +++ sandbox/garrigues/fllt/test.cc (working copy) @@ -3,8 +3,8 @@ # include "compute_level_set_fast2.hh" -# include <mln/core/image2d.hh> -# include <mln/core/cast_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/cast_image.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/give_confs.cc --- sandbox/garrigues/fllt/give_confs.cc (revision 2171) +++ sandbox/garrigues/fllt/give_confs.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/core/clock_neighb2d.hh> Index: sandbox/garrigues/fllt/test_fllt2.cc --- sandbox/garrigues/fllt/test_fllt2.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt2.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt4.cc --- sandbox/garrigues/fllt/test_fllt4.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt4.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt6.cc --- sandbox/garrigues/fllt/test_fllt6.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt6.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt8.cc --- sandbox/garrigues/fllt/test_fllt8.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt8.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/tiled_image2d/tiled_image2d.hh --- sandbox/garrigues/tiled_image2d/tiled_image2d.hh (revision 2171) +++ sandbox/garrigues/tiled_image2d/tiled_image2d.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> # include <mln/core/box2d.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/init.hh> # include <mln/core/line_piter.hh> Index: sandbox/garrigues/tiled_image2d/tiled_image2d.cc --- sandbox/garrigues/tiled_image2d/tiled_image2d.cc (revision 2171) +++ sandbox/garrigues/tiled_image2d/tiled_image2d.cc (working copy) @@ -32,7 +32,7 @@ #include "tiled_image2d.hh" -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/level/fill.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/image_identity/interpolated.hh --- sandbox/garrigues/image_identity/interpolated.hh (revision 2171) +++ sandbox/garrigues/image_identity/interpolated.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERPOLATED_HH -# define MLN_CORE_INTERPOLATED_HH +#ifndef MLN_CORE_IMAGE_INTERPOLATED_HH +# define MLN_CORE_IMAGE_INTERPOLATED_HH -/*! \file mln/core/interpolated.hh +/*! \file mln/core/image/interpolated.hh * * \brief Definition of an image class FIXME */ @@ -182,4 +182,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERPOLATED_HH +#endif // ! MLN_CORE_IMAGE_INTERPOLATED_HH Index: sandbox/garrigues/factures/extract_array_highlight.cc --- sandbox/garrigues/factures/extract_array_highlight.cc (revision 2171) +++ sandbox/garrigues/factures/extract_array_highlight.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/all.hh> #include <mln/io/pbm/all.hh> #include <mln/geom/resize.hh> @@ -37,7 +37,7 @@ #include <mln/win/disk2d.hh> #include <mln/pw/all.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/stretch.hh> #include <mln/level/median.hh> #include <mln/morpho/gradient.hh> Index: sandbox/garrigues/factures/extract_array.cc --- sandbox/garrigues/factures/extract_array.cc (revision 2171) +++ sandbox/garrigues/factures/extract_array.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/all.hh> #include <mln/io/pbm/all.hh> #include <mln/geom/resize.hh> @@ -35,7 +35,7 @@ #include <mln/win/rectangle2d.hh> #include <mln/pw/all.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/stretch.hh> #include <mln/labeling/level.hh> #include <mln/literal/all.hh> Index: sandbox/folio/test/psn.cc --- sandbox/folio/test/psn.cc (revision 2171) +++ sandbox/folio/test/psn.cc (working copy) @@ -150,7 +150,7 @@ #endif // ! MLN_DT_CHAMFER_HH #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -161,8 +161,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> int main() Index: sandbox/folio/test/psn_log.cc --- sandbox/folio/test/psn_log.cc (revision 2171) +++ sandbox/folio/test/psn_log.cc (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/literal/zero.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> # include <mln/debug/println.hh> namespace mln @@ -248,8 +248,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> int main() Index: sandbox/folio/test/naive.cc --- sandbox/folio/test/naive.cc (revision 2171) +++ sandbox/folio/test/naive.cc (working copy) @@ -114,7 +114,7 @@ #include <iostream> #include <mln/debug/println.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/fun/v2v/norm.hh> Index: sandbox/folio/test/dt_maze.cc --- sandbox/folio/test/dt_maze.cc (revision 2171) +++ sandbox/folio/test/dt_maze.cc (working copy) @@ -4,7 +4,7 @@ */ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -18,8 +18,8 @@ #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/all.hh> #include "../dt/path.hh" Index: sandbox/folio/test/chamfer.cc --- sandbox/folio/test/chamfer.cc (revision 2171) +++ sandbox/folio/test/chamfer.cc (working copy) @@ -1,6 +1,6 @@ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> Index: sandbox/folio/test/dt_bench.cc --- sandbox/folio/test/dt_bench.cc (revision 2171) +++ sandbox/folio/test/dt_bench.cc (working copy) @@ -4,7 +4,7 @@ */ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -16,8 +16,8 @@ #include <mln/level/paste.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> // #include "../dt/dmap.hh" Index: sandbox/folio/test/dt.cc --- sandbox/folio/test/dt.cc (revision 2171) +++ sandbox/folio/test/dt.cc (working copy) @@ -4,7 +4,7 @@ */ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -16,8 +16,8 @@ #include <mln/level/paste.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> #include "../dt/dmap.hh" Index: sandbox/folio/psn.cc --- sandbox/folio/psn.cc (revision 2171) +++ sandbox/folio/psn.cc (working copy) @@ -150,7 +150,7 @@ #endif // ! MLN_DT_CHAMFER_HH #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -161,8 +161,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> int main() Index: sandbox/folio/psn_log.cc --- sandbox/folio/psn_log.cc (revision 2171) +++ sandbox/folio/psn_log.cc (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/literal/zero.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> # include <mln/debug/println.hh> namespace mln @@ -248,8 +248,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> int main() Index: sandbox/folio/naive.cc --- sandbox/folio/naive.cc (revision 2171) +++ sandbox/folio/naive.cc (working copy) @@ -114,7 +114,7 @@ #include <iostream> #include <mln/debug/println.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/fun/v2v/norm.hh> Index: sandbox/folio/chamfer.cc --- sandbox/folio/chamfer.cc (revision 2171) +++ sandbox/folio/chamfer.cc (working copy) @@ -156,7 +156,7 @@ #endif // ! MLN_DT_CHAMFER_HH #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> Index: sandbox/folio/dt.cc --- sandbox/folio/dt.cc (revision 2171) +++ sandbox/folio/dt.cc (working copy) @@ -4,7 +4,7 @@ */ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -15,8 +15,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> #include "dt.hh" Index: sandbox/beguin/irm_g.cc --- sandbox/beguin/irm_g.cc (revision 2171) +++ sandbox/beguin/irm_g.cc (working copy) @@ -3,11 +3,11 @@ #include <iostream> #include <algorithm> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: sandbox/beguin/fusion_graph.hh --- sandbox/beguin/fusion_graph.hh (revision 2171) +++ sandbox/beguin/fusion_graph.hh (working copy) @@ -7,11 +7,11 @@ #include <mln/value/int_u8.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> //#include "map.hh" Index: sandbox/beguin/irm.cc --- sandbox/beguin/irm.cc (revision 2171) +++ sandbox/beguin/irm.cc (working copy) @@ -8,11 +8,11 @@ #include <set> #include <map> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: sandbox/abraham/tests/morpho/test_component_tree.cc --- sandbox/abraham/tests/morpho/test_component_tree.cc (revision 2171) +++ sandbox/abraham/tests/morpho/test_component_tree.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_set.hh> Index: sandbox/abraham/tests/morpho/test_watershed.cc --- sandbox/abraham/tests/morpho/test_watershed.cc (revision 2171) +++ sandbox/abraham/tests/morpho/test_watershed.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_set.hh> Index: sandbox/abraham/tests/morpho/test_watershed_topo.cc --- sandbox/abraham/tests/morpho/test_watershed_topo.cc (revision 2171) +++ sandbox/abraham/tests/morpho/test_watershed_topo.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_set.hh> Index: sandbox/abraham/tests/io/tikz/tikz.cc --- sandbox/abraham/tests/io/tikz/tikz.cc (revision 2171) +++ sandbox/abraham/tests/io/tikz/tikz.cc (working copy) @@ -1,6 +1,6 @@ #include <string> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/value/int_u.hh> #include <mln/io/ppm/load.hh> Index: sandbox/abraham/mln/morpho/basic_najman.hh --- sandbox/abraham/mln/morpho/basic_najman.hh (revision 2171) +++ sandbox/abraham/mln/morpho/basic_najman.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/level/sort_psites.hh> #include <mln/level/fill.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/util/greater_psite.hh> #include <mln/estim/min_max.hh>

15 years, 8 months

cleanup-2008 2171: Move site set files in the proper core sub-directory.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move site set files in the proper core sub-directory. Move site_set files from mln/core/ to mln/core/site_set/. * mln/core/box.hh,. * mln/core/box_piter.hh,. * mln/core/line2d.hh,. * mln/core/p_array.hh,. * mln/core/p_bgraph.hh,. * mln/core/p_bgraph_piter.hh,. * mln/core/p_graph.hh,. * mln/core/p_graph_piter.hh,. * mln/core/p_line_graph.hh,. * mln/core/p_line_graph_piter.hh,. * mln/core/p_priority_queue.hh,. * mln/core/p_queue.hh,. * mln/core/p_queue_fast.hh,. * mln/core/p_run.hh,. * mln/core/p_set.hh,. * mln/core/pset_if.hh: Rename as... * mln/core/site_set/box.hh, * mln/core/site_set/box_piter.hh, * mln/core/site_set/line2d.hh, * mln/core/site_set/p_array.hh, * mln/core/site_set/p_bgraph.hh, * mln/core/site_set/p_bgraph_piter.hh, * mln/core/site_set/p_graph.hh, * mln/core/site_set/p_graph_piter.hh, * mln/core/site_set/p_line_graph.hh, * mln/core/site_set/p_line_graph_piter.hh, * mln/core/site_set/p_priority_queue.hh, * mln/core/site_set/p_queue.hh, * mln/core/site_set/p_queue_fast.hh, * mln/core/site_set/p_run.hh, * mln/core/site_set/p_set.hh, * mln/core/site_set/pset_if.hh: ...these. Update guards. * tests/core/p_priority_queue.cc, * tests/core/p_set.cc, * tests/core/point_set_compatibility.cc, * tests/core/p_queue_fast.cc, * tests/core/p_bgraph.cc, * tests/core/pset_if.cc, * tests/core/p_array.cc, * tests/core/p_queue.cc, * tests/draw/graph.cc, * tests/level/sort_psites_full.cc, * tests/level/sort_psites.cc, * tests/convert/to_p_array.cc, * tests/convert/to_image.cc, * tests/geom/pmin_pmax.cc, * tests/geom/bbox.cc, * tests/set/is_subset_of.cc, * tests/display/color_pretty.cc, * tests/util/tree_to_image.cc, * tests/util/tree_fast_to_image.cc, * doc/tutorial/examples/p_line2d.cc, * doc/tutorial/examples/p_array.cc, * doc/tutorial/examples/p_array.2.cc, * doc/tutorial/examples/p_image.cc, * doc/tutorial/examples/p_queue.cc, * doc/tutorial/examples/window.cc, * doc/tutorial/examples/image2d.cc, * doc/tutorial/examples/image_safe.cc, * doc/tutorial/examples/proxy.cc, * doc/tutorial/examples/p_mutable_array_of.cc, * mln/debug/println_with_border.spe.hh, * mln/debug/println.spe.hh, * mln/core/line_graph_image.hh, * mln/core/internal/graph_vicinity_piter.hh, * mln/core/internal/image_if_base.hh, * mln/core/internal/line_graph_vicinity_piter.hh, * mln/core/p_priority_queue_fast.hh, * mln/core/bgraph_image.hh, * mln/core/p_priority_queue_fast_with_array.hh, * mln/core/obased_rle_image.hh, * mln/core/graph_image.hh, * mln/core/line_graph_psite.hh, * mln/core/box1d.hh, * mln/core/box3d.hh, * mln/core/alias/p_run2d.hh, * mln/core/pset_if_piter.hh, * mln/core/p_array_piter.hh, * mln/core/p_array_bb.hh, * mln/core/t_image.hh, * mln/core/bgraph_psite.hh, * mln/core/p_image2d_piter.hh, * mln/core/image_if.hh, * mln/core/graph_psite.hh, * mln/core/clock_neighb.hh, * mln/core/line_piter.hh, * mln/core/site_set/p_image.hh, * mln/core/site_set/p_key.hh, * mln/core/box2d.hh, * mln/core/box2d_h.hh, * mln/core/p_run_piter.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/concept/window.hh, * mln/core/sparse_image.hh, * mln/core/p_runs.hh, * mln/draw/graph.hh, * mln/draw/line.hh, * mln/draw/plot.hh, * mln/draw/label.hh, * mln/accu/bbox.hh, * mln/make/voronoi.hh, * mln/convert/impl/from_image_to_site_set.hh, * mln/convert/to_p_set.hh, * mln/convert/to_p_array.hh, * mln/geom/seeds2tiling.hh, * mln/display/color_pretty.hh, * mln/util/tree_to_image.hh, * mln/util/tree_fast_to_image.hh, * mln/labeling/blobs.hh, * sandbox/pellegrin/set/test/p_queue_fast.cc, * sandbox/pellegrin/set/test/p_bgraph.cc, * sandbox/pellegrin/set/test/p_queue.cc, * sandbox/pellegrin/set/test/p_priority_queue.cc, * sandbox/pellegrin/set/test/pset_if.cc, * sandbox/pellegrin/set/test/p_set.cc, * sandbox/pellegrin/set/core/p_priority_queue_fast.hh, * sandbox/pellegrin/set/core/p_bgraph.hh, * sandbox/pellegrin/set/core/p_run.hh, * sandbox/pellegrin/set/core/p_line_graph.hh, * sandbox/pellegrin/set/core/pset_if.hh, * sandbox/pellegrin/set/core/p_array.hh, * sandbox/pellegrin/set/core/p_queue.hh, * sandbox/pellegrin/set/core/p_priority_queue.hh, * sandbox/pellegrin/set/core/p_runs.hh, * sandbox/pellegrin/set/core/p_set.hh, * sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh, * sandbox/pellegrin/set/core/line2d.hh, * sandbox/pellegrin/set/core/p_graph.hh, * sandbox/pellegrin/set/core/p_queue_fast.hh, * sandbox/aroumougame/skeleton/miscellenous.hh, * sandbox/aroumougame/skeleton/thinning.hh, * sandbox/jardonnet/registration/tools.hh, * sandbox/jardonnet/registration/quat7.hh, * sandbox/jardonnet/registration/cloud.hh, * sandbox/geraud/fllt/fllt.hh, * sandbox/geraud/fllt/fllt.svg.1.cc, * sandbox/geraud/fllt/fllt.svg.7.hh, * sandbox/geraud/fllt/fllt.svg.2.cc, * sandbox/geraud/fllt/fllt.svg.3.cc, * sandbox/geraud/fllt/fllt.svg.4.cc, * sandbox/geraud/fllt/fllt.svg.5.cc, * sandbox/geraud/fllt/fllt.svg.6.cc, * sandbox/geraud/fllt/fllt_test.hh, * sandbox/geraud/fllt.svg.7.hh, * sandbox/geraud/p_runs__with_dedicated_piter.hh, * sandbox/geraud/fllt.svg.6.cc, * sandbox/geraud/cs2d/cs2d_morpho.hh, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/fllt_simple.svg.1.cc, * sandbox/garrigues/fllt/fllt_simple.svg.3.cc, * sandbox/garrigues/fllt/fllt_simple.cc, * sandbox/garrigues/fllt/types.hh, * sandbox/garrigues/fllt/fllt_theo.cc, * sandbox/garrigues/fllt/fllt_types.hh, * sandbox/garrigues/fllt/fllt_simple.svg.2.cc, * sandbox/garrigues/fllt/fllt.hh, * sandbox/garrigues/fllt/give_confs.cc, * sandbox/abraham/tests/morpho/test_component_tree.cc, * sandbox/abraham/tests/morpho/test_watershed.cc, * sandbox/abraham/tests/morpho/test_watershed_topo.cc, * sandbox/abraham/mln/morpho/basic_najman.hh: Update. doc/tutorial/examples/image2d.cc | 2 +- doc/tutorial/examples/image_safe.cc | 2 +- doc/tutorial/examples/p_array.2.cc | 2 +- doc/tutorial/examples/p_array.cc | 2 +- doc/tutorial/examples/p_image.cc | 2 +- doc/tutorial/examples/p_line2d.cc | 4 ++-- doc/tutorial/examples/p_mutable_array_of.cc | 2 +- doc/tutorial/examples/p_queue.cc | 6 +++--- doc/tutorial/examples/proxy.cc | 2 +- doc/tutorial/examples/window.cc | 2 +- mln/accu/bbox.hh | 2 +- mln/convert/impl/from_image_to_site_set.hh | 2 +- mln/convert/to_p_array.hh | 2 +- mln/convert/to_p_set.hh | 2 +- mln/core/alias/p_run2d.hh | 2 +- mln/core/bgraph_image.hh | 2 +- mln/core/bgraph_psite.hh | 2 +- mln/core/box1d.hh | 8 ++++---- mln/core/box2d.hh | 8 ++++---- mln/core/box2d_h.hh | 8 ++++---- mln/core/box3d.hh | 8 ++++---- mln/core/clock_neighb.hh | 2 +- mln/core/concept/window.hh | 2 +- mln/core/graph_image.hh | 2 +- mln/core/graph_psite.hh | 2 +- mln/core/image_if.hh | 2 +- mln/core/internal/graph_vicinity_piter.hh | 2 +- mln/core/internal/image_if_base.hh | 2 +- mln/core/internal/line_graph_vicinity_piter.hh | 2 +- mln/core/line_graph_image.hh | 2 +- mln/core/line_graph_psite.hh | 2 +- mln/core/line_piter.hh | 2 +- mln/core/mono_obased_rle_image.hh | 2 +- mln/core/obased_rle_image.hh | 2 +- mln/core/p_array_bb.hh | 8 ++++---- mln/core/p_array_piter.hh | 8 ++++---- mln/core/p_image2d_piter.hh | 2 +- mln/core/p_priority_queue_fast.hh | 8 ++++---- mln/core/p_priority_queue_fast_with_array.hh | 8 ++++---- mln/core/p_run_piter.hh | 8 ++++---- mln/core/p_runs.hh | 8 ++++---- mln/core/pset_if_piter.hh | 8 ++++---- mln/core/site_set/box.hh | 10 +++++----- mln/core/site_set/box_piter.hh | 8 ++++---- mln/core/site_set/line2d.hh | 2 +- mln/core/site_set/p_array.hh | 8 ++++---- mln/core/site_set/p_bgraph.hh | 4 ++-- mln/core/site_set/p_bgraph_piter.hh | 8 ++++---- mln/core/site_set/p_graph.hh | 8 ++++---- mln/core/site_set/p_graph_piter.hh | 10 +++++----- mln/core/site_set/p_image.hh | 2 +- mln/core/site_set/p_key.hh | 2 +- mln/core/site_set/p_line_graph.hh | 6 +++--- mln/core/site_set/p_line_graph_piter.hh | 10 +++++----- mln/core/site_set/p_queue.hh | 10 +++++----- mln/core/site_set/p_queue_fast.hh | 10 +++++----- mln/core/site_set/p_run.hh | 8 ++++---- mln/core/site_set/p_set.hh | 10 +++++----- mln/core/site_set/pset_if.hh | 8 ++++---- mln/core/sparse_image.hh | 2 +- mln/core/t_image.hh | 2 +- mln/debug/println.spe.hh | 8 ++++---- mln/debug/println_with_border.spe.hh | 8 ++++---- mln/display/color_pretty.hh | 2 +- mln/draw/graph.hh | 2 +- mln/draw/label.hh | 2 +- mln/draw/line.hh | 2 +- mln/draw/plot.hh | 2 +- mln/geom/seeds2tiling.hh | 2 +- mln/labeling/blobs.hh | 2 +- mln/make/voronoi.hh | 2 +- mln/util/tree_fast_to_image.hh | 2 +- mln/util/tree_to_image.hh | 2 +- sandbox/abraham/mln/morpho/basic_najman.hh | 2 +- sandbox/abraham/tests/morpho/test_component_tree.cc | 2 +- sandbox/abraham/tests/morpho/test_watershed.cc | 2 +- sandbox/abraham/tests/morpho/test_watershed_topo.cc | 2 +- sandbox/aroumougame/skeleton/miscellenous.hh | 2 +- sandbox/aroumougame/skeleton/thinning.hh | 2 +- sandbox/garrigues/fllt/fllt.hh | 4 ++-- sandbox/garrigues/fllt/fllt_simple.cc | 4 ++-- sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 4 ++-- sandbox/garrigues/fllt/fllt_theo.cc | 2 +- sandbox/garrigues/fllt/fllt_types.hh | 2 +- sandbox/garrigues/fllt/give_confs.cc | 2 +- sandbox/garrigues/fllt/types.hh | 2 +- sandbox/garrigues/level_set.hh | 4 ++-- sandbox/geraud/cs2d/cs2d_morpho.hh | 2 +- sandbox/geraud/fllt.svg.6.cc | 4 ++-- sandbox/geraud/fllt.svg.7.hh | 4 ++-- sandbox/geraud/fllt/fllt.hh | 4 ++-- sandbox/geraud/fllt/fllt.svg.1.cc | 2 +- sandbox/geraud/fllt/fllt.svg.2.cc | 2 +- sandbox/geraud/fllt/fllt.svg.3.cc | 2 +- sandbox/geraud/fllt/fllt.svg.4.cc | 2 +- sandbox/geraud/fllt/fllt.svg.5.cc | 2 +- sandbox/geraud/fllt/fllt.svg.6.cc | 4 ++-- sandbox/geraud/fllt/fllt.svg.7.hh | 4 ++-- sandbox/geraud/fllt/fllt_test.hh | 4 ++-- sandbox/geraud/p_runs__with_dedicated_piter.hh | 8 ++++---- sandbox/jardonnet/registration/cloud.hh | 2 +- sandbox/jardonnet/registration/quat7.hh | 2 +- sandbox/jardonnet/registration/tools.hh | 2 +- sandbox/pellegrin/set/core/line2d.hh | 8 ++++---- sandbox/pellegrin/set/core/p_array.hh | 8 ++++---- sandbox/pellegrin/set/core/p_bgraph.hh | 10 +++++----- sandbox/pellegrin/set/core/p_graph.hh | 10 +++++----- sandbox/pellegrin/set/core/p_line_graph.hh | 10 +++++----- sandbox/pellegrin/set/core/p_priority_queue.hh | 10 +++++----- sandbox/pellegrin/set/core/p_priority_queue_fast.hh | 8 ++++---- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh | 8 ++++---- sandbox/pellegrin/set/core/p_queue.hh | 8 ++++---- sandbox/pellegrin/set/core/p_queue_fast.hh | 8 ++++---- sandbox/pellegrin/set/core/p_run.hh | 8 ++++---- sandbox/pellegrin/set/core/p_runs.hh | 8 ++++---- sandbox/pellegrin/set/core/p_set.hh | 10 +++++----- sandbox/pellegrin/set/core/pset_if.hh | 8 ++++---- sandbox/pellegrin/set/test/p_bgraph.cc | 2 +- sandbox/pellegrin/set/test/p_priority_queue.cc | 2 +- sandbox/pellegrin/set/test/p_queue.cc | 2 +- sandbox/pellegrin/set/test/p_queue_fast.cc | 2 +- sandbox/pellegrin/set/test/p_set.cc | 2 +- sandbox/pellegrin/set/test/pset_if.cc | 4 ++-- tests/convert/to_image.cc | 2 +- tests/convert/to_p_array.cc | 2 +- tests/core/p_array.cc | 2 +- tests/core/p_bgraph.cc | 2 +- tests/core/p_priority_queue.cc | 2 +- tests/core/p_queue.cc | 2 +- tests/core/p_queue_fast.cc | 2 +- tests/core/p_set.cc | 2 +- tests/core/point_set_compatibility.cc | 6 +++--- tests/core/pset_if.cc | 4 ++-- tests/display/color_pretty.cc | 2 +- tests/draw/graph.cc | 2 +- tests/geom/bbox.cc | 2 +- tests/geom/pmin_pmax.cc | 2 +- tests/level/sort_psites.cc | 2 +- tests/level/sort_psites_full.cc | 2 +- tests/set/is_subset_of.cc | 2 +- tests/util/tree_fast_to_image.cc | 2 +- tests/util/tree_to_image.cc | 2 +- 144 files changed, 295 insertions(+), 295 deletions(-) Index: tests/core/p_priority_queue.cc --- tests/core/p_priority_queue.cc (revision 2170) +++ tests/core/p_priority_queue.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_priority_queue.hh> +#include <mln/core/site_set/p_priority_queue.hh> int main () { Index: tests/core/p_set.cc --- tests/core/p_set.cc (revision 2170) +++ tests/core/p_set.cc (working copy) @@ -33,7 +33,7 @@ #include <iterator> #include <mln/core/point2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> Index: tests/core/point_set_compatibility.cc --- tests/core/point_set_compatibility.cc (revision 2170) +++ tests/core/point_set_compatibility.cc (working copy) @@ -31,10 +31,10 @@ #include <mln/core/point2d.hh> -#include <mln/core/p_array.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_array.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/graph_psite.hh> -#include <mln/core/p_graph_piter.hh> +#include <mln/core/site_set/p_graph_piter.hh> int main() Index: tests/core/p_queue_fast.cc --- tests/core/p_queue_fast.cc (revision 2170) +++ tests/core/p_queue_fast.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> Index: tests/core/p_bgraph.cc --- tests/core/p_bgraph.cc (revision 2170) +++ tests/core/p_bgraph.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/p_bgraph.cc /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). -#include <mln/core/p_bgraph.hh> +#include <mln/core/site_set/p_bgraph.hh> #include <mln/core/point2d.hh> #include <mln/util/internal/boost_graph.hh> #include <boost/typeof/std/utility.hpp> Index: tests/core/pset_if.cc --- tests/core/pset_if.cc (revision 2170) +++ tests/core/pset_if.cc (working copy) @@ -31,8 +31,8 @@ */ #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> -#include <mln/core/pset_if.hh> +#include <mln/core/site_set/p_set.hh> +#include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/convert/to_image.hh> #include <mln/convert/to_p_set.hh> Index: tests/core/p_array.cc --- tests/core/p_array.cc (revision 2170) +++ tests/core/p_array.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> int main() Index: tests/core/p_queue.cc --- tests/core/p_queue.cc (revision 2170) +++ tests/core/p_queue.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_queue.hh> +#include <mln/core/site_set/p_queue.hh> Index: tests/draw/graph.cc --- tests/draw/graph.cc (revision 2170) +++ tests/draw/graph.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/core/point2d.hh> #include <mln/debug/println.hh> #include <mln/util/graph.hh> -#include <mln/core/p_graph.hh> +#include <mln/core/site_set/p_graph.hh> #include <mln/core/graph_psite.hh> #include <mln/draw/graph.hh> #include <mln/core/graph_image.hh> Index: tests/level/sort_psites_full.cc --- tests/level/sort_psites_full.cc (revision 2170) +++ tests/level/sort_psites_full.cc (working copy) @@ -46,7 +46,7 @@ #include <mln/value/int_s8.hh> #include <mln/value/int_s16.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/debug/iota.hh> #include <mln/level/saturate.hh> Index: tests/level/sort_psites.cc --- tests/level/sort_psites.cc (revision 2170) +++ tests/level/sort_psites.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image2d.hh> #include <mln/debug/iota.hh> #include <mln/level/sort_psites.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> int main () Index: tests/convert/to_p_array.cc --- tests/convert/to_p_array.cc (revision 2170) +++ tests/convert/to_p_array.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/point1d.hh> #include <mln/core/point2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/win/segment1d.hh> #include <mln/win/rectangle2d.hh> Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2170) +++ tests/convert/to_image.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/pset_if.hh> +#include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/level/compare.hh> Index: tests/geom/pmin_pmax.cc --- tests/geom/pmin_pmax.cc (revision 2170) +++ tests/geom/pmin_pmax.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/point2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/geom/pmin_pmax.hh> Index: tests/geom/bbox.cc --- tests/geom/bbox.cc (revision 2170) +++ tests/geom/bbox.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/point2d.hh> #include <mln/core/box2d.hh> Index: tests/set/is_subset_of.cc --- tests/set/is_subset_of.cc (revision 2170) +++ tests/set/is_subset_of.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/is_subset_of.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/point2d.hh> int main() Index: tests/display/color_pretty.cc --- tests/display/color_pretty.cc (revision 2170) +++ tests/display/color_pretty.cc (working copy) @@ -33,7 +33,7 @@ # include <mln/core/image2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/sub_image.hh> # include <mln/core/inplace.hh> # include <mln/value/rgb8.hh> Index: tests/util/tree_to_image.cc --- tests/util/tree_to_image.cc (revision 2170) +++ tests/util/tree_to_image.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/util/tree.hh> #include <mln/core/contract.hh> #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> #include <mln/level/fill.hh> Index: tests/util/tree_fast_to_image.cc --- tests/util/tree_fast_to_image.cc (revision 2170) +++ tests/util/tree_fast_to_image.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/util/tree_fast.hh> #include <mln/core/contract.hh> #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> #include <mln/level/fill.hh> Index: doc/tutorial/examples/p_line2d.cc --- doc/tutorial/examples/p_line2d.cc (revision 2170) +++ doc/tutorial/examples/p_line2d.cc (working copy) @@ -1,8 +1,8 @@ # include <mln/core/image2d.hh> # include <mln/pw/all.hh> -# include <mln/core/line2d.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/sub_image.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_array.cc --- doc/tutorial/examples/p_array.cc (revision 2170) +++ doc/tutorial/examples/p_array.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_array.2.cc --- doc/tutorial/examples/p_array.2.cc (revision 2170) +++ doc/tutorial/examples/p_array.2.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/window.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_image.cc --- doc/tutorial/examples/p_image.cc (revision 2170) +++ doc/tutorial/examples/p_image.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/site_set/p_image.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_queue.cc --- doc/tutorial/examples/p_queue.cc (revision 2170) +++ doc/tutorial/examples/p_queue.cc (working copy) @@ -1,10 +1,10 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_queue.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> -# include <mln/core/p_priority_queue.hh> +# include <mln/core/site_set/p_priority_queue.hh> Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2170) +++ doc/tutorial/examples/window.cc (working copy) @@ -1,6 +1,6 @@ # include <mln/core/image2d.hh> # include <mln/core/window2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/image2d.cc --- doc/tutorial/examples/image2d.cc (revision 2170) +++ doc/tutorial/examples/image2d.cc (working copy) @@ -1,6 +1,6 @@ # include <mln/core/image2d.hh> # include <mln/core/window2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/image_safe.cc --- doc/tutorial/examples/image_safe.cc (revision 2170) +++ doc/tutorial/examples/image_safe.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/line2d.hh> +# include <mln/core/site_set/line2d.hh> # include <mln/core/safe.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/proxy.cc --- doc/tutorial/examples/proxy.cc (revision 2170) +++ doc/tutorial/examples/proxy.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_mutable_array_of.cc --- doc/tutorial/examples/p_mutable_array_of.cc (revision 2170) +++ doc/tutorial/examples/p_mutable_array_of.cc (working copy) @@ -1,6 +1,6 @@ # include <mln/core/image2d.hh> # include <mln/core/site_set/p_mutable_array_of.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/convert/from_to.hh> // Used by display. Index: mln/debug/println_with_border.spe.hh --- mln/debug/println_with_border.spe.hh (revision 2170) +++ mln/debug/println_with_border.spe.hh (working copy) @@ -52,7 +52,7 @@ namespace impl { -# ifdef MLN_CORE_BOX2D_HH +# ifdef MLN_CORE_SITE_SET_BOX2D_HH // 2D version. template <typename I> @@ -69,10 +69,10 @@ } std::cout << std::endl; } -# endif // MLN_CORE_BOX2D_HH +# endif // MLN_CORE_SITE_SET_BOX2D_HH -# ifdef MLN_CORE_BOX3D_HH +# ifdef MLN_CORE_SITE_SET_BOX3D_HH // 3D version. template <typename I> @@ -104,7 +104,7 @@ std::cout << std::endl; } -# endif // MLN_CORE_BOX3D_HH +# endif // MLN_CORE_SITE_SET_BOX3D_HH } // end of namespace mln::debug::impl Index: mln/debug/println.spe.hh --- mln/debug/println.spe.hh (revision 2170) +++ mln/debug/println.spe.hh (working copy) @@ -59,7 +59,7 @@ namespace impl { -# ifdef MLN_CORE_BOX2D_HH +# ifdef MLN_CORE_SITE_SET_BOX2D_HH // 2D versions. @@ -112,7 +112,7 @@ std::cout << std::endl; } -# endif // MLN_CORE_BOX2D_HH +# endif // MLN_CORE_SITE_SET_BOX2D_HH # ifdef MLN_CORE_IMAGE2D_H_HH @@ -150,7 +150,7 @@ # endif // MLN_CORE_IMAGE2D_H_HH -# ifdef MLN_CORE_BOX3D_HH +# ifdef MLN_CORE_SITE_SET_BOX3D_HH // 3D version. template <typename I> @@ -183,7 +183,7 @@ } } -# endif // MLN_CORE_BOX3D_HH +# endif // MLN_CORE_SITE_SET_BOX3D_HH } // end of namespace mln::debug::impl Index: mln/core/line_graph_image.hh --- mln/core/line_graph_image.hh (revision 2170) +++ mln/core/line_graph_image.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> -# include <mln/core/p_line_graph.hh> +# include <mln/core/site_set/p_line_graph.hh> # include <mln/core/line_graph_psite.hh> # include <mln/value/set.hh> # include <vector> Index: mln/core/internal/graph_vicinity_piter.hh --- mln/core/internal/graph_vicinity_piter.hh (revision 2170) +++ mln/core/internal/graph_vicinity_piter.hh (working copy) @@ -38,7 +38,7 @@ - mln::internal::line_graph_vicinity_piter.hh */ # include <mln/core/concept/site_iterator.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/core/graph_psite.hh> /* FIXME: Due to the poor interface of mln::p_graph and Index: mln/core/internal/image_if_base.hh --- mln/core/internal/image_if_base.hh (revision 2170) +++ mln/core/internal/image_if_base.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/pw/all.hh> # include <mln/value/interval.hh> Index: mln/core/internal/line_graph_vicinity_piter.hh --- mln/core/internal/line_graph_vicinity_piter.hh (revision 2170) +++ mln/core/internal/line_graph_vicinity_piter.hh (working copy) @@ -40,7 +40,7 @@ # include <set> # include <mln/core/concept/site_iterator.hh> -# include <mln/core/p_line_graph.hh> +# include <mln/core/site_set/p_line_graph.hh> # include <mln/core/line_graph_psite.hh> namespace mln Index: mln/core/p_priority_queue_fast.hh --- mln/core/p_priority_queue_fast.hh (revision 2170) +++ mln/core/p_priority_queue_fast.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_FAST_HH -# define MLN_CORE_P_PRIORITY_QUEUE_FAST_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH /*! \file mln/core/p_priority_queue_fast.hh * @@ -43,7 +43,7 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> namespace mln { @@ -347,4 +347,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH Index: mln/core/bgraph_image.hh --- mln/core/bgraph_image.hh (revision 2170) +++ mln/core/bgraph_image.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> -# include <mln/core/p_bgraph.hh> +# include <mln/core/site_set/p_bgraph.hh> # include <mln/core/bgraph_psite.hh> # include <mln/value/set.hh> # include <vector> Index: mln/core/p_priority_queue_fast_with_array.hh --- mln/core/p_priority_queue_fast_with_array.hh (revision 2170) +++ mln/core/p_priority_queue_fast_with_array.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH -# define MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH /*! \file mln/core/p_priority_queue_fast_with_array.hh * @@ -43,7 +43,7 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> namespace mln { @@ -333,4 +333,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH Index: mln/core/obased_rle_image.hh --- mln/core/obased_rle_image.hh (revision 2170) +++ mln/core/obased_rle_image.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/internal/run_image.hh> # include <mln/core/p_runs.hh> # include <mln/core/runs_psite.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/value/set.hh> # include <vector> Index: mln/core/graph_image.hh --- mln/core/graph_image.hh (revision 2170) +++ mln/core/graph_image.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/core/graph_psite.hh> # include <mln/value/set.hh> # include <vector> Index: mln/core/line_graph_psite.hh --- mln/core/line_graph_psite.hh (revision 2170) +++ mln/core/line_graph_psite.hh (working copy) @@ -31,7 +31,7 @@ /// \file mln/core/line_graph_psite.hh /// \brief Definition of a line graph-based point site. -# include <mln/core/p_line_graph.hh> +# include <mln/core/site_set/p_line_graph.hh> /* FIXME: This class shares a lot with graph_psite. Factor as much as possible. */ Index: mln/core/box1d.hh --- mln/core/box1d.hh (revision 2170) +++ mln/core/box1d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX1D_HH -# define MLN_CORE_BOX1D_HH +#ifndef MLN_CORE_SITE_SET_BOX1D_HH +# define MLN_CORE_SITE_SET_BOX1D_HH /*! \file mln/core/box1d.hh * @@ -34,7 +34,7 @@ * routines. */ -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/core/point1d.hh> @@ -55,4 +55,4 @@ # include <mln/make/box1d.hh> -#endif // ! MLN_CORE_BOX1D_HH +#endif // ! MLN_CORE_SITE_SET_BOX1D_HH Index: mln/core/box3d.hh --- mln/core/box3d.hh (revision 2170) +++ mln/core/box3d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX3D_HH -# define MLN_CORE_BOX3D_HH +#ifndef MLN_CORE_SITE_SET_BOX3D_HH +# define MLN_CORE_SITE_SET_BOX3D_HH /*! \file mln/core/box3d.hh * @@ -34,7 +34,7 @@ * routines. */ -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/core/point3d.hh> @@ -55,4 +55,4 @@ # include <mln/make/box3d.hh> -#endif // ! MLN_CORE_BOX3D_HH +#endif // ! MLN_CORE_SITE_SET_BOX3D_HH Index: mln/core/alias/p_run2d.hh --- mln/core/alias/p_run2d.hh (revision 2170) +++ mln/core/alias/p_run2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of the mln::p_run2d alias. */ -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/core/point2d.hh> Index: mln/core/pset_if_piter.hh --- mln/core/pset_if_piter.hh (revision 2170) +++ mln/core/pset_if_piter.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_PSET_IF_PITER_HH -# define MLN_CORE_PSET_IF_PITER_HH +#ifndef MLN_CORE_SITE_SET_PSET_IF_PITER_HH +# define MLN_CORE_SITE_SET_PSET_IF_PITER_HH /*! \file mln/core/pset_if_piter.hh * @@ -34,7 +34,7 @@ */ # include <mln/core/internal/piter_adaptor.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> namespace mln @@ -128,4 +128,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_PSET_IF_PITER_HH +#endif // ! MLN_CORE_SITE_SET_PSET_IF_PITER_HH Index: mln/core/p_array_piter.hh --- mln/core/p_array_piter.hh (revision 2170) +++ mln/core/p_array_piter.hh (working copy) @@ -26,13 +26,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_ARRAY_PITER_HH -# define MLN_CORE_P_ARRAY_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_ARRAY_PITER_HH +# define MLN_CORE_SITE_SET_P_ARRAY_PITER_HH /// \file mln/core/p_array_piter.hh /// \brief Definition of point iterators on mln::p_array. -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/internal/site_set_iterator_base.hh> @@ -291,4 +291,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_ARRAY_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_ARRAY_PITER_HH Index: mln/core/p_array_bb.hh --- mln/core/p_array_bb.hh (revision 2170) +++ mln/core/p_array_bb.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_ARRAY_HH -# define MLN_CORE_P_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_ARRAY_HH +# define MLN_CORE_SITE_SET_P_ARRAY_HH -/*! \file mln/core/p_array.hh +/*! \file mln/core/site_set/p_array.hh * * \brief Definition of a point set class based on std::vector. */ @@ -251,4 +251,4 @@ # include <mln/core/p_array_piter.hh> -#endif // ! MLN_CORE_P_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_ARRAY_HH Index: mln/core/t_image.hh --- mln/core/t_image.hh (revision 2170) +++ mln/core/t_image.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/image_morpher.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/value/set.hh> namespace mln Index: mln/core/bgraph_psite.hh --- mln/core/bgraph_psite.hh (revision 2170) +++ mln/core/bgraph_psite.hh (working copy) @@ -31,7 +31,7 @@ /// \file mln/core/bgraph_psite.hh /// \brief Definition of a boost-graph-based point site. -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> namespace mln Index: mln/core/p_image2d_piter.hh --- mln/core/p_image2d_piter.hh (revision 2170) +++ mln/core/p_image2d_piter.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Definition of point iterators on mln::p_image2d. # include <mln/core/p_image2d.hh> -# include <mln/core/box_piter.hh> +# include <mln/core/site_set/box_piter.hh> namespace mln Index: mln/core/image_if.hh --- mln/core/image_if.hh (revision 2170) +++ mln/core/image_if.hh (working copy) @@ -37,7 +37,7 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/pw/all.hh> Index: mln/core/graph_psite.hh --- mln/core/graph_psite.hh (revision 2170) +++ mln/core/graph_psite.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/concept/point_site.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> namespace mln Index: mln/core/clock_neighb.hh --- mln/core/clock_neighb.hh (revision 2170) +++ mln/core/clock_neighb.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/core/internal/dpoints_base.hh> # include <mln/core/dpoint.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> namespace mln { Index: mln/core/line_piter.hh --- mln/core/line_piter.hh (revision 2170) +++ mln/core/line_piter.hh (working copy) @@ -36,7 +36,7 @@ */ # include <mln/core/internal/site_iterator_base.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> namespace mln { Index: mln/core/site_set/p_bgraph.hh --- mln/core/site_set/p_bgraph.hh (revision 2170) +++ mln/core/site_set/p_bgraph.hh (working copy) @@ -35,11 +35,11 @@ # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> # include <mln/core/bgraph_psite.hh> -# include <mln/core/p_bgraph_piter.hh> +# include <mln/core/site_set/p_bgraph_piter.hh> -/// \file mln/core/p_bgraph.hh +/// \file mln/core/site_set/p_bgraph.hh /// \brief Definition of a point set based on a boost graph. namespace mln Index: mln/core/site_set/p_run.hh --- mln/core/site_set/p_run.hh (revision 2170) +++ mln/core/site_set/p_run.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUN_HH -# define MLN_CORE_P_RUN_HH +#ifndef MLN_CORE_SITE_SET_P_RUN_HH +# define MLN_CORE_SITE_SET_P_RUN_HH -/*! \file mln/core/p_run.hh +/*! \file mln/core/site_set/p_run.hh * * \brief Definition of a run of points. * @@ -495,4 +495,4 @@ # include <mln/core/p_run_piter.hh> -#endif // ! MLN_CORE_P_RUN_HH +#endif // ! MLN_CORE_SITE_SET_P_RUN_HH Index: mln/core/site_set/p_graph_piter.hh --- mln/core/site_set/p_graph_piter.hh (revision 2170) +++ mln/core/site_set/p_graph_piter.hh (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_GRAPH_PITER_HH -# define MLN_CORE_P_GRAPH_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_GRAPH_PITER_HH +# define MLN_CORE_SITE_SET_P_GRAPH_PITER_HH # include <mln/core/internal/site_iterator_base.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/core/graph_psite.hh> -/// \file mln/core/p_graph_piter.hh +/// \file mln/core/site_set/p_graph_piter.hh /// \brief Definition of point iterator on graph-based point set. namespace mln @@ -505,4 +505,4 @@ } // end of mln -#endif // ! MLN_CORE_P_GRAPH_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_GRAPH_PITER_HH Index: mln/core/site_set/p_bgraph_piter.hh --- mln/core/site_set/p_bgraph_piter.hh (revision 2170) +++ mln/core/site_set/p_bgraph_piter.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_BGRAPH_PITER_HH -# define MLN_CORE_P_BGRAPH_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_BGRAPH_PITER_HH +# define MLN_CORE_SITE_SET_P_BGRAPH_PITER_HH # include <utility> # include <mln/core/internal/site_iterator_base.hh> -# include <mln/core/p_bgraph.hh> +# include <mln/core/site_set/p_bgraph.hh> # include <mln/core/bgraph_psite.hh> -/*! \file mln/core/p_bgraph_piter.hh +/*! \file mln/core/site_set/p_bgraph_piter.hh * * \brief Definition of point iterator on boost-graph-based point set. */ Index: mln/core/site_set/p_line_graph.hh --- mln/core/site_set/p_line_graph.hh (revision 2170) +++ mln/core/site_set/p_line_graph.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/util/graph.hh> # include <mln/util/tracked_ptr.hh> # include <mln/core/line_graph_psite.hh> -# include <mln/core/p_line_graph_piter.hh> +# include <mln/core/site_set/p_line_graph_piter.hh> /* FIXME: This class shares a lot with p_graph. Factor as much as possible. */ @@ -42,7 +42,7 @@ // FIXME: We should move the `adjacent_or_equal method' from // iterators into this class. -/// \file mln/core/p_line_graph.hh +/// \file mln/core/site_set/p_line_graph.hh /// \brief Definition of a point set based on line graph. namespace mln @@ -278,4 +278,4 @@ } // end of mln -#endif // MLN_CORE_P_GRAPH_HH +#endif // MLN_CORE_SITE_SET_P_GRAPH_HH Index: mln/core/site_set/box.hh --- mln/core/site_set/box.hh (revision 2170) +++ mln/core/site_set/box.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX_HH -# define MLN_CORE_BOX_HH +#ifndef MLN_CORE_SITE_SET_BOX_HH +# define MLN_CORE_SITE_SET_BOX_HH -/*! \file mln/core/box.hh +/*! \file mln/core/site_set/box.hh * * \brief This file defines a generic box class. * @@ -339,7 +339,7 @@ } // end of namespace mln -# include <mln/core/box_piter.hh> +# include <mln/core/site_set/box_piter.hh> -#endif // ! MLN_CORE_BOX_HH +#endif // ! MLN_CORE_SITE_SET_BOX_HH Index: mln/core/site_set/pset_if.hh --- mln/core/site_set/pset_if.hh (revision 2170) +++ mln/core/site_set/pset_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_PSET_IF_HH -# define MLN_CORE_PSET_IF_HH +#ifndef MLN_CORE_SITE_SET_PSET_IF_HH +# define MLN_CORE_SITE_SET_PSET_IF_HH -/*! \file mln/core/pset_if.hh +/*! \file mln/core/site_set/pset_if.hh * * \brief Definition of the restriction of a point set w.r.t. a predicate. * @@ -225,4 +225,4 @@ -#endif // ! MLN_CORE_PSET_IF_HH +#endif // ! MLN_CORE_SITE_SET_PSET_IF_HH Index: mln/core/site_set/p_line_graph_piter.hh --- mln/core/site_set/p_line_graph_piter.hh (revision 2170) +++ mln/core/site_set/p_line_graph_piter.hh (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_LINE_GRAPH_PITER_HH -# define MLN_CORE_P_LINE_GRAPH_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_LINE_GRAPH_PITER_HH +# define MLN_CORE_SITE_SET_P_LINE_GRAPH_PITER_HH # include <mln/core/internal/site_iterator_base.hh> -# include <mln/core/p_line_graph.hh> +# include <mln/core/site_set/p_line_graph.hh> # include <mln/core/line_graph_psite.hh> -/// \file mln/core/p_line_graph_piter.hh +/// \file mln/core/site_set/p_line_graph_piter.hh /// \brief Definition of point iterator on line graph-based point set. namespace mln @@ -486,4 +486,4 @@ } // end of mln -#endif // ! MLN_CORE_P_LINE_GRAPH_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_LINE_GRAPH_PITER_HH Index: mln/core/site_set/box_piter.hh --- mln/core/site_set/box_piter.hh (revision 2170) +++ mln/core/site_set/box_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX_PITER_HH -# define MLN_CORE_BOX_PITER_HH +#ifndef MLN_CORE_SITE_SET_BOX_PITER_HH +# define MLN_CORE_SITE_SET_BOX_PITER_HH -/*! \file mln/core/box_piter.hh +/*! \file mln/core/site_set/box_piter.hh * * \brief Definition of iterators on points of boxes. */ @@ -269,4 +269,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_BOX_PITER_HH +#endif // ! MLN_CORE_SITE_SET_BOX_PITER_HH Index: mln/core/site_set/p_array.hh --- mln/core/site_set/p_array.hh (revision 2170) +++ mln/core/site_set/p_array.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_ARRAY_HH -# define MLN_CORE_P_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_ARRAY_HH +# define MLN_CORE_SITE_SET_P_ARRAY_HH -/*! \file mln/core/p_array.hh +/*! \file mln/core/site_set/p_array.hh * * \brief Definition of a point set class based on std::vector. * @@ -732,4 +732,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_ARRAY_HH Index: mln/core/site_set/p_image.hh --- mln/core/site_set/p_image.hh (revision 2170) +++ mln/core/site_set/p_image.hh (working copy) @@ -37,7 +37,7 @@ * \todo Add an init method (deferred initialization). */ -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/fun/ops.hh> # include <mln/pw/value.hh> # include <mln/pw/cst.hh> Index: mln/core/site_set/p_queue.hh --- mln/core/site_set/p_queue.hh (revision 2170) +++ mln/core/site_set/p_queue.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_QUEUE_HH -# define MLN_CORE_P_QUEUE_HH +#ifndef MLN_CORE_SITE_SET_P_QUEUE_HH +# define MLN_CORE_SITE_SET_P_QUEUE_HH -/*! \file mln/core/p_queue.hh +/*! \file mln/core/site_set/p_queue.hh * * \brief Definition of a site set based on std::deque. * @@ -40,7 +40,7 @@ */ # include <deque> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> namespace mln @@ -284,4 +284,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_QUEUE_HH +#endif // ! MLN_CORE_SITE_SET_P_QUEUE_HH Index: mln/core/site_set/p_key.hh --- mln/core/site_set/p_key.hh (revision 2170) +++ mln/core/site_set/p_key.hh (working copy) @@ -37,7 +37,7 @@ # include <map> # include <mln/core/concept/function.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/site_set/p_double.hh> # include <mln/core/internal/site_set_base.hh> # include <mln/util/ord.hh> Index: mln/core/site_set/p_set.hh --- mln/core/site_set/p_set.hh (revision 2170) +++ mln/core/site_set/p_set.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_SET_HH -# define MLN_CORE_P_SET_HH +#ifndef MLN_CORE_SITE_SET_P_SET_HH +# define MLN_CORE_SITE_SET_P_SET_HH -/*! \file mln/core/p_set.hh +/*! \file mln/core/site_set/p_set.hh * * \brief Definition of a mathematical set of sites (based on * util::set). */ -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/util/set.hh> @@ -260,4 +260,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_SET_HH +#endif // ! MLN_CORE_SITE_SET_P_SET_HH Index: mln/core/site_set/line2d.hh --- mln/core/site_set/line2d.hh (revision 2170) +++ mln/core/site_set/line2d.hh (working copy) @@ -34,7 +34,7 @@ * p_array). */ -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/box2d.hh> # include <mln/math/all.hh> Index: mln/core/site_set/p_graph.hh --- mln/core/site_set/p_graph.hh (revision 2170) +++ mln/core/site_set/p_graph.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_GRAPH_HH -# define MLN_CORE_P_GRAPH_HH +#ifndef MLN_CORE_SITE_SET_P_GRAPH_HH +# define MLN_CORE_SITE_SET_P_GRAPH_HH # include <mln/core/concept/point_site.hh> # include <mln/core/internal/site_set_base.hh> @@ -35,7 +35,7 @@ # include <mln/util/graph.hh> # include <mln/core/graph_psite.hh> -# include <mln/core/p_graph_piter.hh> +# include <mln/core/site_set/p_graph_piter.hh> namespace mln @@ -335,4 +335,4 @@ } // end of mln -#endif // MLN_CORE_P_GRAPH_HH +#endif // MLN_CORE_SITE_SET_P_GRAPH_HH Index: mln/core/site_set/p_queue_fast.hh --- mln/core/site_set/p_queue_fast.hh (revision 2170) +++ mln/core/site_set/p_queue_fast.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_QUEUE_FAST_HH -# define MLN_CORE_P_QUEUE_FAST_HH +#ifndef MLN_CORE_SITE_SET_P_QUEUE_FAST_HH +# define MLN_CORE_SITE_SET_P_QUEUE_FAST_HH -/*! \file mln/core/p_queue_fast.hh +/*! \file mln/core/site_set/p_queue_fast.hh * * \brief Definition of a queue of sites that is fast but uses extra * memory w.r.t. a simple queue. @@ -36,7 +36,7 @@ * \todo Add insert. */ -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> namespace mln @@ -327,4 +327,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_QUEUE_FAST_HH +#endif // ! MLN_CORE_SITE_SET_P_QUEUE_FAST_HH Index: mln/core/box2d.hh --- mln/core/box2d.hh (revision 2170) +++ mln/core/box2d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX2D_HH -# define MLN_CORE_BOX2D_HH +#ifndef MLN_CORE_SITE_SET_BOX2D_HH +# define MLN_CORE_SITE_SET_BOX2D_HH /*! \file mln/core/box2d.hh * @@ -34,7 +34,7 @@ * routines. */ -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/core/point2d.hh> @@ -55,4 +55,4 @@ # include <mln/make/box2d.hh> -#endif // ! MLN_CORE_BOX2D_HH +#endif // ! MLN_CORE_SITE_SET_BOX2D_HH Index: mln/core/box2d_h.hh --- mln/core/box2d_h.hh (revision 2170) +++ mln/core/box2d_h.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX2D_H_HH -# define MLN_CORE_BOX2D_H_HH +#ifndef MLN_CORE_SITE_SET_BOX2D_H_HH +# define MLN_CORE_SITE_SET_BOX2D_H_HH /*! \file mln/core/box2d_h.hh * @@ -34,7 +34,7 @@ * routines. */ -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/core/box2d.hh> # include <mln/core/point2d_h.hh> @@ -54,4 +54,4 @@ # include <mln/make/box2d_h.hh> -#endif // ! MLN_CORE_BOX2D_HH +#endif // ! MLN_CORE_SITE_SET_BOX2D_HH Index: mln/core/p_run_piter.hh --- mln/core/p_run_piter.hh (revision 2170) +++ mln/core/p_run_piter.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUN_PITER_HH -# define MLN_CORE_P_RUN_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_RUN_PITER_HH +# define MLN_CORE_SITE_SET_P_RUN_PITER_HH /*! \file mln/core/p_run_piter.hh * * \brief Definition of point iterators on mln::p_run. */ -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/core/internal/site_set_iterator_base.hh> @@ -221,4 +221,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_RUN_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_RUN_PITER_HH Index: mln/core/mono_obased_rle_image.hh --- mln/core/mono_obased_rle_image.hh (revision 2170) +++ mln/core/mono_obased_rle_image.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/internal/run_image.hh> # include <mln/core/p_runs.hh> # include <mln/core/runs_psite.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/value/set.hh> # include <mln/core/mono_rle_image.hh> # include <vector> Index: mln/core/concept/window.hh --- mln/core/concept/window.hh (revision 2170) +++ mln/core/concept/window.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/core/concept/object.hh> # include <mln/core/concept/iterator.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> namespace mln Index: mln/core/sparse_image.hh --- mln/core/sparse_image.hh (revision 2170) +++ mln/core/sparse_image.hh (working copy) @@ -36,7 +36,7 @@ # include <vector> # include <mln/core/internal/image_primary.hh> # include <mln/core/p_set_of.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/value/set.hh> Index: mln/core/p_runs.hh --- mln/core/p_runs.hh (revision 2170) +++ mln/core/p_runs.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUN_SET_HH -# define MLN_CORE_P_RUN_SET_HH +#ifndef MLN_CORE_SITE_SET_P_RUN_SET_HH +# define MLN_CORE_SITE_SET_P_RUN_SET_HH /*! \file mln/core/p_run_set.hh * @@ -39,7 +39,7 @@ */ # include <mln/accu/bbox.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/core/site_set/p_double.hh> # include <mln/core/internal/piter_adaptor.hh> # include <mln/util/set.hh> @@ -405,4 +405,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_RUN_SET_HH +#endif // ! MLN_CORE_SITE_SET_P_RUN_SET_HH Index: mln/draw/graph.hh --- mln/draw/graph.hh (revision 2170) +++ mln/draw/graph.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/pw/image.hh> # include <mln/level/fill.hh> # include <mln/draw/line.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/core/graph_image.hh> namespace mln Index: mln/draw/line.hh --- mln/draw/line.hh (revision 2170) +++ mln/draw/line.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/line2d.hh> +# include <mln/core/site_set/line2d.hh> # include <mln/level/paste.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/draw/plot.hh --- mln/draw/plot.hh (revision 2170) +++ mln/draw/plot.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/line2d.hh> +# include <mln/core/site_set/line2d.hh> # include <mln/level/paste.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/draw/label.hh --- mln/draw/label.hh (revision 2170) +++ mln/draw/label.hh (working copy) @@ -43,7 +43,7 @@ # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/metal/is_not.hh> # include <mln/core/image_if_value.hh> # include <mln/debug/println.hh> Index: mln/accu/bbox.hh --- mln/accu/bbox.hh (revision 2170) +++ mln/accu/bbox.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/accu/internal/base.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> namespace mln Index: mln/make/voronoi.hh --- mln/make/voronoi.hh (revision 2170) +++ mln/make/voronoi.hh (working copy) @@ -37,7 +37,7 @@ # include <map> # include <mln/core/concept/neighborhood.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> Index: mln/convert/impl/from_image_to_site_set.hh --- mln/convert/impl/from_image_to_site_set.hh (revision 2170) +++ mln/convert/impl/from_image_to_site_set.hh (working copy) @@ -40,7 +40,7 @@ # include <utility> # include <mln/core/concept/image.hh> # include <mln/core/concept/site_set.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/metal/converts_to.hh> Index: mln/convert/to_p_set.hh --- mln/convert/to_p_set.hh (revision 2170) +++ mln/convert/to_p_set.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/core/concept/window.hh> # include <mln/core/concept/point_site.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> # include <mln/metal/templated_by.hh> Index: mln/convert/to_p_array.hh --- mln/convert/to_p_array.hh (revision 2170) +++ mln/convert/to_p_array.hh (working copy) @@ -31,7 +31,7 @@ /// \file mln/convert/to_p_array.hh /// \brief Conversions to mln::p_array. -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/concept/image.hh> # include <mln/core/concept/window.hh> Index: mln/geom/seeds2tiling.hh --- mln/geom/seeds2tiling.hh (revision 2170) +++ mln/geom/seeds2tiling.hh (working copy) @@ -36,7 +36,7 @@ # include <map> # include <mln/core/concept/neighborhood.hh> -# include <mln/core/p_queue.hh> +# include <mln/core/site_set/p_queue.hh> # include <mln/core/clone.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> Index: mln/display/color_pretty.hh --- mln/display/color_pretty.hh (revision 2170) +++ mln/display/color_pretty.hh (working copy) @@ -40,7 +40,7 @@ # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/metal/is_not.hh> namespace mln Index: mln/util/tree_to_image.hh --- mln/util/tree_to_image.hh (revision 2170) +++ mln/util/tree_to_image.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/image.hh> # include <mln/util/tree.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/level/fill.hh> namespace mln Index: mln/util/tree_fast_to_image.hh --- mln/util/tree_fast_to_image.hh (revision 2170) +++ mln/util/tree_fast_to_image.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/image.hh> # include <mln/util/tree_fast.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <list> namespace mln Index: mln/labeling/blobs.hh --- mln/labeling/blobs.hh (revision 2170) +++ mln/labeling/blobs.hh (working copy) @@ -40,7 +40,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/level/fill.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/pellegrin/set/test/p_queue_fast.cc --- sandbox/pellegrin/set/test/p_queue_fast.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_queue_fast.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/pellegrin/set/test/p_bgraph.cc --- sandbox/pellegrin/set/test/p_bgraph.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_bgraph.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/p_bgraph.cc /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). -#include "../core/p_bgraph.hh" +#include "../core/site_set/p_bgraph.hh" #include <mln/core/point2d.hh> #include <mln/util/internal/boost_graph.hh> #include <boost/typeof/std/utility.hpp> Index: sandbox/pellegrin/set/test/p_queue.cc --- sandbox/pellegrin/set/test/p_queue.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_queue.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_queue.hh> +#include <mln/core/site_set/p_queue.hh> Index: sandbox/pellegrin/set/test/p_priority_queue.cc --- sandbox/pellegrin/set/test/p_priority_queue.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_priority_queue.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_priority_queue.hh> +#include <mln/core/site_set/p_priority_queue.hh> int main () { Index: sandbox/pellegrin/set/test/pset_if.cc --- sandbox/pellegrin/set/test/pset_if.cc (revision 2170) +++ sandbox/pellegrin/set/test/pset_if.cc (working copy) @@ -31,8 +31,8 @@ */ #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> -#include <mln/core/pset_if.hh> +#include <mln/core/site_set/p_set.hh> +#include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/convert/to_image.hh> #include <mln/convert/to_p_set.hh> Index: sandbox/pellegrin/set/test/p_set.cc --- sandbox/pellegrin/set/test/p_set.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_set.cc (working copy) @@ -33,7 +33,7 @@ #include <iterator> #include <mln/core/point2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> Index: sandbox/pellegrin/set/core/p_priority_queue_fast.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_priority_queue_fast.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_FAST_HH -# define MLN_CORE_P_PRIORITY_QUEUE_FAST_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH /*! \file mln/core/p_priority_queue_fast.hh * @@ -43,7 +43,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <trait/point_set.hh> @@ -362,4 +362,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH Index: sandbox/pellegrin/set/core/p_bgraph.hh --- sandbox/pellegrin/set/core/p_bgraph.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_bgraph.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_BGRAPH_HH -# define MLN_CORE_P_BGRAPH_HH +#ifndef MLN_CORE_SITE_SET_P_BGRAPH_HH +# define MLN_CORE_SITE_SET_P_BGRAPH_HH -/// \file mln/core/p_bgraph.hh +/// \file mln/core/site_set/p_bgraph.hh /// \brief Definition of a point set based on a boost graph. # include <utility> @@ -38,7 +38,7 @@ # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> # include <mln/core/bgraph_psite.hh> -# include <mln/core/p_bgraph_piter.hh> +# include <mln/core/site_set/p_bgraph_piter.hh> # include <trait/point_set.hh> @@ -231,4 +231,4 @@ } // end of mln -#endif // MLN_CORE_P_BGRAPH_HH +#endif // MLN_CORE_SITE_SET_P_BGRAPH_HH Index: sandbox/pellegrin/set/core/p_run.hh --- sandbox/pellegrin/set/core/p_run.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_run.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUN_HH -# define MLN_CORE_P_RUN_HH +#ifndef MLN_CORE_SITE_SET_P_RUN_HH +# define MLN_CORE_SITE_SET_P_RUN_HH -/*! \file mln/core/p_run.hh +/*! \file mln/core/site_set/p_run.hh * * \brief Definition of a point set class based on std::set. */ @@ -247,4 +247,4 @@ # include <mln/core/p_run_piter.hh> -#endif // ! MLN_CORE_P_RUN_HH +#endif // ! MLN_CORE_SITE_SET_P_RUN_HH Index: sandbox/pellegrin/set/core/p_line_graph.hh --- sandbox/pellegrin/set/core/p_line_graph.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_line_graph.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_LINE_GRAPH_HH -# define MLN_CORE_P_LINE_GRAPH_HH +#ifndef MLN_CORE_SITE_SET_P_LINE_GRAPH_HH +# define MLN_CORE_SITE_SET_P_LINE_GRAPH_HH # include <mln/core/concept/point_site.hh> # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> # include <mln/core/line_graph_psite.hh> -# include <mln/core/p_line_graph_piter.hh> +# include <mln/core/site_set/p_line_graph_piter.hh> # include <mln/core/point_pair.hh> # include <trait/point_set.hh> @@ -41,7 +41,7 @@ /* FIXME: This class shares a lot with p_graph. Factor as much as possible. */ -/// \file mln/core/p_line_graph.hh +/// \file mln/core/site_set/p_line_graph.hh /// \brief Definition of a point set based on line graph. namespace mln @@ -174,4 +174,4 @@ } // end of mln -#endif // MLN_CORE_P_LINE_GRAPH_HH +#endif // MLN_CORE_SITE_SET_P_LINE_GRAPH_HH Index: sandbox/pellegrin/set/core/pset_if.hh --- sandbox/pellegrin/set/core/pset_if.hh (revision 2170) +++ sandbox/pellegrin/set/core/pset_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_PSET_IF_HH -# define MLN_CORE_PSET_IF_HH +#ifndef MLN_CORE_SITE_SET_PSET_IF_HH +# define MLN_CORE_SITE_SET_PSET_IF_HH -/*! \file mln/core/pset_if.hh +/*! \file mln/core/site_set/pset_if.hh * * \brief Definition of the restriction of a point set w.r.t. a predicate. */ @@ -224,4 +224,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_PSET_IF_HH +#endif // ! MLN_CORE_SITE_SET_PSET_IF_HH Index: sandbox/pellegrin/set/core/p_array.hh --- sandbox/pellegrin/set/core/p_array.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_array.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_ARRAY_HH -# define MLN_CORE_P_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_ARRAY_HH +# define MLN_CORE_SITE_SET_P_ARRAY_HH -/*! \file mln/core/p_array.hh +/*! \file mln/core/site_set/p_array.hh * * \brief Definition of a point set class based on std::vector. */ @@ -244,4 +244,4 @@ # include <mln/core/p_array_piter.hh> -#endif // ! MLN_CORE_P_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_ARRAY_HH Index: sandbox/pellegrin/set/core/p_queue.hh --- sandbox/pellegrin/set/core/p_queue.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_queue.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_QUEUE_HH -# define MLN_CORE_P_QUEUE_HH +#ifndef MLN_CORE_SITE_SET_P_QUEUE_HH +# define MLN_CORE_SITE_SET_P_QUEUE_HH -/*! \file mln/core/p_queue.hh +/*! \file mln/core/site_set/p_queue.hh * * \brief Definition of a point set class based on std::deque. */ @@ -308,4 +308,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_QUEUE_HH +#endif // ! MLN_CORE_SITE_SET_P_QUEUE_HH Index: sandbox/pellegrin/set/core/p_priority_queue.hh --- sandbox/pellegrin/set/core/p_priority_queue.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_priority_queue.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_HH -# define MLN_CORE_P_PRIORITY_QUEUE_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH -/*! \file mln/core/p_priority_queue.hh +/*! \file mln/core/site_set/p_priority_queue.hh * * \brief Definition of a point set class based on p_queue with * priority features. @@ -43,7 +43,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue.hh> +# include <mln/core/site_set/p_queue.hh> # include <trait/point_set.hh> @@ -362,4 +362,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH Index: sandbox/pellegrin/set/core/p_runs.hh --- sandbox/pellegrin/set/core/p_runs.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_runs.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUNS_HH -# define MLN_CORE_P_RUNS_HH +#ifndef MLN_CORE_SITE_SET_P_RUNS_HH +# define MLN_CORE_SITE_SET_P_RUNS_HH /*! \file mln/core/p_runs.hh * @@ -39,7 +39,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/runs_psite.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/accu/bbox.hh> # include <mln/util/lazy_set.hh> # include <trait/point_set.hh> @@ -538,4 +538,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_RUNS_HH +#endif // ! MLN_CORE_SITE_SET_P_RUNS_HH Index: sandbox/pellegrin/set/core/p_set.hh --- sandbox/pellegrin/set/core/p_set.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_set.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_SET_HH -# define MLN_CORE_P_SET_HH +#ifndef MLN_CORE_SITE_SET_P_SET_HH +# define MLN_CORE_SITE_SET_P_SET_HH -/*! \file mln/core/p_set.hh +/*! \file mln/core/site_set/p_set.hh * * \brief Definition of a point set class based on std::set. */ @@ -36,7 +36,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/internal/set_of.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <trait/point_set.hh> @@ -192,4 +192,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_SET_HH +#endif // ! MLN_CORE_SITE_SET_P_SET_HH Index: sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH -# define MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH /*! \file mln/core/p_priority_queue_fast_with_array.hh * @@ -43,7 +43,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <trait/point_set.hh> @@ -348,4 +348,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH Index: sandbox/pellegrin/set/core/line2d.hh --- sandbox/pellegrin/set/core/line2d.hh (revision 2170) +++ sandbox/pellegrin/set/core/line2d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE2D_HH -# define MLN_CORE_LINE2D_HH +#ifndef MLN_CORE_SITE_SET_LINE2D_HH +# define MLN_CORE_SITE_SET_LINE2D_HH -/*! \file mln/core/line2d.hh +/*! \file mln/core/site_set/line2d.hh * * \brief Definition of a point set class based on std::vector. */ @@ -209,4 +209,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE2D_HH +#endif // ! MLN_CORE_SITE_SET_LINE2D_HH Index: sandbox/pellegrin/set/core/p_graph.hh --- sandbox/pellegrin/set/core/p_graph.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_graph.hh (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_GRAPH_HH -# define MLN_CORE_P_GRAPH_HH +#ifndef MLN_CORE_SITE_SET_P_GRAPH_HH +# define MLN_CORE_SITE_SET_P_GRAPH_HH # include <mln/core/concept/point_site.hh> # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> # include <mln/core/graph_psite.hh> -# include <mln/core/p_graph_piter.hh> +# include <mln/core/site_set/p_graph_piter.hh> # include <trait/point_set.hh> -/// \file mln/core/p_graph.hh +/// \file mln/core/site_set/p_graph.hh /// \brief Definition of a point set based on graph. namespace mln @@ -259,4 +259,4 @@ } // end of mln -#endif // MLN_CORE_P_GRAPH_HH +#endif // MLN_CORE_SITE_SET_P_GRAPH_HH Index: sandbox/pellegrin/set/core/p_queue_fast.hh --- sandbox/pellegrin/set/core/p_queue_fast.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_queue_fast.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_QUEUE_FAST_HH -# define MLN_CORE_P_QUEUE_FAST_HH +#ifndef MLN_CORE_SITE_SET_P_QUEUE_FAST_HH +# define MLN_CORE_SITE_SET_P_QUEUE_FAST_HH -/*! \file mln/core/p_queue_fast.hh +/*! \file mln/core/site_set/p_queue_fast.hh * * \brief Definition of a point set class faster but needs more memory * space. @@ -315,4 +315,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_QUEUE_FAST_HH +#endif // ! MLN_CORE_SITE_SET_P_QUEUE_FAST_HH Index: sandbox/aroumougame/skeleton/miscellenous.hh --- sandbox/aroumougame/skeleton/miscellenous.hh (revision 2170) +++ sandbox/aroumougame/skeleton/miscellenous.hh (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/image2d.hh> #include <mln/value/int_u.hh> #include <vector> Index: sandbox/aroumougame/skeleton/thinning.hh --- sandbox/aroumougame/skeleton/thinning.hh (revision 2170) +++ sandbox/aroumougame/skeleton/thinning.hh (working copy) @@ -1,5 +1,5 @@ #include "neighborhood1.hh" -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/graph_image.hh> #include <mln/core/graph_elt_neighborhood.hh> #include <mln/math/min.hh> Index: sandbox/jardonnet/registration/tools.hh --- sandbox/jardonnet/registration/tools.hh (revision 2170) +++ sandbox/jardonnet/registration/tools.hh (working copy) @@ -4,7 +4,7 @@ // temporary # include <mln/algebra/mat.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include "quat7.hh" Index: sandbox/jardonnet/registration/quat7.hh --- sandbox/jardonnet/registration/quat7.hh (revision 2170) +++ sandbox/jardonnet/registration/quat7.hh (working copy) @@ -6,7 +6,7 @@ # include <algorithm> # include <mln/algebra/mat.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include "rotation.hh" # include "jacobi.hh" Index: sandbox/jardonnet/registration/cloud.hh --- sandbox/jardonnet/registration/cloud.hh (revision 2170) +++ sandbox/jardonnet/registration/cloud.hh (working copy) @@ -8,7 +8,7 @@ # include <sstream> # include <mln/algebra/vec.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/norm/l2.hh> #include "quat7.hh" Index: sandbox/geraud/fllt/fllt.hh --- sandbox/geraud/fllt/fllt.hh (revision 2170) +++ sandbox/geraud/fllt/fllt.hh (working copy) @@ -30,11 +30,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt.svg.1.cc --- sandbox/geraud/fllt/fllt.svg.1.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.1.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt.svg.7.hh --- sandbox/geraud/fllt/fllt.svg.7.hh (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.7.hh (working copy) @@ -33,11 +33,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.6.cc --- sandbox/geraud/fllt/fllt.svg.6.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.6.cc (working copy) @@ -29,11 +29,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt_test.hh --- sandbox/geraud/fllt/fllt_test.hh (revision 2170) +++ sandbox/geraud/fllt/fllt_test.hh (working copy) @@ -29,11 +29,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt.svg.7.hh --- sandbox/geraud/fllt.svg.7.hh (revision 2170) +++ sandbox/geraud/fllt.svg.7.hh (working copy) @@ -33,11 +33,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/p_runs__with_dedicated_piter.hh --- sandbox/geraud/p_runs__with_dedicated_piter.hh (revision 2170) +++ sandbox/geraud/p_runs__with_dedicated_piter.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUNS_HH -# define MLN_CORE_P_RUNS_HH +#ifndef MLN_CORE_SITE_SET_P_RUNS_HH +# define MLN_CORE_SITE_SET_P_RUNS_HH /*! \file mln/core/p_runs.hh * @@ -34,7 +34,7 @@ */ # include <mln/accu/bbox.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/core/p_double.hh> # include <mln/core/internal/piter_adaptor.hh> # include <mln/util/set.hh> @@ -755,4 +755,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_RUNS_HH +#endif // ! MLN_CORE_SITE_SET_P_RUNS_HH Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 2170) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -29,11 +29,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/cs2d/cs2d_morpho.hh --- sandbox/geraud/cs2d/cs2d_morpho.hh (revision 2170) +++ sandbox/geraud/cs2d/cs2d_morpho.hh (working copy) @@ -2,7 +2,7 @@ # include <mln/accu/min_max.hh> # include <mln/labeling/regional_minima.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> namespace mln Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2170) +++ sandbox/garrigues/level_set.hh (working copy) @@ -42,12 +42,12 @@ # include <mln/core/image2d.hh> # include <mln/core/point2d.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/core/pset_if_piter.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/core/sub_image.hh> # include <mln/core/image_if.hh> # include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.1.cc --- sandbox/garrigues/fllt/fllt_simple.svg.1.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_simple.svg.1.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d.hh> #include <mln/core/sub_image.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.3.cc --- sandbox/garrigues/fllt/fllt_simple.svg.3.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d.hh> #include <mln/core/sub_image.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> @@ -52,7 +52,7 @@ #include <mln/util/branch_iter_ind.hh> #include <mln/core/cast_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> namespace mln { Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -32,11 +32,11 @@ #include <mln/core/image2d.hh> #include <mln/core/sub_image.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/cast_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/dp_array.hh> Index: sandbox/garrigues/fllt/types.hh --- sandbox/garrigues/fllt/types.hh (revision 2170) +++ sandbox/garrigues/fllt/types.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/util/tree.hh> # include <mln/util/branch_iter_ind.hh> Index: sandbox/garrigues/fllt/fllt_theo.cc --- sandbox/garrigues/fllt/fllt_theo.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_theo.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt_types.hh --- sandbox/garrigues/fllt/fllt_types.hh (revision 2170) +++ sandbox/garrigues/fllt/fllt_types.hh (working copy) @@ -36,7 +36,7 @@ */ # include <mln/util/tree.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # define fllt_tree(P, V) util::tree< mln::fllt::fllt_node_elt<P, V> > # define fllt_node(P, V) util::node< mln::fllt::fllt_node_elt<P, V> > Index: sandbox/garrigues/fllt/fllt_simple.svg.2.cc --- sandbox/garrigues/fllt/fllt_simple.svg.2.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d.hh> #include <mln/core/sub_image.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2170) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -36,11 +36,11 @@ */ # include <mln/core/image2d.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/pset_if_piter.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/core/sub_image.hh> # include <mln/core/image_if.hh> # include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/give_confs.cc --- sandbox/garrigues/fllt/give_confs.cc (revision 2170) +++ sandbox/garrigues/fllt/give_confs.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image2d.hh> #include <mln/core/point2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/clock_neighb2d.hh> #include <mln/core/neighb2d.hh> Index: sandbox/abraham/tests/morpho/test_component_tree.cc --- sandbox/abraham/tests/morpho/test_component_tree.cc (revision 2170) +++ sandbox/abraham/tests/morpho/test_component_tree.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> Index: sandbox/abraham/tests/morpho/test_watershed.cc --- sandbox/abraham/tests/morpho/test_watershed.cc (revision 2170) +++ sandbox/abraham/tests/morpho/test_watershed.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/compare.hh> #include <mln/io/pgm/load.hh> Index: sandbox/abraham/tests/morpho/test_watershed_topo.cc --- sandbox/abraham/tests/morpho/test_watershed_topo.cc (revision 2170) +++ sandbox/abraham/tests/morpho/test_watershed_topo.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/compare.hh> Index: sandbox/abraham/mln/morpho/basic_najman.hh --- sandbox/abraham/mln/morpho/basic_najman.hh (revision 2170) +++ sandbox/abraham/mln/morpho/basic_najman.hh (working copy) @@ -1,7 +1,7 @@ #include <mln/level/sort_psites.hh> #include <mln/level/fill.hh> #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/util/greater_psite.hh> #include <mln/estim/min_max.hh> #include <mln/math/sqr.hh>

15 years, 8 months

cleanup-2008 2169: Fix a compilation bug.

by Nicolas Ballas

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Fix a compilation bug. * mln/core/dpoint2d.hh: remove lines created by a svn conflict. dpoint2d.hh | 4 ---- 1 file changed, 4 deletions(-) Index: mln/core/dpoint2d.hh --- mln/core/dpoint2d.hh (revision 2169) +++ mln/core/dpoint2d.hh (working copy) @@ -1,8 +1,4 @@ -<<<<<<< HEAD:milena/mln/core/dpoint2d.hh -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -======= // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) ->>>>>>> remotes/trunk:milena/mln/core/dpoint2d.hh // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms

15 years, 8 months

2169: Add metal::array (1d,2d,3d).

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add metal::array (1d,2d,3d). * mln/metal/all.hh: Update. * mln/metal/array.hh: Generic. * mln/metal/array1d.hh: Container 1d. * mln/metal/array2d.hh: Container 2d. * mln/metal/array3d.hh: Container 3d. all.hh | 5 array.hh | 117 +++++++++++++++++++++++ array1d.hh | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ array2d.hh | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ array3d.hh | 310 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1039 insertions(+) Index: mln/metal/all.hh --- mln/metal/all.hh (revision 2168) +++ mln/metal/all.hh (working copy) @@ -79,6 +79,11 @@ # include <mln/metal/math/all.hh> +# include <mln/metal/array.hh> +# include <mln/metal/array1d.hh> +# include <mln/metal/array2d.hh> +# include <mln/metal/array3d.hh> + // FIXME: Remove the following includes below! # include <mln/metal/same_coord.hh> # include <mln/metal/same_point.hh> Index: mln/metal/array.hh --- mln/metal/array.hh (revision 0) +++ mln/metal/array.hh (revision 0) @@ -0,0 +1,117 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_METAL_ARRAY_HH +# define MLN_METAL_ARRAY_HH + +# include <mln/metal/array1d.hh> +# include <mln/metal/array2d.hh> +# include <mln/metal/array3d.hh> + +namespace mln +{ + + namespace metal + { + + // a1 + + template<unsigned i, class T, unsigned n> inline + T get_at(const array1d<T, n>& arr) + { + return arr.template get_at_<i>(); + } + + template<unsigned i, class T, unsigned n> inline + T get(const array1d<T, n>& arr) + { + return arr.template get_<i>(); + } + + // a2 + + template<unsigned row, unsigned col, class T, + unsigned r, unsigned c> inline + T get_at(const array2d<T, r, c>& arr) + { + return arr.template get_at_<row, col>(); + } + + template<unsigned row, unsigned col, class T, + unsigned r, unsigned c> inline + T get(const array2d<T, r, c>& arr) + { + return arr.template get_<row, col>(); + } + + // a3 + + template<unsigned sli, unsigned row, unsigned col, + class T, unsigned s, unsigned r, unsigned c> inline + T get_at(const array3d<T, s, r, c>& arr) + { + return arr.template get_at_<sli, row, col>(); + } + + template<unsigned sli, unsigned row, unsigned col, + class T, unsigned s, unsigned r, unsigned c> inline + T get_(const array3d<T, s, r, c>& arr) + { + return arr.template get_<sli, row, col>(); + } + + // print + + template<typename T, unsigned n> + std::ostream& operator<<(std::ostream& ostr, const array1d<T, n>& rhs) + { + for (unsigned i = 0; i < n; ++i) + ostr << rhs[i] << " "; + ostr << std::endl; + + return ostr; + } + + template<typename T, unsigned r, unsigned c> + std::ostream& operator<<(std::ostream& ostr, const array2d<T, r, c>& rhs) + { + for (unsigned i = 0; i < r; ++i) + { + for (unsigned j = 0; j < c; ++j) + ostr << rhs(i,j) << '\t'; + ostr << '\n'; + } + ostr << std::endl; + + return ostr; + } + + } + +} + +#endif /* MLN_METAL_ARRAY_HH */ Index: mln/metal/array1d.hh --- mln/metal/array1d.hh (revision 0) +++ mln/metal/array1d.hh (revision 0) @@ -0,0 +1,298 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_METAL_ARRAY1D_HH +# define MLN_METAL_ARRAY1D_HH + +# include <mln/core/concept/object.hh> + +# include <mln/trait/all.hh> +# include <mln/trait/value_.hh> + +# include <mln/value/ops.hh> + +namespace mln +{ + + // Fwd decls. + namespace metal { + template <typename T, unsigned Size> struct array1d; + } + + namespace trait + { + + template <typename T, unsigned Size> + struct value_< mln::metal::array1d<T,Size> > + { + typedef trait::value::nature::vectorial nature; + typedef trait::value::kind::data kind; + + enum { + nbits = Size * mln_nbits(T), + card = Size * mln_card(T) + }; + typedef mln_value_quant_from_(card) quant; + + typedef metal::array1d<mln_sum(T),Size> sum; + }; + + } // end of namespace mln::trait + + + namespace metal + { + + template <typename T, unsigned Size> + struct array1d : public Object< array1d<T,Size> > + { + + // + // Constructors + // + + array1d(); + array1d(T* ptr); + + // Copy + + array1d(const array1d<T, Size>& rhs); + array1d<T, Size>& operator=(const array1d<T, Size>& rhs); + + // Operators + + template <class U> + array1d<T, Size> operator*(U w); + + template <class U> + array1d<mln_trait_op_div(T,U), Size> + operator/(U w); + + template <typename U> + array1d<mln_trait_op_plus(T,U), Size> + operator+(const array1d<U, Size>& rhs) const; + array1d<T, Size>& operator+=(const array1d<T, Size>& rhs); + + template <typename U> + array1d<mln_trait_op_minus(T,U), Size> + operator-(const array1d<U, Size>& rhs) const; + array1d<T, Size>& + operator-=(const array1d<T, Size>& rhs); + + + // dynamic accessors: + + T operator[](unsigned i) const { + mln_precondition(i < Size); + return buffer_[i]; + } + T& operator[](unsigned i) { + mln_precondition(i < Size); + return buffer_[i]; + } + + // static accessor + + template<unsigned i> + T get() const { + return buffer_[i]; + } + template<unsigned i> + T& get() { + return buffer_[i]; + } + + enum { length = Size }; + protected: + + T buffer_[Size]; + }; + + } + + namespace trait + { + + // For unary traits. + + template < template <class> class Name, + unsigned n, typename T > + struct set_precise_unary_< Name, metal::array1d<T, n> > + { + typedef mln_trait_unary(Name, T) V; + typedef metal::array1d<V, n> ret; + }; + + // For binary traits. + + template < template <class, class> class Name, + unsigned n, typename T, + typename U > + struct set_precise_binary_< Name, + metal::array1d<T, n>, metal::array1d<U, n> > + { + typedef mln_trait_binary(Name, T, U) V; + typedef metal::array1d<V, n> ret; + }; + + template < unsigned n, typename T, + typename U > + struct set_precise_binary_< op::times, + metal::array1d<T, n>, metal::array1d<U, n> > + { + typedef mln_sum_x(T,U) ret; + }; + + template < template <class, class> class Name, + unsigned n, typename T, + typename S > + struct set_precise_binary_< Name, + metal::array1d<T, n>, mln::value::scalar_<S> > + { + typedef mln_trait_binary(Name, T, S) V; + typedef metal::array1d<V, n> ret; + }; + + template < template<class, class> class Name, + unsigned n, typename T, + typename S > + struct set_binary_< Name, + mln::Object, metal::array1d<T, n>, + mln::value::Scalar, S > + { + typedef mln_trait_binary(Name, T, S) V; + typedef metal::array1d<T, n> ret; + }; + + } // end of namespace mln::trait + + + namespace metal + { + + // + // Constructors + // + + template <typename T, unsigned Size> + array1d<T,Size>::array1d() + { + } + + template <typename T, unsigned Size> + array1d<T,Size>::array1d(T* ptr) + { + for (unsigned i = 0; i < Size; ++i) + buffer_[i] = *ptr++; + } + + // Copy + + template <typename T, unsigned Size> + array1d<T,Size>::array1d(const array1d<T, Size>& rhs) + { + for (unsigned i = 0; i < Size; ++i) + buffer_[i] = rhs[i]; + } + template <typename T, unsigned Size> + array1d<T, Size>& + array1d<T,Size>::operator=(const array1d<T, Size>& rhs) + { + for (unsigned i = 0; i < Size; ++i) + buffer_[i] = rhs[i]; + return *this; + } + + // Operators + + template <typename T, unsigned Size> + template <class U> + array1d<T, Size> + array1d<T,Size>::operator*(U w) + { + //fixme mln_trait_op_mult<int,U> + array1d<T, Size> tmp; + for (unsigned i = 0; i < Size; ++i) + tmp[i] = this->buffer_[i] * w; + return tmp; + } + + template <typename T, unsigned Size> + template <class U> + array1d<mln_trait_op_div(T,U), Size> + array1d<T,Size>::operator/(U w) + { + array1d<T, Size> tmp; + for (unsigned i = 0; i < Size; ++i) + tmp[i] = this->buffer_[i] / w; + return tmp; + } + + template <typename T, unsigned Size> + template <typename U> + array1d<mln_trait_op_plus(T,U), Size> + array1d<T,Size>::operator+(const array1d<U, Size>& rhs) const + { + array1d<T, Size> tmp; + for (unsigned i = 0; i < Size; ++i) + tmp[i] = this->buffer_[i] + rhs.buffer_[i]; + return tmp; + } + template <typename T, unsigned Size> + array1d<T, Size>& + array1d<T,Size>::operator+=(const array1d<T, Size>& rhs) + { + for (unsigned i = 0; i < Size; ++i) + this->buffer_[i] += rhs.buffer_[i]; + return *this; + } + + template <typename T, unsigned Size> + template <typename U> + array1d<mln_trait_op_minus(T,U), Size> + array1d<T,Size>::operator-(const array1d<U, Size>& rhs) const + { + array1d<T, Size> tmp; + for (unsigned i = 0; i < Size; ++i) + tmp[i] = this->buffer_[i] - rhs.buffer_[i]; + return tmp; + } + template <typename T, unsigned Size> + array1d<T, Size>& + array1d<T,Size>::operator-=(const array1d<T, Size>& rhs) + { + for (unsigned i = 0; i < Size; ++i) + this->buffer_[i] -= rhs.buffer_[i]; + return *this; + } + + } // end of namespace metal + +} // end of namespace mln + +#endif /* MLN_METAL_ARRAY1D_HH */ + Index: mln/metal/array2d.hh --- mln/metal/array2d.hh (revision 0) +++ mln/metal/array2d.hh (revision 0) @@ -0,0 +1,309 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_METAL_ARRAY2D_HH +# define MLN_METAL_ARRAY2D_HH + +# include <mln/core/concept/object.hh> + +# include <mln/trait/all.hh> +# include <mln/trait/value_.hh> + +# include <mln/value/ops.hh> + +namespace mln +{ + + // Fwd decls. + namespace metal { + template <typename T, unsigned r, unsigned c> struct array2d; + } + + namespace trait + { + + template <typename T, unsigned r, unsigned c> + struct value_< mln::metal::array2d<T, r, c> > + { + typedef trait::value::nature::vectorial nature; + typedef trait::value::kind::data kind; + + enum { + nbits = r * c * mln_nbits(T), + card = r * c * mln_card(T) + }; + typedef mln_value_quant_from_(card) quant; + + typedef metal::array2d<mln_sum(T),r, c> sum; + }; + + } // end of namespace mln::trait + + + namespace metal + { + + template <typename T, unsigned r, unsigned c> + struct array2d : public Object< array2d<T, r, c> > + { + + // + // Constructors + // + + array2d(); + array2d(T* ptr); + + // Copy + + array2d(const array2d<T, r, c>& rhs); + + array2d<T, r, c>& operator=(const array2d<T, r, c>& rhs); + + // Operators + + template <class U> + array2d<T, r, c> operator*(U w); + + template <class U> + array2d<mln_trait_op_div(T,U), r, c> + operator/(U w); + + template <typename U> + array2d<mln_trait_op_plus(T,U), r, c> + operator+(const array2d<U, r, c>& rhs) const; + array2d<T, r, c>& operator+=(const array2d<T, r, c>& rhs); + + template <typename U> + array2d<mln_trait_op_minus(T,U), r, c> + operator-(const array2d<U, r, c>& rhs) const; + array2d<T, r, c>& + operator-=(const array2d<T, r, c>& rhs); + + // dynamic accessors: + + T operator()(unsigned row, unsigned col) const { + mln_precondition(row < r * c); + return buffer_[col * r + row]; + } + T& operator()(unsigned row, unsigned col) { + mln_precondition(row < r * c); + return buffer_[col * r + row]; + } + + // static accessor + + template<unsigned row, unsigned col> + T get() const { + return buffer_[col * r + row]; + } + template<unsigned row, unsigned col> + T& get() { + return buffer_[col * r + row]; + } + + template<unsigned row, unsigned col> + T get_at() const { + mln_precondition(col * r + row < r *c); + return buffer_[col * r + row]; + } + template<unsigned row, unsigned col> + T& get_at() { + mln_precondition(col * r + row < r *c); + return buffer_[col * r + row]; + } + + enum { length = r * c }; + protected: + + T buffer_[r * c]; + }; + + } + + namespace trait + { + + // For unary traits. + + template < template <class> class Name, + unsigned r, unsigned c, typename T > + struct set_precise_unary_< Name, metal::array2d<T, r, c> > + { + typedef mln_trait_unary(Name, T) V; + typedef metal::array2d<V, r, c> ret; + }; + + // For binary traits. + + template < template <class, class> class Name, + unsigned r, unsigned c, typename T, + typename U > + struct set_precise_binary_< Name, + metal::array2d<T, r, c>, metal::array2d<U, r, c> > + { + typedef mln_trait_binary(Name, T, U) V; + typedef metal::array2d<V, r, c> ret; + }; + + template < unsigned r, unsigned c, typename T, + typename U > + struct set_precise_binary_< op::times, + metal::array2d<T, r, c>, metal::array2d<U, r, c> > + { + typedef mln_sum_x(T,U) ret; + }; + + template < template <class, class> class Name, + unsigned r, unsigned c, typename T, + typename S > + struct set_precise_binary_< Name, + metal::array2d<T, r, c>, mln::value::scalar_<S> > + { + typedef mln_trait_binary(Name, T, S) V; + typedef metal::array2d<V, r, c> ret; + }; + + template < template<class, class> class Name, + unsigned r, unsigned c, typename T, + typename S > + struct set_binary_< Name, + mln::Object, metal::array2d<T, r, c>, + mln::value::Scalar, S > + { + typedef mln_trait_binary(Name, T, S) V; + typedef metal::array2d<T, r, c> ret; + }; + + } // end of namespace mln::trait + + + namespace metal + { + + // + // Constructors + // + + template <typename T, unsigned r, unsigned c> + array2d<T, r, c>::array2d() + { + } + + template <typename T, unsigned r, unsigned c> + array2d<T, r, c>::array2d(T* ptr) + { + for (unsigned i = 0; i < r * c; ++i) + buffer_[i] = *ptr++; + } + + // Copy + + template <typename T, unsigned r, unsigned c> + array2d<T, r, c>::array2d(const array2d<T, r, c>& rhs) + { + for (unsigned i = 0; i < r * c; ++i) + buffer_[i] = rhs[i]; + } + template <typename T, unsigned r, unsigned c> + array2d<T, r, c>& + array2d<T, r, c>::operator=(const array2d<T, r, c>& rhs) + { + for (unsigned i = 0; i < r * c; ++i) + buffer_[i] = rhs[i]; + return *this; + } + + // Operators + + template <typename T, unsigned r, unsigned c> + template <class U> + array2d<T, r, c> + array2d<T, r, c>::operator*(U w) + { + //fixme mln_trait_op_mult<int,U> + array2d<T, r, c> tmp; + for (unsigned i = 0; i < r * c; ++i) + tmp[i] = this->buffer_[i] * w; + return tmp; + } + + template <typename T, unsigned r, unsigned c> + template <class U> + array2d<mln_trait_op_div(T,U), r, c> + array2d<T,r, c>::operator/(U w) + { + array2d<T, r, c> tmp; + for (unsigned i = 0; i < r * c; ++i) + tmp[i] = this->buffer_[i] / w; + return tmp; + } + + template <typename T, unsigned r, unsigned c> + template <typename U> + array2d<mln_trait_op_plus(T,U), r, c> + array2d<T,r, c>::operator+(const array2d<U, r, c>& rhs) const + { + array2d<T, r, c> tmp; + for (unsigned i = 0; i < r * c; ++i) + tmp[i] = this->buffer_[i] + rhs.buffer_[i]; + return tmp; + } + template <typename T, unsigned r, unsigned c> + array2d<T, r, c>& + array2d<T, r, c>::operator+=(const array2d<T, r, c>& rhs) + { + for (unsigned i = 0; i < r * c; ++i) + this->buffer_[i] += rhs.buffer_[i]; + return *this; + } + + template <typename T, unsigned r, unsigned c> + template <typename U> + array2d<mln_trait_op_minus(T,U), r, c> + array2d<T,r, c>::operator-(const array2d<U, r, c>& rhs) const + { + array2d<T, r, c> tmp; + for (unsigned i = 0; i < r * c; ++i) + tmp[i] = this->buffer_[i] - rhs.buffer_[i]; + return tmp; + } + template <typename T, unsigned r, unsigned c> + array2d<T, r, c>& + array2d<T, r, c>::operator-=(const array2d<T, r, c>& rhs) + { + for (unsigned i = 0; i < r * c; ++i) + this->buffer_[i] -= rhs.buffer_[i]; + return *this; + } + + } // end of namespace metal + +} // end of namespace mln + +#endif /* MLN_METAL_ARRAY2D_HH */ + Index: mln/metal/array3d.hh --- mln/metal/array3d.hh (revision 0) +++ mln/metal/array3d.hh (revision 0) @@ -0,0 +1,310 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_METAL_ARRAY3D_HH +# define MLN_METAL_ARRAY3D_HH + +# include <mln/core/concept/object.hh> + +# include <mln/trait/all.hh> +# include <mln/trait/value_.hh> + +# include <mln/value/ops.hh> + +namespace mln +{ + + // Fwd decls. + namespace metal { + template <typename T, unsigned s, unsigned r, unsigned c> struct array3d; + } + + namespace trait + { + + template <typename T, unsigned s, unsigned r, unsigned c> + struct value_< mln::metal::array3d<T,s, r, c> > + { + typedef trait::value::nature::vectorial nature; + typedef trait::value::kind::data kind; + + enum { + nbits = s * r * c * mln_nbits(T), + card = s * r * c * mln_card(T) + }; + typedef mln_value_quant_from_(card) quant; + + typedef metal::array3d<mln_sum(T), s, r, c> sum; + }; + + } // end of namespace mln::trait + + + namespace metal + { + + template <typename T, unsigned s, unsigned r, unsigned c> + struct array3d : public Object< array3d<T, s, r, c> > + { + + // + // Constructors + // + + array3d(); + array3d(T* ptr); + + // Copy + + array3d(const array3d<T, s, r, c>& rhs); + array3d<T, s, r, c>& operator=(const array3d<T, s, r, c>& rhs); + + // Operators + + template <class U> + array3d<T, s, r, c> operator*(U w); + + template <class U> + array3d<mln_trait_op_div(T,U), s, r, c> + operator/(U w); + + template <typename U> + array3d<mln_trait_op_plus(T,U), s, r, c> + operator+(const array3d<U, s, r, c>& rhs) const; + array3d<T, s, r, c>& operator+=(const array3d<T, s, r, c>& rhs); + + template <typename U> + array3d<mln_trait_op_minus(T,U), s, r, c> + operator-(const array3d<U, s, r, c>& rhs) const; + array3d<T, s, r, c>& + operator-=(const array3d<T, s, r, c>& rhs); + + + // dynamic accessors: + + T operator[](unsigned i) const { + mln_precondition(i < s * r * c); + return buffer_[i]; + } + T& operator[](unsigned i) { + mln_precondition(i < s * r * c); + return buffer_[i]; + } + + // static accessor + + template <unsigned sli, unsigned row, unsigned col> + T get() const { + return buffer_[sli * (row * col) + col * r + row]; + } + template <unsigned sli, unsigned row, unsigned col> + T& get() { + return buffer_[sli * (row * col) + col * r + row]; + } + + + template <unsigned sli, unsigned row, unsigned col> + T get_at() const { + mln_precondition(sli * (row * col) + col * r + row < s * r * c ); + return buffer_[sli * (row * col) + col * r + row]; + } + template <unsigned sli, unsigned row, unsigned col> + T& get_at() { + mln_precondition(sli * (row * col) + col * r + row < s * r * c ); + return buffer_[sli * (row * col) + col * r + row]; + } + + enum { length = s * r * c }; + protected: + + T buffer_[s * r * c]; + }; + + } + + namespace trait + { + + // For unary traits. + + template < template <class> class Name, + unsigned s, unsigned r, unsigned c, typename T > + struct set_precise_unary_< Name, metal::array3d<T, s, r, c> > + { + typedef mln_trait_unary(Name, T) V; + typedef metal::array3d<V, s, r, c> ret; + }; + + // For binary traits. + + template < template <class, class> class Name, + unsigned s, unsigned r, unsigned c, typename T, + typename U > + struct set_precise_binary_< Name, + metal::array3d<T, s, r, c>, metal::array3d<U, s, r, c> > + { + typedef mln_trait_binary(Name, T, U) V; + typedef metal::array3d<V, s, r, c> ret; + }; + + template < unsigned s, unsigned r, unsigned c, typename T, + typename U > + struct set_precise_binary_< op::times, + metal::array3d<T, s, r, c>, metal::array3d<U, s, r, c> > + { + typedef mln_sum_x(T,U) ret; + }; + + template < template <class, class> class Name, + unsigned s, unsigned r, unsigned c, typename T, + typename S > + struct set_precise_binary_< Name, + metal::array3d<T, s, r, c>, mln::value::scalar_<S> > + { + typedef mln_trait_binary(Name, T, S) V; + typedef metal::array3d<V, s, r, c> ret; + }; + + template < template<class, class> class Name, + unsigned s, unsigned r, unsigned c, typename T, + typename S > + struct set_binary_< Name, + mln::Object, metal::array3d<T, s, r, c>, + mln::value::Scalar, S > + { + typedef mln_trait_binary(Name, T, S) V; + typedef metal::array3d<T, s, r, c> ret; + }; + + } // end of namespace mln::trait + + + namespace metal + { + + // + // Constructors + // + + template <typename T, unsigned s, unsigned r, unsigned c> + array3d<T,s, r, c>::array3d() + { + } + + template <typename T, unsigned s, unsigned r, unsigned c> + array3d<T,s, r, c>::array3d(T* ptr) + { + for (unsigned i = 0; i < s * r * c; ++i) + buffer_[i] = *ptr++; + } + + // Copy + + template <typename T, unsigned s, unsigned r, unsigned c> + array3d<T,s, r, c>::array3d(const array3d<T, s, r, c>& rhs) + { + for (unsigned i = 0; i < s * r * c; ++i) + buffer_[i] = rhs[i]; + } + template <typename T, unsigned s, unsigned r, unsigned c> + array3d<T, s, r, c>& + array3d<T,s, r, c>::operator=(const array3d<T, s, r, c>& rhs) + { + for (unsigned i = 0; i < s * r * c; ++i) + buffer_[i] = rhs[i]; + return *this; + } + + // Operators + + template <typename T, unsigned s, unsigned r, unsigned c> + template <class U> + array3d<T, s, r, c> + array3d<T,s, r, c>::operator*(U w) + { + //fixme mln_trait_op_mult<int,U> + array3d<T, s, r, c> tmp; + for (unsigned i = 0; i < s * r * c; ++i) + tmp[i] = this->buffer_[i] * w; + return tmp; + } + + template <typename T, unsigned s, unsigned r, unsigned c> + template <class U> + array3d<mln_trait_op_div(T,U), s, r, c> + array3d<T,s, r, c>::operator/(U w) + { + array3d<T, s, r, c> tmp; + for (unsigned i = 0; i < s * r * c; ++i) + tmp[i] = this->buffer_[i] / w; + return tmp; + } + + template <typename T, unsigned s, unsigned r, unsigned c> + template <typename U> + array3d<mln_trait_op_plus(T,U), s, r, c> + array3d<T,s, r, c>::operator+(const array3d<U, s, r, c>& rhs) const + { + array3d<T, s, r, c> tmp; + for (unsigned i = 0; i < s * r * c; ++i) + tmp[i] = this->buffer_[i] + rhs.buffer_[i]; + return tmp; + } + template <typename T, unsigned s, unsigned r, unsigned c> + array3d<T, s, r, c>& + array3d<T,s, r, c>::operator+=(const array3d<T, s, r, c>& rhs) + { + for (unsigned i = 0; i < s * r * c; ++i) + this->buffer_[i] += rhs.buffer_[i]; + return *this; + } + + template <typename T, unsigned s, unsigned r, unsigned c> + template <typename U> + array3d<mln_trait_op_minus(T,U), s, r, c> + array3d<T,s, r, c>::operator-(const array3d<U, s, r, c>& rhs) const + { + array3d<T, s, r, c> tmp; + for (unsigned i = 0; i < s * r * c; ++i) + tmp[i] = this->buffer_[i] - rhs.buffer_[i]; + return tmp; + } + template <typename T, unsigned s, unsigned r, unsigned c> + array3d<T, s, r, c>& + array3d<T,s, r, c>::operator-=(const array3d<T, s, r, c>& rhs) + { + for (unsigned i = 0; i < s * r * c; ++i) + this->buffer_[i] -= rhs.buffer_[i]; + return *this; + } + + } // end of namespace metal + +} // end of namespace mln + +#endif /* MLN_METAL_ARRAY3D_HH */ +

15 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2008