https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Propagate renaming clone as duplicate. * duhamel/slow_seed2tiling.cc, * duhamel/labeling_algo.hh, * duhamel/extract_array.cc, * aroumougame/skeleton/sedt.hh, * scribo/demat.hh, * nivault/extract_character.cc, * dalila/demat.hh, * garrigues/level_set.hh, * garrigues/fllt/test_fllt_lena_tiles.cc, * garrigues/fllt/test_fllt10.cc, * garrigues/fllt/test_fllt_tiny.cc, * garrigues/fllt/test_fllt12.cc, * garrigues/fllt/fllt_simple.svg.1.cc, * garrigues/fllt/fllt_simple.svg.3.cc, * garrigues/fllt/fllt_simple.cc, * garrigues/fllt/test_fllt10_inv.cc, * garrigues/fllt/fllt_theo.cc, * garrigues/fllt/test_fllt3.cc, * garrigues/fllt/test_fllt5.cc, * garrigues/fllt/compute_level_set_fast2.hh, * garrigues/fllt/test_fllt7.cc, * garrigues/fllt/test_fllt9.cc, * garrigues/fllt/test_fllt3_inv.cc, * garrigues/fllt/test_fllt_lena.cc, * garrigues/fllt/test_fllt.cc, * garrigues/fllt/test_flltb.cc, * garrigues/fllt/test_fllt7_inv.cc, * garrigues/fllt/test_fllt13.cc, * garrigues/fllt/compute_level_set_fast.hh, * garrigues/fllt/test_fllt15.cc, * garrigues/fllt/fllt_simple.svg.2.cc, * garrigues/fllt/fllt.hh, * garrigues/fllt/test.cc, * garrigues/fllt/test_fllt2.cc, * garrigues/fllt/test_fllt4.cc, * garrigues/fllt/test_fllt6.cc, * garrigues/fllt/compute_level_set.hh, * garrigues/fllt/test_fllt8.cc, * garrigues/ocr/ocr_without_preprocess.cc, * garrigues/ocr/ocr_with_preprocess.cc, * garrigues/ocr/enlarge.hh, * garrigues/union_find/reconstructions_on_function.hh, * garrigues/union_find/self_dual_reconstruction.hh, * abraham/mln/morpho/autarkical_leveling.hh, * abraham/mln/morpho/vmt.hh, * abraham/mln/morpho/vector_median.hh, * markov/markov.hh, * geraud/fllt.svg.6.cc, * geraud/fllt/fllt.hh, * geraud/fllt/fllt.svg.1.cc, * geraud/fllt/fllt.svg.7.hh, * geraud/fllt/fllt.svg.2.cc, * geraud/fllt/fllt.svg.3.cc, * geraud/fllt/fllt.svg.4.cc, * geraud/fllt/fllt.svg.5.cc, * geraud/fllt/fllt.svg.6.cc, * geraud/fllt/fllt_test.hh, * geraud/fllt.svg.7.hh, * geraud/Rd/hybrid.hh, * geraud/Rd/parallel.hh, * geraud/Rd/utils.hh, * geraud/Rd/sequential_bench.hh, * geraud/Rd/sequential.hh, * geraud/tufa_2008/filter_n.cc, * geraud/laurent/classif.cc (clone): Update as... (duplicate): ...this. abraham/mln/morpho/autarkical_leveling.hh | 4 ++-- abraham/mln/morpho/vector_median.hh | 2 +- abraham/mln/morpho/vmt.hh | 2 +- aroumougame/skeleton/sedt.hh | 2 +- dalila/demat.hh | 6 +++--- duhamel/extract_array.cc | 2 +- duhamel/labeling_algo.hh | 6 +++--- duhamel/slow_seed2tiling.cc | 4 ++-- garrigues/fllt/compute_level_set.hh | 2 +- garrigues/fllt/compute_level_set_fast.hh | 2 +- garrigues/fllt/compute_level_set_fast2.hh | 2 +- garrigues/fllt/fllt.hh | 2 +- garrigues/fllt/fllt_simple.cc | 6 +++--- garrigues/fllt/fllt_simple.svg.1.cc | 6 +++--- garrigues/fllt/fllt_simple.svg.2.cc | 6 +++--- garrigues/fllt/fllt_simple.svg.3.cc | 6 +++--- garrigues/fllt/fllt_theo.cc | 6 +++--- garrigues/fllt/test.cc | 2 +- garrigues/fllt/test_fllt.cc | 2 +- garrigues/fllt/test_fllt10.cc | 2 +- garrigues/fllt/test_fllt10_inv.cc | 2 +- garrigues/fllt/test_fllt12.cc | 2 +- garrigues/fllt/test_fllt13.cc | 2 +- garrigues/fllt/test_fllt15.cc | 2 +- garrigues/fllt/test_fllt2.cc | 2 +- garrigues/fllt/test_fllt3.cc | 2 +- garrigues/fllt/test_fllt3_inv.cc | 2 +- garrigues/fllt/test_fllt4.cc | 2 +- garrigues/fllt/test_fllt5.cc | 2 +- garrigues/fllt/test_fllt6.cc | 2 +- garrigues/fllt/test_fllt7.cc | 2 +- garrigues/fllt/test_fllt7_inv.cc | 2 +- garrigues/fllt/test_fllt8.cc | 2 +- garrigues/fllt/test_fllt9.cc | 2 +- garrigues/fllt/test_fllt_lena.cc | 2 +- garrigues/fllt/test_fllt_lena_tiles.cc | 2 +- garrigues/fllt/test_fllt_tiny.cc | 2 +- garrigues/fllt/test_flltb.cc | 2 +- garrigues/level_set.hh | 4 ++-- garrigues/ocr/enlarge.hh | 4 ++-- garrigues/ocr/ocr_with_preprocess.cc | 2 +- garrigues/ocr/ocr_without_preprocess.cc | 2 +- garrigues/union_find/reconstructions_on_function.hh | 6 +++--- garrigues/union_find/self_dual_reconstruction.hh | 2 +- geraud/Rd/hybrid.hh | 2 +- geraud/Rd/parallel.hh | 2 +- geraud/Rd/sequential.hh | 2 +- geraud/Rd/sequential_bench.hh | 2 +- geraud/Rd/utils.hh | 2 +- geraud/fllt.svg.6.cc | 6 +++--- geraud/fllt.svg.7.hh | 6 +++--- geraud/fllt/fllt.hh | 4 ++-- geraud/fllt/fllt.svg.1.cc | 4 ++-- geraud/fllt/fllt.svg.2.cc | 4 ++-- geraud/fllt/fllt.svg.3.cc | 4 ++-- geraud/fllt/fllt.svg.4.cc | 4 ++-- geraud/fllt/fllt.svg.5.cc | 4 ++-- geraud/fllt/fllt.svg.6.cc | 6 +++--- geraud/fllt/fllt.svg.7.hh | 6 +++--- geraud/fllt/fllt_test.hh | 6 +++--- geraud/laurent/classif.cc | 4 ++-- geraud/tufa_2008/filter_n.cc | 2 +- markov/markov.hh | 2 +- nivault/extract_character.cc | 2 +- scribo/demat.hh | 8 ++++---- 65 files changed, 105 insertions(+), 105 deletions(-) Index: duhamel/slow_seed2tiling.cc --- duhamel/slow_seed2tiling.cc (revision 3079) +++ duhamel/slow_seed2tiling.cc (working copy) @@ -57,7 +57,7 @@ # include <mln/core/queue_p.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> # include <mln/algebra/vec.hh> @@ -77,7 +77,7 @@ float max) { I& input = exact(input_); - I output = clone(input_); + I output = duplicate(input_); mln_piter(I) p1(input.domain()); mln_piter(I) p2(input.domain()); Index: duhamel/labeling_algo.hh --- duhamel/labeling_algo.hh (revision 3079) +++ duhamel/labeling_algo.hh (working copy) @@ -1,6 +1,6 @@ # include <mln/core/queue_p.hh> # include "queue_p_fast.hh" -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/debug/println.hh> @@ -173,7 +173,7 @@ const Neighborhood<N>& nbh) { I& ima = exact(ima_); - I out = clone(ima_); + I out = duplicate(ima_); queue_p<mln_psite(I)> q; // Init. @@ -235,7 +235,7 @@ const Neighborhood<N>& nbh) { I& ima = exact(ima_); - I out = clone(ima_); + I out = duplicate(ima_); queue_p<mln_psite(I)> q; // Init. Index: duhamel/extract_array.cc --- duhamel/extract_array.cc (revision 3079) +++ duhamel/extract_array.cc (working copy) @@ -53,7 +53,7 @@ mln_concrete(I) pseudo(const I& input, const W& win, const float ratio) { - I output = clone (input); + I output = duplicate (input); unsigned ko = win.length () - (unsigned)(ratio * win.length ()); std::cout << "ko : " << ko << std::endl; mln_pixter(const I) p(input); Index: aroumougame/skeleton/sedt.hh --- aroumougame/skeleton/sedt.hh (revision 3079) +++ aroumougame/skeleton/sedt.hh (working copy) @@ -1,6 +1,6 @@ #include <string> #include <mln/core/image/image2d.hh> -#include <mln/core/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/math/max.hh> #include <mln/math/min.hh> #include <mln/math/sqr.hh> Index: scribo/demat.hh --- scribo/demat.hh (revision 3079) +++ scribo/demat.hh (working copy) @@ -697,7 +697,7 @@ #ifndef NOUT - image2d<label_16> lbl2 = clone(lbl); + image2d<label_16> lbl2 = duplicate(lbl); comp_size_t comp_size; canvas::browsing::depth_first_search(g, comp_size); @@ -830,7 +830,7 @@ { std::cout << "Merging aligned text boxes" << std::endl; - image2d<label_16> lbl_iz = clone(lbl); + image2d<label_16> lbl_iz = duplicate(lbl); io::ppm::save(debug::colorize(rgb8(), lbl, nlabels), output_file("tboxes-lbl.ppm")); image2d<label_16> iz = transform::influence_zone_geodesic(lbl_iz, c8(), settings.bbox_distance); @@ -921,7 +921,7 @@ logical::not_inplace(in); #ifndef NOUT - image2d<bool> in_bak = clone(in); + image2d<bool> in_bak = duplicate(in); #endif internal::settings.max_comp_size = in.ncols() * in.nrows() * 0.05; @@ -971,7 +971,7 @@ logical::not_inplace(in); #ifndef NOUT - image2d<bool> in_bak = clone(in); + image2d<bool> in_bak = duplicate(in); #endif internal::settings.max_comp_size = in.ncols() * in.nrows() * 0.05; Index: nivault/extract_character.cc --- nivault/extract_character.cc (revision 3079) +++ nivault/extract_character.cc (working copy) @@ -132,7 +132,7 @@ int limits) { typedef image2d<unsigned> I_LABEL; - I image = clone(text_image); + I image = duplicate(text_image); point2d start = text_image.domain().pmin (); point2d end = text_image.domain().pmax (); Index: dalila/demat.hh --- dalila/demat.hh (revision 3079) +++ dalila/demat.hh (working copy) @@ -40,7 +40,7 @@ # include <mln/core/image/cast_image.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/var.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/core/routine/ops.hh> # include <mln/core/site_set/p_vaccess.hh> # include <mln/core/site_set/p_set.hh> @@ -317,7 +317,7 @@ #ifndef NOUT - image2d<rgb8> tmp = clone(output); + image2d<rgb8> tmp = duplicate(output); draw_component_boxes(tmp, vboxes); draw_component_boxes(tmp, hboxes); io::ppm::save(tmp, output_file("table-filtered.ppm", 3)); @@ -497,7 +497,7 @@ boxes_t cboxes = labeling::compute(accu::meta::bbox(), lbl, nlabels); #ifndef NOUT - image2d<rgb8> tmp = clone(output); + image2d<rgb8> tmp = duplicate(output); draw_component_boxes(tmp, cboxes); io::ppm::save(tmp, output_file("character-bboxes.ppm", 5)); #endif Index: garrigues/level_set.hh --- garrigues/level_set.hh (revision 3079) +++ garrigues/level_set.hh (working copy) @@ -50,7 +50,7 @@ # 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> +# include <mln/core/routine/duplicate.hh> # include <mln/core/a_point_of.hh> # include <mln/debug/println.hh> @@ -128,7 +128,7 @@ data::fill(regions, 0); data::fill(tagged, false); - u = clone(input); + u = duplicate(input); border::fill(u, 0); } Index: garrigues/fllt/test_fllt_lena_tiles.cc --- garrigues/fllt/test_fllt_lena_tiles.cc (revision 3079) +++ 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/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt10.cc --- garrigues/fllt/test_fllt10.cc (revision 3079) +++ garrigues/fllt/test_fllt10.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt_tiny.cc --- garrigues/fllt/test_fllt_tiny.cc (revision 3079) +++ garrigues/fllt/test_fllt_tiny.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> Index: garrigues/fllt/test_fllt12.cc --- garrigues/fllt/test_fllt12.cc (revision 3079) +++ garrigues/fllt/test_fllt12.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/fllt_simple.svg.1.cc --- garrigues/fllt/fllt_simple.svg.1.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/value/int_u8.hh> @@ -123,7 +123,7 @@ filename << "fllt_u_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(u); + image2d<value::int_u8> out = duplicate(u); const unsigned in_R = 255; mln_piter_(box2d) p(R_box); @@ -149,7 +149,7 @@ const Nbh& nbh = exact(nbh_); // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; image2d<unsigned char> is(input.domain()); Index: garrigues/fllt/fllt_simple.svg.3.cc --- garrigues/fllt/fllt_simple.svg.3.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/value/int_u8.hh> @@ -227,7 +227,7 @@ filename << "fllt_u_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(u); + image2d<value::int_u8> out = duplicate(u); const unsigned in_R = 255; mln_piter_(box2d) p(R_box); @@ -328,7 +328,7 @@ // Variables. image2d<map_cell<node_type> > map(input.domain().to_larger(1)); - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; image2d<unsigned char> is(input.domain().to_larger(1)); Index: garrigues/fllt/fllt_simple.cc --- garrigues/fllt/fllt_simple.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> @@ -366,7 +366,7 @@ filename << "fllt_u_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(u); + image2d<value::int_u8> out = duplicate(u); const unsigned in_R = 255; mln_piter_(box2d) p(R_box); @@ -446,7 +446,7 @@ // Variables. image2d<map_cell<node_type> > map(input.domain().to_larger(1)); - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; image2d<unsigned char> is(input.domain().to_larger(1)); Index: garrigues/fllt/test_fllt10_inv.cc --- garrigues/fllt/test_fllt10_inv.cc (revision 3079) +++ garrigues/fllt/test_fllt10_inv.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/fllt_theo.cc --- garrigues/fllt/fllt_theo.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/value/int_u8.hh> @@ -75,7 +75,7 @@ filename << "fllt_u_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(u); + image2d<value::int_u8> out = duplicate(u); const unsigned in_R = 255; mln_assertion(R_box.is_valid()); @@ -99,7 +99,7 @@ labeling::regional_minima(input, nbh, l_max); // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; image2d<unsigned char> is(input.domain()); Index: garrigues/fllt/test_fllt3.cc --- garrigues/fllt/test_fllt3.cc (revision 3079) +++ garrigues/fllt/test_fllt3.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt5.cc --- garrigues/fllt/test_fllt5.cc (revision 3079) +++ garrigues/fllt/test_fllt5.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/compute_level_set_fast2.hh --- garrigues/fllt/compute_level_set_fast2.hh (revision 3079) +++ garrigues/fllt/compute_level_set_fast2.hh (working copy) @@ -361,7 +361,7 @@ V g, gn; point2d x0; image2d<unsigned> min_locals(ima.domain()); - image2d<V> u = clone(ima); + image2d<V> u = duplicate(ima); border::fill(u, 0); //std::cout << "image U:" << std::endl; Index: garrigues/fllt/test_fllt7.cc --- garrigues/fllt/test_fllt7.cc (revision 3079) +++ garrigues/fllt/test_fllt7.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt9.cc --- garrigues/fllt/test_fllt9.cc (revision 3079) +++ garrigues/fllt/test_fllt9.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt3_inv.cc --- garrigues/fllt/test_fllt3_inv.cc (revision 3079) +++ garrigues/fllt/test_fllt3_inv.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt_lena.cc --- garrigues/fllt/test_fllt_lena.cc (revision 3079) +++ garrigues/fllt/test_fllt_lena.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt.cc --- garrigues/fllt/test_fllt.cc (revision 3079) +++ garrigues/fllt/test_fllt.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_flltb.cc --- garrigues/fllt/test_flltb.cc (revision 3079) +++ garrigues/fllt/test_flltb.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt7_inv.cc --- garrigues/fllt/test_fllt7_inv.cc (revision 3079) +++ garrigues/fllt/test_fllt7_inv.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt13.cc --- garrigues/fllt/test_fllt13.cc (revision 3079) +++ garrigues/fllt/test_fllt13.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/compute_level_set_fast.hh --- garrigues/fllt/compute_level_set_fast.hh (revision 3079) +++ garrigues/fllt/compute_level_set_fast.hh (working copy) @@ -372,7 +372,7 @@ V g, gn; point2d x0; image2d<unsigned> min_locals(ima.domain()); - image2d<V> u = clone(ima); + image2d<V> u = duplicate(ima); border::fill(u, 0); //std::cout << "image U:" << std::endl; Index: garrigues/fllt/test_fllt15.cc --- garrigues/fllt/test_fllt15.cc (revision 3079) +++ garrigues/fllt/test_fllt15.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/fllt_simple.svg.2.cc --- garrigues/fllt/fllt_simple.svg.2.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/value/int_u8.hh> @@ -122,7 +122,7 @@ filename << "fllt_u_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(u); + image2d<value::int_u8> out = duplicate(u); const unsigned in_R = 255; mln_piter_(box2d) p(R_box); @@ -166,7 +166,7 @@ neighb_c6[1].push_back(dpoint2d(-1,0)); // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; image2d<unsigned char> is(input.domain()); Index: garrigues/fllt/fllt.hh --- garrigues/fllt/fllt.hh (revision 3079) +++ garrigues/fllt/fllt.hh (working copy) @@ -43,7 +43,7 @@ # 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> +# include <mln/core/routine/duplicate.hh> # include <mln/core/a_point_of.hh> # include <mln/debug/println.hh> Index: garrigues/fllt/test.cc --- garrigues/fllt/test.cc (revision 3079) +++ 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/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt2.cc --- garrigues/fllt/test_fllt2.cc (revision 3079) +++ garrigues/fllt/test_fllt2.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt4.cc --- garrigues/fllt/test_fllt4.cc (revision 3079) +++ garrigues/fllt/test_fllt4.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/test_fllt6.cc --- garrigues/fllt/test_fllt6.cc (revision 3079) +++ garrigues/fllt/test_fllt6.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/fllt/compute_level_set.hh --- garrigues/fllt/compute_level_set.hh (revision 3079) +++ garrigues/fllt/compute_level_set.hh (working copy) @@ -302,7 +302,7 @@ V g, gn; point2d x0; image2d<unsigned> min_locals(ima.domain()); - image2d<V> u = clone(ima); + image2d<V> u = duplicate(ima); border::fill(u, 0); //std::cout << "image U:" << std::endl; Index: garrigues/fllt/test_fllt8.cc --- garrigues/fllt/test_fllt8.cc (revision 3079) +++ garrigues/fllt/test_fllt8.cc (working copy) @@ -1,6 +1,6 @@ # include "fllt2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> Index: garrigues/ocr/ocr_without_preprocess.cc --- garrigues/ocr/ocr_without_preprocess.cc (revision 3079) +++ garrigues/ocr/ocr_without_preprocess.cc (working copy) @@ -80,7 +80,7 @@ io::pbm::load(input, argv[1]); { - image2d<int_u8> tmp = clone(cast_image<int_u8>(input)); + image2d<int_u8> tmp = duplicate(cast_image<int_u8>(input)); float score = 0; char* s = tesseract("fra", tmp, &score); std::cerr << "Tesseract result: (score " << score << ")" << std::endl; Index: garrigues/ocr/ocr_with_preprocess.cc --- garrigues/ocr/ocr_with_preprocess.cc (revision 3079) +++ garrigues/ocr/ocr_with_preprocess.cc (working copy) @@ -64,7 +64,7 @@ // _COMPILATION_ // g++ -DNDEBUG -O3 -I../../.. ocr.cc -L/usr/lib -ltesseract_full -lpthread -// image2d<int_u8> tmp = clone(cast_image<int_u8>(Var)); \ +// image2d<int_u8> tmp = duplicate(cast_image<int_u8>(Var)); \ #if 1 # define OCR_TEST(Var) \ Index: garrigues/ocr/enlarge.hh --- garrigues/ocr/enlarge.hh (revision 3079) +++ garrigues/ocr/enlarge.hh (working copy) @@ -11,7 +11,7 @@ # include <mln/pw/value.hh> # include <mln/opt/at.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> float val(bool b) { return b ? 1 : 0; } @@ -186,7 +186,7 @@ using value::int_u8; if (n == 0) - return clone(fun::p2v::ternary(pw::value(input), + return duplicate(fun::p2v::ternary(pw::value(input), pw::cst(int_u8(255)), pw::cst(int_u8(0))) | input.domain()); Index: garrigues/union_find/reconstructions_on_function.hh --- garrigues/union_find/reconstructions_on_function.hh (revision 3079) +++ garrigues/union_find/reconstructions_on_function.hh (working copy) @@ -31,7 +31,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/data/fill.hh> # include <mln/level/compare.hh> # include <mln/data/paste.hh> @@ -203,8 +203,8 @@ mln_precondition(marker <= mask); typedef mln_concrete(I) O; - O output = clone(marker); - O output1 = clone(marker); + O output = duplicate(marker); + O output1 = duplicate(marker); O* cur = &output; O* prev = &output1; Index: garrigues/union_find/self_dual_reconstruction.hh --- garrigues/union_find/self_dual_reconstruction.hh (revision 3079) +++ garrigues/union_find/self_dual_reconstruction.hh (working copy) @@ -31,7 +31,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/data/fill.hh> # include <mln/level/compare.hh> # include <mln/data/paste.hh> Index: abraham/mln/morpho/autarkical_leveling.hh --- abraham/mln/morpho/autarkical_leveling.hh (revision 3079) +++ abraham/mln/morpho/autarkical_leveling.hh (working copy) @@ -72,8 +72,8 @@ O output; O ref; - output = clone(input); - ref = clone(input); + output = duplicate(input); + ref = duplicate(input); mln_piter(I) p(input.domain()); mln_qiter(W) q(win, p); Index: abraham/mln/morpho/vmt.hh --- abraham/mln/morpho/vmt.hh (revision 3079) +++ abraham/mln/morpho/vmt.hh (working copy) @@ -73,7 +73,7 @@ const W& win = exact(win_); O output; - output = clone(input); + output = duplicate(input); mln_piter(I) p(input.domain()); mln_qiter(W) q(win, p); Index: abraham/mln/morpho/vector_median.hh --- abraham/mln/morpho/vector_median.hh (revision 3079) +++ abraham/mln/morpho/vector_median.hh (working copy) @@ -73,7 +73,7 @@ const W& win = exact(win_); O output; - output = clone(input); + output = duplicate(input); mln_piter(I) p(input.domain()); mln_qiter(W) q(win, p); Index: markov/markov.hh --- markov/markov.hh (revision 3079) +++ markov/markov.hh (working copy) @@ -7,7 +7,7 @@ # include <approx_exp.hh> # include <T_gen.hh> # include <mln/binarization/threshold.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> namespace mln { Index: geraud/fllt.svg.6.cc --- geraud/fllt.svg.6.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> @@ -196,7 +196,7 @@ filename << "fllt_trace_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(cast_image<value::int_u8>(is)); + image2d<value::int_u8> out = duplicate(cast_image<value::int_u8>(is)); mln_assertion(R_box.nsites() > 0); mln_piter_(box2d) p(R_box); @@ -558,7 +558,7 @@ tag[0] = true; // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); P x0; V g, gN; mln_fwd_piter(I) p(input.domain()); Index: geraud/fllt/fllt.hh --- geraud/fllt/fllt.hh (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> @@ -206,7 +206,7 @@ << std::right << id << ".pgm"; //std::cout << " Save in " << filename.str() << std::endl; - image2d<value::int_u8> out(is.domain());// = clone(cast_image<value::int_u8>(is)); + image2d<value::int_u8> out(is.domain());// = duplicate(cast_image<value::int_u8>(is)); data::fill(out, 0); mln_assertion(R_box.nsites() > 0); mln_piter_(box2d) p(R_box); Index: geraud/fllt/fllt.svg.1.cc --- geraud/fllt/fllt.svg.1.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> @@ -106,7 +106,7 @@ mln_ch_value(I, unsigned) reg_min = labeling::regional_minima(input, nbh, l_max); // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; image2d<unsigned char> is(input.domain()); Index: geraud/fllt/fllt.svg.7.hh --- geraud/fllt/fllt.svg.7.hh (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> @@ -196,7 +196,7 @@ filename << "fllt_trace_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(cast_image<value::int_u8>(is)); + image2d<value::int_u8> out = duplicate(cast_image<value::int_u8>(is)); mln_assertion(R_box.nsites() > 0); mln_piter_(box2d) p(R_box); @@ -475,7 +475,7 @@ tag[0] = true; // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); P x0; V g, gN; mln_fwd_piter(I) p(input.domain()); Index: geraud/fllt/fllt.svg.2.cc --- geraud/fllt/fllt.svg.2.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/value/int_u8.hh> @@ -152,7 +152,7 @@ mln_ch_value(I, unsigned) reg_min = labeling::regional_minima(input, nbh, l_max); // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; image2d<unsigned char> is(input.domain()); Index: geraud/fllt/fllt.svg.3.cc --- geraud/fllt/fllt.svg.3.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> @@ -155,7 +155,7 @@ tag[0] = true; // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; mln_fwd_piter(I) p(input.domain()); Index: geraud/fllt/fllt.svg.4.cc --- geraud/fllt/fllt.svg.4.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> @@ -157,7 +157,7 @@ tag[0] = true; // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; mln_fwd_piter(I) p(input.domain()); Index: geraud/fllt/fllt.svg.5.cc --- geraud/fllt/fllt.svg.5.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> @@ -157,7 +157,7 @@ tag[0] = true; // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); mln_point(I) x0; mln_value(I) g, gN; mln_fwd_piter(I) p(input.domain()); Index: geraud/fllt/fllt.svg.6.cc --- geraud/fllt/fllt.svg.6.cc (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> @@ -193,7 +193,7 @@ filename << "fllt_trace_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(cast_image<value::int_u8>(is)); + image2d<value::int_u8> out = duplicate(cast_image<value::int_u8>(is)); mln_assertion(R_box.nsites() > 0); mln_piter_(box2d) p(R_box); @@ -555,7 +555,7 @@ tag[0] = true; // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); P x0; V g, gN; mln_fwd_piter(I) p(input.domain()); Index: geraud/fllt/fllt_test.hh --- geraud/fllt/fllt_test.hh (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> @@ -201,7 +201,7 @@ filename << "fllt_trace_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(cast_image<value::int_u8>(is)); + image2d<value::int_u8> out = duplicate(cast_image<value::int_u8>(is)); mln_assertion(R_box.nsites() > 0); @@ -504,7 +504,7 @@ tag[0] = true; // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); P x0; V g, gN; mln_fwd_piter(I) p(input.domain()); Index: geraud/fllt.svg.7.hh --- geraud/fllt.svg.7.hh (revision 3079) +++ 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/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> @@ -195,7 +195,7 @@ filename << "fllt_trace_" << std::setw(5) << std::setfill('0') << std::right << id++ << ".ppm"; - image2d<value::int_u8> out = clone(cast_image<value::int_u8>(is)); + image2d<value::int_u8> out = duplicate(cast_image<value::int_u8>(is)); mln_assertion(R_box.nsites() > 0); mln_piter_(box2d) p(R_box); @@ -467,7 +467,7 @@ tag[0] = true; // Variables. - I u = mln::clone(input); + I u = mln::duplicate(input); P x0; V g, gN; mln_fwd_piter(I) p(input.domain()); Index: geraud/Rd/hybrid.hh --- geraud/Rd/hybrid.hh (revision 3079) +++ geraud/Rd/hybrid.hh (working copy) @@ -50,7 +50,7 @@ std::queue<point> q; // initialisation - I o = clone(f); + I o = duplicate(f); unsigned n_init_pushs = 0, n_body_pushs = 0, n_pops = 0; Index: geraud/Rd/parallel.hh --- geraud/Rd/parallel.hh (revision 3079) +++ geraud/Rd/parallel.hh (working copy) @@ -52,7 +52,7 @@ mln_piter(I) p(f.domain()); // initialisation - I o = clone(f); + I o = duplicate(f); bool stability; do Index: geraud/Rd/utils.hh --- geraud/Rd/utils.hh (revision 3079) +++ geraud/Rd/utils.hh (working copy) @@ -31,7 +31,7 @@ # include <vector> # include <mln/core/concept/image.hh> -# include <mln/core/routine/clone.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/util/ord.hh> Index: geraud/Rd/sequential_bench.hh --- geraud/Rd/sequential_bench.hh (revision 3079) +++ geraud/Rd/sequential_bench.hh (working copy) @@ -54,7 +54,7 @@ unsigned nloops = 0; // initialisation - I o = clone(f); + I o = duplicate(f); o.name_it("o"); bool stability; Index: geraud/Rd/sequential.hh --- geraud/Rd/sequential.hh (revision 3079) +++ geraud/Rd/sequential.hh (working copy) @@ -48,7 +48,7 @@ I o_(f.domain()); // initialisation - I o = clone(f); + I o = duplicate(f); bool stability; do Index: geraud/tufa_2008/filter_n.cc --- geraud/tufa_2008/filter_n.cc (revision 3079) +++ geraud/tufa_2008/filter_n.cc (working copy) @@ -129,7 +129,7 @@ { std::cout << "warning: number of expected objects is greater than number of regmins!" << std::endl; std::cout << "aborting..." << std::endl; - return clone(t.f()); + return duplicate(t.f()); } // Compute attribute on nodes. Index: geraud/laurent/classif.cc --- geraud/laurent/classif.cc (revision 3079) +++ geraud/laurent/classif.cc (working copy) @@ -32,7 +32,7 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/routine/clone.hh> +#include <mln/core/routine/duplicate.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_queue_fast.hh> #include <mln/labeling/blobs.hh> @@ -70,7 +70,7 @@ mln_concrete(I) influence_zones(const I& input, const N& nbh) { - mln_concrete(I) output = clone(input); + mln_concrete(I) output = duplicate(input); p_queue_fast<mln_site(I)> q;