https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@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