Commit 6c12812f authored by Thierry Geraud's avatar Thierry Geraud
Browse files

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.


git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2177 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 1181a392
2008-09-04 Thierry Geraud <thierry.geraud@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.
2008-09-04 Thierry Geraud <thierry.geraud@lrde.epita.fr>
 
Rename pset_if as p_if and remove Q at end of priority_Q.
......
......@@ -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 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_COMPLEX_IMAGE_HH
#endif // ! MLN_CORE_IMAGE_COMPLEX_IMAGE_HH
......@@ -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 @@ namespace mln
} // end of namespace mln
#endif // ! MLN_CORE_LAZY_IMAGE_HH
#endif // ! MLN_CORE_IMAGE_LAZY_IMAGE_HH
......@@ -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 @@ namespace mln
} // end of mln
#endif // MLN_CORE_P_COMPLEX_HH
#endif // MLN_CORE_SITE_SET_P_COMPLEX_HH
......@@ -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 @@ namespace mln
} // end of mln
#endif // ! MLN_CORE_P_COMPLEX_PITER_HH
#endif // ! MLN_CORE_SITE_SET_P_COMPLEX_PITER_HH
......@@ -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 @@ namespace mln
} // end of mln
#endif // MLN_CORE_P_FACES_HH
#endif // MLN_CORE_SITE_SET_P_FACES_HH
......@@ -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 @@ int main()
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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment