992: Move Milena source files to mln/.
https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Move Milena source files to mln/. * mln/: New directory. * border/, convert/, core/, debug/, io/, level/, morpho/, value/, * README: Move... * mln/border/, mln/convert/, mln/core/, mln/debug/, * mln/io/, mln/level/, mln/morpho/, mln/value/: * mln/README: ...here. Adjust inclusion paths. * tests/main.cc: Likewise. mln/core/box.hh | 6 +++--- mln/core/box2d.hh | 4 ++-- mln/core/box_piter.hh | 4 ++-- mln/core/concept/box.hh | 2 +- mln/core/concept/dpoint.hh | 2 +- mln/core/concept/genpoint.hh | 4 ++-- mln/core/concept/image.hh | 2 +- mln/core/concept/iterator.hh | 2 +- mln/core/concept/neighborhood.hh | 2 +- mln/core/concept/object.hh | 6 +++--- mln/core/concept/piter.hh | 4 ++-- mln/core/concept/point.hh | 2 +- mln/core/concept/point_set.hh | 4 ++-- mln/core/concept/psite.hh | 2 +- mln/core/concept/window.hh | 2 +- mln/core/dpoint.hh | 4 ++-- mln/core/dpoint2d.hh | 4 ++-- mln/core/dpoints_piter.hh | 4 ++-- mln/core/exact.hh | 2 +- mln/core/image2d.hh | 4 ++-- mln/core/internal/coord_impl.hh | 2 +- mln/core/internal/image_adaptor.hh | 2 +- mln/core/internal/image_base.hh | 2 +- mln/core/neighb.hh | 8 ++++---- mln/core/neighb2d.hh | 4 ++-- mln/core/ops.hh | 4 ++-- mln/core/point.hh | 4 ++-- mln/core/point2d.hh | 4 ++-- mln/core/rectangle2d.hh | 8 ++++---- mln/core/safe_image.hh | 2 +- mln/core/vec.hh | 2 +- mln/core/window.hh | 8 ++++---- mln/core/window2d.cc | 6 +++--- mln/core/window2d.hh | 4 ++-- mln/core/window2d_qiter.cc | 4 ++-- mln/debug/println.hh | 6 +++--- mln/level/compare.hh | 2 +- mln/level/fill.hh | 2 +- mln/level/paste.hh | 2 +- mln/morpho/Rd.hh | 10 +++++----- mln/morpho/erosion.hh | 8 ++++---- tests/main.cc | 16 ++++++++-------- 42 files changed, 88 insertions(+), 88 deletions(-) Index: mln/morpho/Rd.hh --- mln/morpho/Rd.hh (revision 991) +++ mln/morpho/Rd.hh (working copy) @@ -3,13 +3,13 @@ # include <vector> -# include <core/concept/image.hh> -# include <core/concept/neighborhood.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> -# include <value/props.hh> +# include <mln/value/props.hh> -# include <level/fill.hh> -# include <level/compare.hh> +# include <mln/level/fill.hh> +# include <mln/level/compare.hh> Index: mln/morpho/erosion.hh --- mln/morpho/erosion.hh (revision 991) +++ mln/morpho/erosion.hh (working copy) @@ -1,10 +1,10 @@ #ifndef MLN_MORPHO_EROSION_HH # define MLN_MORPHO_EROSION_HH -# include <core/concept/image.hh> -# include <core/concept/window.hh> -// FIXME: # include <border/assign.hh> -# include <value/props.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/window.hh> +// FIXME: # include <mln/border/assign.hh> +# include <mln/value/props.hh> namespace mln Index: mln/debug/println.hh --- mln/debug/println.hh (revision 991) +++ mln/debug/println.hh (working copy) @@ -1,9 +1,9 @@ #ifndef MLN_DEBUG_PRINTLN_HH # define MLN_DEBUG_PRINTLN_HH -# include <core/concept/image.hh> -# include <core/concept/window.hh> -# include <core/box2d.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/window.hh> +# include <mln/core/box2d.hh> namespace mln Index: mln/level/fill.hh --- mln/level/fill.hh (revision 991) +++ mln/level/fill.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_LEVEL_FILL_HH # define MLN_LEVEL_FILL_HH -# include <core/concept/image.hh> +# include <mln/core/concept/image.hh> namespace mln Index: mln/level/compare.hh --- mln/level/compare.hh (revision 991) +++ mln/level/compare.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_LEVEL_COMPARE_HH # define MLN_LEVEL_COMPARE_HH -# include <core/concept/image.hh> +# include <mln/core/concept/image.hh> namespace mln Index: mln/level/paste.hh --- mln/level/paste.hh (revision 991) +++ mln/level/paste.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_LEVEL_PASTE_HH # define MLN_LEVEL_PASTE_HH -# include <core/concept/image.hh> +# include <mln/core/concept/image.hh> namespace mln Index: mln/core/neighb2d.hh --- mln/core/neighb2d.hh (revision 991) +++ mln/core/neighb2d.hh (working copy) @@ -2,8 +2,8 @@ # define MLN_CORE_NEIGHB2D_HH # include <cmath> -# include <core/neighb.hh> -# include <core/dpoint2d.hh> +# include <mln/core/neighb.hh> +# include <mln/core/dpoint2d.hh> namespace mln Index: mln/core/dpoint2d.hh --- mln/core/dpoint2d.hh (revision 991) +++ mln/core/dpoint2d.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_DPOINT2D_HH # define MLN_CORE_DPOINT2D_HH -# include <core/dpoint.hh> +# include <mln/core/dpoint.hh> namespace mln @@ -20,7 +20,7 @@ } // end of namespace mln -# include <core/point2d.hh> +# include <mln/core/point2d.hh> #endif // ! MLN_CORE_DPOINT2D_HH Index: mln/core/window2d.cc --- mln/core/window2d.cc (revision 991) +++ mln/core/window2d.cc (working copy) @@ -1,6 +1,6 @@ -# include <core/window2d.hh> -# include <core/window2d_qiter.hh> -# include <core/piter.hh> +# include <mln/core/window2d.hh> +# include <mln/core/window2d_qiter.hh> +# include <mln/core/piter.hh> namespace mln Index: mln/core/dpoints_piter.hh --- mln/core/dpoints_piter.hh (revision 991) +++ mln/core/dpoints_piter.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_DPOINTS_PITER_HH # define MLN_CORE_DPOINTS_PITER_HH -# include <core/concept/piter.hh> -# include <core/concept/genpoint.hh> +# include <mln/core/concept/piter.hh> +# include <mln/core/concept/genpoint.hh> namespace mln Index: mln/core/window2d_qiter.cc --- mln/core/window2d_qiter.cc (revision 991) +++ mln/core/window2d_qiter.cc (working copy) @@ -1,5 +1,5 @@ -# include <core/window2d_qiter.hh> -# include <core/window2d.hh> +# include <mln/core/window2d_qiter.hh> +# include <mln/core/window2d.hh> namespace mln Index: mln/core/box.hh --- mln/core/box.hh (revision 991) +++ mln/core/box.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_BOX_HH # define MLN_CORE_BOX_HH -# include <core/concept/box.hh> -# include <core/point.hh> +# include <mln/core/concept/box.hh> +# include <mln/core/point.hh> namespace mln @@ -62,7 +62,7 @@ } // end of namespace mln -# include <core/box_piter.hh> +# include <mln/core/box_piter.hh> #endif // ! MLN_CORE_BOX_HH Index: mln/core/point.hh --- mln/core/point.hh (revision 991) +++ mln/core/point.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_POINT_HH # define MLN_CORE_POINT_HH -# include <core/concept/point.hh> -# include <core/internal/coord_impl.hh> +# include <mln/core/concept/point.hh> +# include <mln/core/internal/coord_impl.hh> namespace mln Index: mln/core/rectangle2d.hh --- mln/core/rectangle2d.hh (revision 991) +++ mln/core/rectangle2d.hh (working copy) @@ -1,10 +1,10 @@ #ifndef MLN_CORE_RECTANGLE2D_HH # define MLN_CORE_RECTANGLE2D_HH -# include <core/concept/window.hh> -# include <core/internal/set_of.hh> -# include <core/dpoint2d.hh> -# include <core/dpoints_piter.hh> +# include <mln/core/concept/window.hh> +# include <mln/core/internal/set_of.hh> +# include <mln/core/dpoint2d.hh> +# include <mln/core/dpoints_piter.hh> namespace mln Index: mln/core/box_piter.hh --- mln/core/box_piter.hh (revision 991) +++ mln/core/box_piter.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_BOX_PITER_HH # define MLN_CORE_BOX_PITER_HH -# include <core/concept/piter.hh> -# include <core/concept/box.hh> +# include <mln/core/concept/piter.hh> +# include <mln/core/concept/box.hh> namespace mln Index: mln/core/neighb.hh --- mln/core/neighb.hh (revision 991) +++ mln/core/neighb.hh (working copy) @@ -1,9 +1,9 @@ #ifndef MLN_CORE_NEIGHB_HH # define MLN_CORE_NEIGHB_HH -# include <core/concept/neighborhood.hh> -# include <core/internal/set_of.hh> -# include <core/dpoint.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/core/internal/set_of.hh> +# include <mln/core/dpoint.hh> namespace mln @@ -50,7 +50,7 @@ } // end of namespace mln -# include <core/dpoints_piter.hh> +# include <mln/core/dpoints_piter.hh> #endif // ! MLN_CORE_NEIGHB_HH Index: mln/core/dpoint.hh --- mln/core/dpoint.hh (revision 991) +++ mln/core/dpoint.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_DPOINT_HH # define MLN_CORE_DPOINT_HH -# include <core/concept/dpoint.hh> -# include <core/internal/coord_impl.hh> +# include <mln/core/concept/dpoint.hh> +# include <mln/core/internal/coord_impl.hh> namespace mln Index: mln/core/window2d.hh --- mln/core/window2d.hh (revision 991) +++ mln/core/window2d.hh (working copy) @@ -2,8 +2,8 @@ # define MLN_CORE_WINDOW2D_HH # include <cmath> -# include <core/window.hh> -# include <core/dpoint2d.hh> +# include <mln/core/window.hh> +# include <mln/core/dpoint2d.hh> namespace mln Index: mln/core/concept/image.hh --- mln/core/concept/image.hh (revision 991) +++ mln/core/concept/image.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_CONCEPT_IMAGE_HH # define MLN_CORE_CONCEPT_IMAGE_HH -# include <core/concept/point_set.hh> +# include <mln/core/concept/point_set.hh> namespace mln Index: mln/core/concept/piter.hh --- mln/core/concept/piter.hh (revision 991) +++ mln/core/concept/piter.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_CONCEPT_PITER_HH # define MLN_CORE_CONCEPT_PITER_HH -# include <core/concept/iterator.hh> -# include <core/concept/genpoint.hh> +# include <mln/core/concept/iterator.hh> +# include <mln/core/concept/genpoint.hh> namespace mln Index: mln/core/concept/genpoint.hh --- mln/core/concept/genpoint.hh (revision 991) +++ mln/core/concept/genpoint.hh (working copy) @@ -5,8 +5,8 @@ * This file defines the concept of mln::GenPoint. */ -# include <core/concept/object.hh> -# include <core/macros.hh> +# include <mln/core/concept/object.hh> +# include <mln/core/macros.hh> # include <mlc/equal.hh> # include <mlc/same_point.hh> Index: mln/core/concept/point_set.hh --- mln/core/concept/point_set.hh (revision 991) +++ mln/core/concept/point_set.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_CONCEPT_POINT_SET_HH # define MLN_CORE_CONCEPT_POINT_SET_HH -# include <core/concept/point.hh> -# include <core/concept/piter.hh> +# include <mln/core/concept/point.hh> +# include <mln/core/concept/piter.hh> namespace mln Index: mln/core/concept/psite.hh --- mln/core/concept/psite.hh (revision 991) +++ mln/core/concept/psite.hh (working copy) @@ -5,7 +5,7 @@ * This file defines the concept of mln::Psite. */ -# include <core/concept/genpoint.hh> +# include <mln/core/concept/genpoint.hh> namespace mln Index: mln/core/concept/object.hh --- mln/core/concept/object.hh (revision 991) +++ mln/core/concept/object.hh (working copy) @@ -8,7 +8,7 @@ # include <cassert> # include <iostream> -# include <core/macros.hh> +# include <mln/core/macros.hh> namespace mln @@ -38,8 +38,8 @@ } // end of namespace mln -# include <core/exact.hh> -# include <core/ops.hh> +# include <mln/core/exact.hh> +# include <mln/core/ops.hh> #endif // ! MLN_CORE_CONCEPT_OBJECT_HH Index: mln/core/concept/neighborhood.hh --- mln/core/concept/neighborhood.hh (revision 991) +++ mln/core/concept/neighborhood.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_CONCEPT_NEIGHBORHOOD_HH # define MLN_CORE_CONCEPT_NEIGHBORHOOD_HH -# include <core/concept/object.hh> +# include <mln/core/concept/object.hh> namespace mln Index: mln/core/concept/window.hh --- mln/core/concept/window.hh (revision 991) +++ mln/core/concept/window.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_CONCEPT_WINDOW_HH # define MLN_CORE_CONCEPT_WINDOW_HH -# include <core/concept/object.hh> +# include <mln/core/concept/object.hh> namespace mln Index: mln/core/concept/box.hh --- mln/core/concept/box.hh (revision 991) +++ mln/core/concept/box.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_CONCEPT_BOX_HH # define MLN_CORE_CONCEPT_BOX_HH -# include <core/concept/point_set.hh> +# include <mln/core/concept/point_set.hh> namespace mln Index: mln/core/concept/point.hh --- mln/core/concept/point.hh (revision 991) +++ mln/core/concept/point.hh (working copy) @@ -5,7 +5,7 @@ * This file defines the concept of mln::Point. */ -# include <core/concept/psite.hh> +# include <mln/core/concept/psite.hh> namespace mln Index: mln/core/concept/iterator.hh --- mln/core/concept/iterator.hh (revision 991) +++ mln/core/concept/iterator.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_CONCEPT_ITERATOR_HH # define MLN_CORE_CONCEPT_ITERATOR_HH -# include <core/concept/object.hh> +# include <mln/core/concept/object.hh> # define for_all(x) for(x.start(); x.is_valid(); x.next()) Index: mln/core/concept/dpoint.hh --- mln/core/concept/dpoint.hh (revision 991) +++ mln/core/concept/dpoint.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_CONCEPT_DPOINT_HH # define MLN_CORE_CONCEPT_DPOINT_HH -# include <core/concept/object.hh> +# include <mln/core/concept/object.hh> namespace mln Index: mln/core/ops.hh --- mln/core/ops.hh (revision 991) +++ mln/core/ops.hh (working copy) @@ -5,8 +5,8 @@ * Default definitions of some operators. */ -# include <core/concept/object.hh> -# include <core/exact.hh> +# include <mln/core/concept/object.hh> +# include <mln/core/exact.hh> namespace mln Index: mln/core/exact.hh --- mln/core/exact.hh (revision 991) +++ mln/core/exact.hh (working copy) @@ -5,7 +5,7 @@ * This file defines the mln::exact downcast routines. */ -# include <core/concept/object.hh> +# include <mln/core/concept/object.hh> namespace mln Index: mln/core/window.hh --- mln/core/window.hh (revision 991) +++ mln/core/window.hh (working copy) @@ -1,9 +1,9 @@ #ifndef MLN_CORE_WINDOW_HH # define MLN_CORE_WINDOW_HH -# include <core/concept/window.hh> -# include <core/internal/set_of.hh> -# include <core/dpoint.hh> +# include <mln/core/concept/window.hh> +# include <mln/core/internal/set_of.hh> +# include <mln/core/dpoint.hh> namespace mln @@ -55,7 +55,7 @@ } // end of namespace mln -# include <core/dpoints_piter.hh> +# include <mln/core/dpoints_piter.hh> #endif // ! MLN_CORE_WINDOW_HH Index: mln/core/image2d.hh --- mln/core/image2d.hh (revision 991) +++ mln/core/image2d.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_IMAGE2D_HH # define MLN_CORE_IMAGE2D_HH -# include <core/internal/image_base.hh> -# include <core/box2d.hh> +# include <mln/core/internal/image_base.hh> +# include <mln/core/box2d.hh> namespace mln Index: mln/core/vec.hh --- mln/core/vec.hh (revision 991) +++ mln/core/vec.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_VEC_HH # define MLN_CORE_VEC_HH -# include <core/concept/object.hh> +# include <mln/core/concept/object.hh> namespace mln Index: mln/core/internal/coord_impl.hh --- mln/core/internal/coord_impl.hh (revision 991) +++ mln/core/internal/coord_impl.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_INTERNAL_COORD_IMPL_HH # define MLN_CORE_INTERNAL_COORD_IMPL_HH -# include <core/concept/object.hh> +# include <mln/core/concept/object.hh> namespace mln Index: mln/core/internal/image_base.hh --- mln/core/internal/image_base.hh (revision 991) +++ mln/core/internal/image_base.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_INTERNAL_IMAGE_BASE_HH # define MLN_CORE_INTERNAL_IMAGE_BASE_HH -# include <core/concept/image.hh> +# include <mln/core/concept/image.hh> namespace mln Index: mln/core/internal/image_adaptor.hh --- mln/core/internal/image_adaptor.hh (revision 991) +++ mln/core/internal/image_adaptor.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_INTERNAL_IMAGE_ADAPTOR_HH # define MLN_CORE_INTERNAL_IMAGE_ADAPTOR_HH -# include <core/internal/image_base.hh> +# include <mln/core/internal/image_base.hh> namespace mln Index: mln/core/box2d.hh --- mln/core/box2d.hh (revision 991) +++ mln/core/box2d.hh (working copy) @@ -1,8 +1,8 @@ #ifndef MLN_CORE_BOX2D_HH # define MLN_CORE_BOX2D_HH -# include <core/box.hh> -# include <core/point2d.hh> +# include <mln/core/box.hh> +# include <mln/core/point2d.hh> namespace mln Index: mln/core/point2d.hh --- mln/core/point2d.hh (revision 991) +++ mln/core/point2d.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_POINT2D_HH # define MLN_CORE_POINT2D_HH -# include <core/point.hh> +# include <mln/core/point.hh> namespace mln @@ -20,7 +20,7 @@ } // end of namespace mln -# include <core/dpoint2d.hh> +# include <mln/core/dpoint2d.hh> #endif // ! MLN_CORE_POINT2D_HH Index: mln/core/safe_image.hh --- mln/core/safe_image.hh (revision 991) +++ mln/core/safe_image.hh (working copy) @@ -1,7 +1,7 @@ #ifndef MLN_CORE_SAFE_IMAGE_HH # define MLN_CORE_SAFE_IMAGE_HH -# include <core/internal/image_adaptor.hh> +# include <mln/core/internal/image_adaptor.hh> namespace mln Index: tests/main.cc --- tests/main.cc (revision 991) +++ tests/main.cc (working copy) @@ -1,16 +1,16 @@ #include <cmath> -#include <core/image2d.hh> -#include <level/fill.hh> -#include <debug/println.hh> +#include <mln/core/image2d.hh> +#include <mln/level/fill.hh> +#include <mln/debug/println.hh> -#include <core/window2d.hh> -#include <core/rectangle2d.hh> +#include <mln/core/window2d.hh> +#include <mln/core/rectangle2d.hh> -#include <core/neighb2d.hh> +#include <mln/core/neighb2d.hh> -#include <morpho/erosion.hh> -#include <morpho/Rd.hh> +#include <mln/morpho/erosion.hh> +#include <mln/morpho/Rd.hh> typedef unsigned char int_u8;
participants (1)
-
Roland Levillain