https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Update fill, paste, memset_, and memcpy_. * levillain/morpho/lower_completion.hh, * levillain/morpho/shortest_path_watershed.hh, * duhamel/slow_seed2tiling.cc, * duhamel/labeling_algo.cc, * duhamel/level.hh, * duhamel/main.cc, * duhamel/color_sub.cc, * duhamel/chamfer.cc, * duhamel/fills_test.cc, * duhamel/canvas_labeling.hh, * duhamel/level_cpy_from_mln.hh, * duhamel/mem.hh, * duhamel/fill.hh, * duhamel/color_sub.hh, * duhamel/extract_array.cc, * duhamel/chamfer.hh, * duhamel/border_duplicate.hh, * duhamel/border_mirror.hh, * duhamel/draw_mesh.hh, * duhamel/labeling_cpy_from_mln.hh, * duhamel/border_fill.hh, * duhamel/translate_image.cc, * duhamel/log.txt, * duhamel/labeling_level.hh, * duhamel/labeling.hh, * scribo/demat.hh, * aroumougame/skeleton/test.cc, * aroumougame/skeleton/test_image2d.cc, * aroumougame/skeleton/thinning.hh, * aroumougame/skeleton/sedt.hh, * nivault/tests/pouet.cc, * nivault/plugin-gimp/src/build-image.hxx, * nivault/plugin-gimp/src/build-image.hh, * nivault/extract_score.cc, * nivault/extract_character.cc, * jardonnet/test/icp_ref.cc, * jardonnet/test/icp.cc, * jardonnet/test/big_chess.cc, * jardonnet/n_cmpt/tikz.hh, * jardonnet/n_cmpt/nwst.hh, * jardonnet/n_cmpt/fused_filter.cc, * jardonnet/n_cmpt/n_cmpt2.hh, * jardonnet/n_cmpt/n_cmpt3.hh, * jardonnet/n_cmpt/n_cmpt4.hh, * jardonnet/n_cmpt/n_cmpt5.hh, * jardonnet/n_cmpt/ref_filter.cc, * jardonnet/n_cmpt/n_cmpt.hh, * jardonnet/igr/src/igr.cc, * jardonnet/virtual/access.cc, * jardonnet/registration/save.hh, * jardonnet/registration/chamfer.hh, * jardonnet/registration/icp_ref.hh, * jardonnet/registration/registration.hh, * jardonnet/registration/icp.hh, * 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/essai.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/types.hh, * garrigues/fllt/fllt_theo.cc, * garrigues/fllt/test_fllt3.cc, * garrigues/fllt/test_fllt5.cc, * garrigues/fllt/test_fllt7.cc, * garrigues/fllt/compute_level_set_fast2.hh, * garrigues/fllt/test_fllt9.cc, * garrigues/fllt/test_fllt_lena.cc, * garrigues/fllt/test_fllt3_inv.cc, * garrigues/fllt/fllt_optimized.hh, * garrigues/fllt/test_fllt.cc, * garrigues/fllt/debug.hh, * 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/give_confs.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/skeleton.old.hh, * garrigues/ocr/skeleton.hh, * garrigues/ocr/check_simple_point.cc, * garrigues/ocr/compute_local_configurations.cc, * garrigues/ocr/skeleton.old.cc, * garrigues/ocr/simple_point.cc, * garrigues/union_find/reconstructions_on_function.hh, * garrigues/union_find/reconstructions_on_set.hh, * garrigues/union_find/canvas/reconstruction_on_function.hh, * garrigues/union_find/canvas/reconstruction_on_set.hh, * garrigues/union_find/canvas/self_dual_reconstruction.hh, * garrigues/union_find/self_dual_reconstruction.hh, * garrigues/tiled_image2d/tiled_image2d.cc, * garrigues/image_identity/interpolated.cc, * garrigues/factures/extract_array_highlight.cc, * garrigues/factures/extract_array.cc, * garrigues/area_filter_auto_dual.cc, * abraham/tests/core/image/thru_norm.cc, * abraham/tests/core/image/fun_image_norm.cc, * abraham/mln/morpho/najman_wst.hh, * abraham/mln/morpho/basic_najman.hh, * abraham/mln/morpho/autarkical_leveling.hh, * abraham/mln/morpho/topo_wst.hh, * inim/classif/src/max_tree.hh, * inim/classif/src/display.hh, * inim/classif/src/iccvg04.cc, * inim/classif/src/proj.hh, * inim/classif/src/v2.cc, * inim/binarization/proof-of-concept/src/gradient.cc, * ballas/test.cc, * ballas/color/min_tree_volume_filter.cc, * ballas/color/reference.cc, * ballas/color/min_tree_area_filter.cc, * ballas/color/min_tree_height_filter.cc, * ballas/color/min_tree_color.cc, * ballas/color/reference2.cc, * ballas/color/src/graph.hh, * ballas/color/min_tree_color_v2.cc, * ballas/color/laplacien.cc, * nature/nature.cc, * nature/co_occurence.hh, * nature/hom.cc, * nature/proj.hh, * nature/histo_hsi.cc, * geraud/skel.cc, * geraud/wst_edge.cc, * geraud/fllt.svg.6.cc, * geraud/cs2d/cs2d.cc, * geraud/cs2d/tuto.cc, * geraud/cs2d/kruskal.cc, * geraud/cs2d/cs2d_utils.hh, * geraud/fllt/fllt.hh, * geraud/fllt/simple_tests.cc, * geraud/fllt/fllt.svg.1.cc, * geraud/fllt/fllt.svg.7.hh, * geraud/fllt/fllt_tree_to_image.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/connected_filters/area_filter.hh, * geraud/fllt/fllt_test.hh, * geraud/fllt.svg.7.hh, * geraud/Rd/queue_based.hh, * geraud/Rd/union_find.hh, * geraud/Rd/parallel.hh, * geraud/Rd/utils.hh, * geraud/Rd/sequential_bench.hh, * geraud/Rd/sequential.hh, * geraud/Rd/debase.union_find.hh, * geraud/dmap.cc, * geraud/compute_parent_more.hh, * geraud/tufa_2008/steps.0.cc, * geraud/tufa_2008/steps.1.cc, * geraud/tufa_2008/steps.2.cc, * geraud/tufa_2008/steps.3.cc, * geraud/tufa_2008/steps.2b.cc, * geraud/tufa_2008/compute_a.cc, * geraud/tufa_2008/n_cmpt.cc, * geraud/tufa_2008/experiment.cc, * geraud/tufa_2008/filter.cc, * geraud/tufa_2008/fz_count.cc, * geraud/tufa_2008/regmin_count.cc, * geraud/laurent/classif.cc, * vigouroux/yuv/get_blue.hh, * vigouroux/yuv/get_red.hh, * vigouroux/yuv/rgb_to_yuv.hh, * vigouroux/yuv/get_green.hh, * vigouroux/hsi/get_blue.hh, * vigouroux/hsi/get_red.hh, * vigouroux/hsi/rgb_to_hsi.hh, * vigouroux/hsi/get_green.hh, * vigouroux/function.hh, * vigouroux/tests.cc, * vigouroux/cmy/rgb_to_cmy.hh, * vigouroux/cmy/get_blue.hh, * vigouroux/cmy/fun.hh, * vigouroux/cmy/get_green.hh, * vigouroux/xyz/rgb_to_xyz.hh, * vigouroux/xyz/get_blue.hh, * vigouroux/xyz/get_red.hh, * vigouroux/xyz/get_green.hh, * vigouroux/yiq/get_blue.hh, * vigouroux/yiq/get_red.hh, * vigouroux/yiq/rgb_to_yiq.hh, * vigouroux/yiq/get_green.hh, * vigouroux/conv/getred.hh, * vigouroux/conv/tored.hh, * vigouroux/conv/torgb.hh, * vigouroux/conv/rgbto.hh, * vigouroux/color/rgb_to_hsl.hh, * vigouroux/color/rgb_to_cmy.hh, * vigouroux/color/rgb_to_xyz.hh, * vigouroux/color/tests.cc, * vigouroux/color/rgb_to_hsv.hh, * vigouroux/color/rgb_to_yiq.hh, * vigouroux/color/rgb_to_hsi.hh, * vigouroux/color/rgb_to_yuv.hh, * folio/test/psn.cc, * folio/test/psn_log.cc, * folio/test/naive.cc, * folio/test/dt_maze.cc, * folio/test/chamfer.cc, * folio/test/dt_bench.cc, * folio/test/dt.cc, * folio/psn.cc, * folio/psn_log.cc, * folio/naive.cc, * folio/chamfer.cc, * folio/dt.cc (fill, paste, memcpy_, memset_): Update their namespace and inclusion. They are now 'data' routines, no more 'level'. abraham/mln/morpho/autarkical_leveling.hh | 4 - abraham/mln/morpho/basic_najman.hh | 10 ++-- abraham/mln/morpho/najman_wst.hh | 6 +- abraham/mln/morpho/topo_wst.hh | 8 +-- abraham/tests/core/image/fun_image_norm.cc | 4 - abraham/tests/core/image/thru_norm.cc | 4 - aroumougame/skeleton/sedt.hh | 4 - aroumougame/skeleton/test.cc | 8 +-- aroumougame/skeleton/test_image2d.cc | 8 +-- aroumougame/skeleton/thinning.hh | 14 +++--- ballas/color/laplacien.cc | 4 - ballas/color/min_tree_area_filter.cc | 20 ++++----- ballas/color/min_tree_color.cc | 20 ++++----- ballas/color/min_tree_color_v2.cc | 28 ++++++------- ballas/color/min_tree_height_filter.cc | 30 +++++++------- ballas/color/min_tree_volume_filter.cc | 30 +++++++------- ballas/color/reference.cc | 18 ++++---- ballas/color/reference2.cc | 18 ++++---- ballas/color/src/graph.hh | 4 - ballas/test.cc | 26 ++++++------ dalila/demat.hh | 16 +++---- duhamel/border_duplicate.hh | 2 duhamel/border_fill.hh | 2 duhamel/border_mirror.hh | 2 duhamel/canvas_labeling.hh | 4 - duhamel/chamfer.cc | 8 +-- duhamel/chamfer.hh | 6 +- duhamel/color_sub.cc | 2 duhamel/color_sub.hh | 8 +-- duhamel/draw_mesh.hh | 6 +- duhamel/extract_array.cc | 2 duhamel/fill.hh | 4 - duhamel/fills_test.cc | 2 duhamel/labeling.hh | 4 - duhamel/labeling_algo.cc | 4 - duhamel/labeling_cpy_from_mln.hh | 4 - duhamel/labeling_level.hh | 2 duhamel/level.hh | 4 - duhamel/level_cpy_from_mln.hh | 4 - duhamel/log.txt | 8 +-- duhamel/main.cc | 2 duhamel/mem.hh | 2 duhamel/slow_seed2tiling.cc | 2 duhamel/translate_image.cc | 8 +-- folio/chamfer.cc | 4 - folio/dt.cc | 6 +- folio/naive.cc | 4 - folio/psn.cc | 6 +- folio/psn_log.cc | 6 +- folio/test/chamfer.cc | 4 - folio/test/dt.cc | 8 +-- folio/test/dt_bench.cc | 4 - folio/test/dt_maze.cc | 4 - folio/test/naive.cc | 4 - folio/test/psn.cc | 6 +- folio/test/psn_log.cc | 6 +- garrigues/area_filter_auto_dual.cc | 4 - garrigues/factures/extract_array.cc | 2 garrigues/factures/extract_array_highlight.cc | 2 garrigues/fllt/compute_level_set.hh | 8 +-- garrigues/fllt/compute_level_set_fast.hh | 8 +-- garrigues/fllt/compute_level_set_fast2.hh | 8 +-- garrigues/fllt/debug.hh | 12 ++--- garrigues/fllt/essai.cc | 4 - garrigues/fllt/fllt.hh | 2 garrigues/fllt/fllt_optimized.hh | 4 - garrigues/fllt/fllt_simple.cc | 10 ++-- garrigues/fllt/fllt_simple.svg.1.cc | 6 +- garrigues/fllt/fllt_simple.svg.2.cc | 6 +- garrigues/fllt/fllt_simple.svg.3.cc | 10 ++-- garrigues/fllt/fllt_theo.cc | 6 +- garrigues/fllt/give_confs.cc | 4 - garrigues/fllt/test.cc | 4 - 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 | 4 - garrigues/fllt/test_fllt2.cc | 2 garrigues/fllt/test_fllt3.cc | 2 garrigues/fllt/test_fllt3_inv.cc | 2 garrigues/fllt/test_fllt4.cc | 4 - garrigues/fllt/test_fllt5.cc | 4 - garrigues/fllt/test_fllt6.cc | 2 garrigues/fllt/test_fllt7.cc | 4 - garrigues/fllt/test_fllt7_inv.cc | 2 garrigues/fllt/test_fllt8.cc | 4 - garrigues/fllt/test_fllt9.cc | 4 - garrigues/fllt/test_fllt_lena.cc | 4 - garrigues/fllt/test_fllt_lena_tiles.cc | 4 - garrigues/fllt/test_fllt_tiny.cc | 4 - garrigues/fllt/test_flltb.cc | 4 - garrigues/fllt/types.hh | 6 +- garrigues/image_identity/interpolated.cc | 4 - garrigues/level_set.hh | 12 ++--- garrigues/ocr/check_simple_point.cc | 6 +- garrigues/ocr/compute_local_configurations.cc | 4 - garrigues/ocr/simple_point.cc | 4 - garrigues/ocr/skeleton.hh | 6 +- garrigues/ocr/skeleton.old.cc | 4 - garrigues/ocr/skeleton.old.hh | 14 +++--- garrigues/tiled_image2d/tiled_image2d.cc | 2 garrigues/union_find/canvas/reconstruction_on_function.hh | 6 +- garrigues/union_find/canvas/reconstruction_on_set.hh | 4 - garrigues/union_find/canvas/self_dual_reconstruction.hh | 8 +-- garrigues/union_find/reconstructions_on_function.hh | 4 - garrigues/union_find/reconstructions_on_set.hh | 12 ++--- garrigues/union_find/self_dual_reconstruction.hh | 4 - geraud/Rd/debase.union_find.hh | 4 - geraud/Rd/parallel.hh | 2 geraud/Rd/queue_based.hh | 2 geraud/Rd/sequential.hh | 2 geraud/Rd/sequential_bench.hh | 2 geraud/Rd/union_find.hh | 4 - geraud/Rd/utils.hh | 6 +- geraud/compute_parent_more.hh | 4 - geraud/cs2d/cs2d.cc | 18 ++++---- geraud/cs2d/cs2d_utils.hh | 4 - geraud/cs2d/kruskal.cc | 10 ++-- geraud/cs2d/tuto.cc | 20 ++++----- geraud/dmap.cc | 4 - geraud/fllt.svg.6.cc | 22 +++++----- geraud/fllt.svg.7.hh | 10 ++-- geraud/fllt/connected_filters/area_filter.hh | 2 geraud/fllt/fllt.hh | 14 +++--- geraud/fllt/fllt.svg.1.cc | 6 +- geraud/fllt/fllt.svg.2.cc | 6 +- geraud/fllt/fllt.svg.3.cc | 8 +-- geraud/fllt/fllt.svg.4.cc | 14 +++--- geraud/fllt/fllt.svg.5.cc | 14 +++--- geraud/fllt/fllt.svg.6.cc | 22 +++++----- geraud/fllt/fllt.svg.7.hh | 10 ++-- geraud/fllt/fllt_test.hh | 14 +++--- geraud/fllt/fllt_tree_to_image.hh | 2 geraud/fllt/simple_tests.cc | 2 geraud/laurent/classif.cc | 12 ++--- geraud/skel.cc | 6 +- geraud/tufa_2008/compute_a.cc | 16 +++---- geraud/tufa_2008/experiment.cc | 2 geraud/tufa_2008/filter.cc | 4 - geraud/tufa_2008/fz_count.cc | 4 - geraud/tufa_2008/n_cmpt.cc | 6 +- geraud/tufa_2008/regmin_count.cc | 6 +- geraud/tufa_2008/steps.0.cc | 4 - geraud/tufa_2008/steps.1.cc | 4 - geraud/tufa_2008/steps.2.cc | 4 - geraud/tufa_2008/steps.2b.cc | 4 - geraud/tufa_2008/steps.3.cc | 4 - geraud/wst_edge.cc | 18 ++++---- inim/binarization/proof-of-concept/src/gradient.cc | 4 - inim/classif/src/display.hh | 2 inim/classif/src/iccvg04.cc | 4 - inim/classif/src/max_tree.hh | 12 ++--- inim/classif/src/proj.hh | 10 ++-- inim/classif/src/v2.cc | 4 - jardonnet/igr/src/igr.cc | 4 - jardonnet/n_cmpt/fused_filter.cc | 6 +- jardonnet/n_cmpt/n_cmpt.hh | 4 - jardonnet/n_cmpt/n_cmpt2.hh | 4 - jardonnet/n_cmpt/n_cmpt3.hh | 2 jardonnet/n_cmpt/n_cmpt4.hh | 4 - jardonnet/n_cmpt/n_cmpt5.hh | 4 - jardonnet/n_cmpt/nwst.hh | 6 +- jardonnet/n_cmpt/ref_filter.cc | 4 - jardonnet/n_cmpt/tikz.hh | 8 +-- jardonnet/registration/chamfer.hh | 4 - jardonnet/registration/icp.hh | 4 - jardonnet/registration/icp_ref.hh | 4 - jardonnet/registration/registration.hh | 2 jardonnet/registration/save.hh | 2 jardonnet/test/big_chess.cc | 4 - jardonnet/test/icp.cc | 2 jardonnet/test/icp_ref.cc | 2 jardonnet/virtual/access.cc | 4 - levillain/morpho/lower_completion.hh | 4 - levillain/morpho/shortest_path_watershed.hh | 6 +- nature/co_occurence.hh | 4 - nature/histo_hsi.cc | 4 - nature/hom.cc | 2 nature/nature.cc | 4 - nature/proj.hh | 6 +- nivault/extract_character.cc | 8 +-- nivault/extract_score.cc | 6 +- nivault/plugin-gimp/src/build-image.hh | 2 nivault/plugin-gimp/src/build-image.hxx | 2 nivault/tests/pouet.cc | 4 - scribo/demat.hh | 18 ++++---- vigouroux/cmy/fun.hh | 2 vigouroux/cmy/get_blue.hh | 2 vigouroux/cmy/get_green.hh | 2 vigouroux/cmy/rgb_to_cmy.hh | 2 vigouroux/color/rgb_to_cmy.hh | 2 vigouroux/color/rgb_to_hsi.hh | 2 vigouroux/color/rgb_to_hsl.hh | 2 vigouroux/color/rgb_to_hsv.hh | 2 vigouroux/color/rgb_to_xyz.hh | 2 vigouroux/color/rgb_to_yiq.hh | 2 vigouroux/color/rgb_to_yuv.hh | 2 vigouroux/color/tests.cc | 2 vigouroux/conv/getred.hh | 2 vigouroux/conv/rgbto.hh | 2 vigouroux/conv/tored.hh | 2 vigouroux/conv/torgb.hh | 2 vigouroux/function.hh | 2 vigouroux/hsi/get_blue.hh | 2 vigouroux/hsi/get_green.hh | 2 vigouroux/hsi/get_red.hh | 2 vigouroux/hsi/rgb_to_hsi.hh | 2 vigouroux/tests.cc | 2 vigouroux/xyz/get_blue.hh | 2 vigouroux/xyz/get_green.hh | 2 vigouroux/xyz/get_red.hh | 2 vigouroux/xyz/rgb_to_xyz.hh | 2 vigouroux/yiq/get_blue.hh | 2 vigouroux/yiq/get_green.hh | 2 vigouroux/yiq/get_red.hh | 2 vigouroux/yiq/rgb_to_yiq.hh | 2 vigouroux/yuv/get_blue.hh | 2 vigouroux/yuv/get_green.hh | 2 vigouroux/yuv/get_red.hh | 2 vigouroux/yuv/rgb_to_yuv.hh | 2 222 files changed, 634 insertions(+), 634 deletions(-) Index: levillain/morpho/lower_completion.hh --- levillain/morpho/lower_completion.hh (revision 3075) +++ levillain/morpho/lower_completion.hh (working copy) @@ -43,7 +43,7 @@ # include <queue> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> namespace mln { @@ -65,7 +65,7 @@ queue_type q; typename ch_value_type<I, bool>::ret processed(input.size(), input.nbh_get ()); - level::fill (processed, false); + data::fill (processed, false); typedef ntg_cumul_type(DestValue) cumul_type; typename ch_value_type<I, cumul_type>::ret distance(input.size(), Index: levillain/morpho/shortest_path_watershed.hh --- levillain/morpho/shortest_path_watershed.hh (revision 3075) +++ levillain/morpho/shortest_path_watershed.hh (working copy) @@ -43,7 +43,7 @@ # include <queue> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/level/extrema_components.hh> # include <mln/morpho/lower_completion.hh> # include <mln/trait/value_.hh> @@ -97,7 +97,7 @@ // We keep a track of already processed points. typename ch_value_type<I, bool>::ret processed (input.size(), input.nbh_get()); - level::fill (processed, false); + data::fill (processed, false); // Initialize output with the minima components. typename ch_value_type<I, DestValue>::ret output = @@ -107,7 +107,7 @@ typedef ntg_cumul_type(DestValue) cumul_type; typedef typename ch_value_type<I, cumul_type>::ret dist_type; dist_type dist (input.size(), input.nbh_get()); - level::fill(dist, ntg_max_val(DestValue)); + data::fill(dist, ntg_max_val(DestValue)); // Initialize distance with values of minima, and mark these // points as processed (remember that points of INPUT who have // a value greater than ntg_min_val(DestValue) belongs to a Index: duhamel/slow_seed2tiling.cc --- duhamel/slow_seed2tiling.cc (revision 3075) +++ duhamel/slow_seed2tiling.cc (working copy) @@ -35,7 +35,7 @@ # include <mln/core/image/sub_image.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/level/stretch.hh> # include <mln/border/fill.hh> # include <mln/io/pbm/load.hh> Index: duhamel/labeling_algo.cc --- duhamel/labeling_algo.cc (revision 3075) +++ duhamel/labeling_algo.cc (working copy) @@ -34,7 +34,7 @@ # include <mln/core/image/sub_image.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/level/stretch.hh> # include <mln/border/fill.hh> # include <mln/io/pbm/load.hh> @@ -63,7 +63,7 @@ std::vector<int_u8> vec; image2d_b<int> input(in.domain()); - level::fill(input, lab); + data::fill(input, lab); lab(point2d (0,0)) = 0; inte = geom::seeds2tiling(lab, c4 ()); Index: duhamel/level.hh --- duhamel/level.hh (revision 3075) +++ duhamel/level.hh (working copy) @@ -9,7 +9,7 @@ */ # include <mln/labeling/base.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include "labeling.hh" namespace mln @@ -52,7 +52,7 @@ typedef mln_pset(I_) S; const S& s; - void init() { mln::level::fill(this->output, 0); } + void init() { mln::data::fill(this->output, 0); } bool handles(const P& p) const { return input(p) == val; } bool equiv(const P& n, const P&) const { return input(n) == val; } Index: duhamel/main.cc --- duhamel/main.cc (revision 3075) +++ duhamel/main.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/stretch.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: duhamel/color_sub.cc --- duhamel/color_sub.cc (revision 3075) +++ duhamel/color_sub.cc (working copy) @@ -35,7 +35,7 @@ # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/debug/println.hh> # include <mln/core/image2d_b.hh> # include <mln/debug/println.hh> Index: duhamel/chamfer.cc --- duhamel/chamfer.cc (revision 3075) +++ duhamel/chamfer.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/core/image_if_value.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> # include <mln/debug/println.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/core/alias/w_window2d_float.hh> @@ -22,7 +22,7 @@ image2d_b<bool> ima(9, 9); { - level::fill(ima, false); + data::fill(ima, false); opt::at(ima, 4,4) = true; const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 0> (); image2d_b<unsigned> out = geom::chamfer(ima, w_win, max); @@ -30,7 +30,7 @@ } { - level::fill(ima, false); + data::fill(ima, false); opt::at(ima, 4,4) = true; const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 3> (); image2d_b<unsigned> out = geom::chamfer(ima, w_win, max); @@ -38,7 +38,7 @@ } { - level::fill(ima, false); + data::fill(ima, false); opt::at(ima, 4,4) = true; const w_window2d_int& w_win = win_chamfer::mk_chamfer_5x5_int<4, 6, 9> (); image2d_b<unsigned> out = geom::chamfer(ima, w_win, max); Index: duhamel/fills_test.cc --- duhamel/fills_test.cc (revision 3075) +++ duhamel/fills_test.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/geom/nrows.hh> #include <mln/geom/ncols.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println_with_border.hh> Index: duhamel/canvas_labeling.hh --- duhamel/canvas_labeling.hh (revision 3075) +++ duhamel/canvas_labeling.hh (working copy) @@ -34,7 +34,7 @@ * image. */ -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/level/sort_points.hh> # include <mln/convert/to_window.hh> @@ -189,7 +189,7 @@ // init { f.nlabels = 0; - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); f.init(); } // first pass Index: duhamel/level_cpy_from_mln.hh --- duhamel/level_cpy_from_mln.hh (revision 3075) +++ duhamel/level_cpy_from_mln.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/labeling/base.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> namespace mln @@ -78,7 +78,7 @@ typedef mln_pset(I_) S; const S& s; - void init() { mln::level::fill(this->output, 0); } + void init() { mln::data::fill(this->output, 0); } bool handles(const P& p) const { return input(p) == val; } bool equiv(const P& n, const P&) const { return input(n) == val; } Index: duhamel/mem.hh --- duhamel/mem.hh (revision 3075) +++ duhamel/mem.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/geom/nrows.hh> #include <mln/geom/ncols.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println_with_border.hh> Index: duhamel/fill.hh --- duhamel/fill.hh (revision 3075) +++ duhamel/fill.hh (working copy) @@ -5,7 +5,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> -# include <mln/level/memset_.hh> +# include <mln/data/memset_.hh> #include <mln/core/image2d_b.hh> @@ -16,7 +16,7 @@ #include <mln/geom/nrows.hh> #include <mln/geom/ncols.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println_with_border.hh> Index: duhamel/color_sub.hh --- duhamel/color_sub.hh (revision 3075) +++ duhamel/color_sub.hh (working copy) @@ -33,8 +33,8 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image2d_b.hh> #include <mln/value/rgb8.hh> -#include <mln/level/fill.hh> -#include <mln/level/paste.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> #include <mln/trait/image_from_mesh.hh> @@ -49,10 +49,10 @@ const I& input = exact (input_); image2d_b<value::rgb8> output(input.domain().bbox()); - level::fill(output, value::rgb8(255, 0, 0)); + data::fill(output, value::rgb8(255, 0, 0)); // /// FIXME by : -// level::paste(input, output); +// data::paste(input, output); { mln_piter(I) p(input.domain()); Index: duhamel/extract_array.cc --- duhamel/extract_array.cc (revision 3075) +++ duhamel/extract_array.cc (working copy) @@ -42,7 +42,7 @@ # include <mln/win/rectangle2d.hh> # include <mln/win/vline2d.hh> # include <mln/win/hline2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> Index: duhamel/chamfer.hh --- duhamel/chamfer.hh (revision 3075) +++ duhamel/chamfer.hh (working copy) @@ -33,7 +33,7 @@ * \brief Connected component chamfer of the image objects. */ -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/core/alias/w_window2d_float.hh> @@ -76,8 +76,8 @@ unsigned max; void init() { initialize(output, exact(input)); - level::fill((output | (input | true).domain()).rw(), 0); - level::fill((output | (input | false).domain()).rw(), max); } + data::fill((output | (input | true).domain()).rw(), 0); + data::fill((output | (input | false).domain()).rw(), max); } bool handles(const P& p) const { return input(p) == false; } // end of requirements Index: duhamel/border_duplicate.hh --- duhamel/border_duplicate.hh (revision 3075) +++ duhamel/border_duplicate.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/level/memset_.hh> +# include <mln/data/memset_.hh> //# include <mln/core/line_piter.hh> #include <mln/geom/nrows.hh> #include <mln/geom/ncols.hh> Index: duhamel/border_mirror.hh --- duhamel/border_mirror.hh (revision 3075) +++ duhamel/border_mirror.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/internal/fixme.hh> -# include <mln/level/memset_.hh> +# include <mln/data/memset_.hh> //# include <mln/core/line_piter.hh> #include <mln/geom/nrows.hh> #include <mln/geom/ncols.hh> Index: duhamel/draw_mesh.hh --- duhamel/draw_mesh.hh (revision 3075) +++ duhamel/draw_mesh.hh (working copy) @@ -4,7 +4,7 @@ # include <mln/pw/image.hh> # include <mln/core/image2d_b.hh> # include <mln/core/alias/point2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/draw/line.hh> # include <mln/core/mesh_p.hh> # include <mln/core/mesh_image.hh> @@ -206,7 +206,7 @@ mln_value(I) node_v, mln_value(I) link_v) { - level::fill(ima, 0); + data::fill(ima, 0); for (unsigned i = 0; i < m.gr_.nb_link_; ++i) line (exact(ima), @@ -222,7 +222,7 @@ void mesh(Image<I>& ima, const mesh_image<P, V>& mesh) { - level::fill(ima, 0); + data::fill(ima, 0); for (unsigned i = 0; i < mesh.domain().gr_.nb_link_; ++i) line (exact(ima), Index: duhamel/labeling_cpy_from_mln.hh --- duhamel/labeling_cpy_from_mln.hh (revision 3075) +++ duhamel/labeling_cpy_from_mln.hh (working copy) @@ -34,7 +34,7 @@ * image. */ -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/level/sort_points.hh> # include <mln/convert/to_window.hh> @@ -75,7 +75,7 @@ // init { f.nlabels = 0; - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); f.init(); } // first pass Index: duhamel/border_fill.hh --- duhamel/border_fill.hh (revision 3075) +++ duhamel/border_fill.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/internal/fixme.hh> # include <mln/core/line_piter.hh> -# include <mln/level/memset_.hh> +# include <mln/data/memset_.hh> namespace mln { Index: duhamel/translate_image.cc --- duhamel/translate_image.cc (revision 3075) +++ duhamel/translate_image.cc (working copy) @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> -#include <mln/level/fill.hh> -#include <mln/level/paste.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> #include <mln/border/fill.hh> #include <mln/debug/println_with_border.hh> #include <mln/debug/println.hh> @@ -34,8 +34,8 @@ std::cout << std::endl; I out (4,4); - level::paste(ima, out); - level::paste(tmp, out); + data::paste(ima, out); + data::paste(tmp, out); std::cout << "pasted image :" << std::endl; debug::println (out); Index: duhamel/log.txt --- duhamel/log.txt (revision 3075) +++ duhamel/log.txt (working copy) @@ -1,7 +1,7 @@ -- level/memset_ -- level/memcpy_ -- level/fill -- level/paste +- data/memset_ +- data/memcpy_ +- data/fill +- data/paste - border/fill - border/mirror Index: duhamel/labeling_level.hh --- duhamel/labeling_level.hh (revision 3075) +++ duhamel/labeling_level.hh (working copy) @@ -182,7 +182,7 @@ // typedef mln_pset(I_) S; // const S& s; - void init() { level::fill(this->output, 0); } + void init() { data::fill(this->output, 0); } bool handles(unsigned p) const { return this->input[p] == val; } bool equiv(unsigned n, unsigned) const { return this->input[n] == val; } Index: duhamel/labeling.hh --- duhamel/labeling.hh (revision 3075) +++ duhamel/labeling.hh (working copy) @@ -7,7 +7,7 @@ * image. */ -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include "fill.hh" # include <mln/level/sort_points.hh> @@ -53,7 +53,7 @@ { f.nlabels = 0; // fill_opt2 (deja_vu, false); -// mln::level::fill(deja_vu, false); +// mln::data::fill(deja_vu, false); f.init(); } // first pass Index: scribo/demat.hh --- scribo/demat.hh (revision 3075) +++ scribo/demat.hh (working copy) @@ -201,15 +201,15 @@ TessBaseAPI::InitWithLanguage(NULL, NULL, "fra", NULL, false, 0, NULL); image2d<char> txt(in.domain()); - level::fill(txt, ' '); + data::fill(txt, ' '); for_all_components(i, tboxes) { if (tboxes[i].is_valid()) { image2d<bool> b(tboxes[i], 0); - level::fill(b, false); - level::fill((b | (pw::value(lbl) == pw::cst(i))).rw(), true); + data::fill(b, false); + data::fill((b | (pw::value(lbl) == pw::cst(i))).rw(), true); char* s = TessBaseAPI::TesseractRect( (unsigned char*) b.buffer(), @@ -335,7 +335,7 @@ unsigned dim_size) { image1d<int> l(dim_size); - level::fill(l, -1); + data::fill(l, -1); for_all_elements(i, aligned_lines) opt::at(l, aligned_lines[i]) = i; @@ -376,7 +376,7 @@ image2d<bool> res; initialize(res, in); - level::fill(res, false); + data::fill(res, false); for_all_components(i, tblboxes.first) draw::box(res, tblboxes.first[i], true); for_all_components(i, tblboxes.second) @@ -384,7 +384,7 @@ # ifndef NOUT image2d<rgb8> out(in.domain()); - level::fill(out, literal::black); + data::fill(out, literal::black); for_all_components(i, tblboxes.first) draw::box(out, tblboxes.first[i], literal::red); for_all_components(i, tblboxes.second) @@ -463,7 +463,7 @@ { boxes[i].enlarge(dim, settings.bbox_enlarge); boxes[i].crop_wrt(output.domain()); - level::paste((pw::cst(false) | boxes[i] | + data::paste((pw::cst(false) | boxes[i] | (pw::value(output) == pw::cst(true))), output); } } @@ -704,7 +704,7 @@ for_all_ncomponents(i, nlabels) if (tboxes[i].is_valid()) if (comp_size.treated[i] < 3) - level::fill((lbl2 | (tboxes[i].to_result() | (pw::value(lbl2) == pw::cst(i)))).rw(), 0u); + data::fill((lbl2 | (tboxes[i].to_result() | (pw::value(lbl2) == pw::cst(i)))).rw(), 0u); save_lbl_image(lbl2, nlabels, "lbl-grouped-boxes-cleaned.ppm"); #endif @@ -818,7 +818,7 @@ for_all_elements(i, tboxes) if (tboxes[i].is_valid()) - level::paste(pw::cst(color(tboxes[i].center())) | (tboxes[i] | pw::value(in) == pw::cst(true)), + data::paste(pw::cst(color(tboxes[i].center())) | (tboxes[i] | pw::value(in) == pw::cst(true)), dbg); io::ppm::save(dbg, output_file("text2cell.ppm")); # endif Index: aroumougame/skeleton/test.cc --- aroumougame/skeleton/test.cc (revision 3075) +++ aroumougame/skeleton/test.cc (working copy) @@ -1,8 +1,8 @@ #include <mln/core/alias/point3d.hh> #include <mln/core/alias/point2d.hh> #include "thinning.hh" -#include <mln/level/paste.hh> -#include <mln/level/fill.hh> +#include <mln/data/paste.hh> +#include <mln/data/fill.hh> #include <mln/core/image/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> @@ -79,9 +79,9 @@ // /* sub_image<I, S> skeleton = pic | X; I output(pic.domain()); - level::fill(output, false); + data::fill(output, false); - level::paste(skeleton, output);*/ + data::paste(skeleton, output);*/ // bis = DiscreteBisector(dt, Y, c4(), rmax); // Index: aroumougame/skeleton/test_image2d.cc --- aroumougame/skeleton/test_image2d.cc (revision 3075) +++ aroumougame/skeleton/test_image2d.cc (working copy) @@ -3,8 +3,8 @@ #include <mln/core/image/sub_image.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> -#include <mln/level/paste.hh> -#include <mln/level/fill.hh> +#include <mln/data/paste.hh> +#include <mln/data/fill.hh> int main() { @@ -39,9 +39,9 @@ sub_image<I, S> skeleton = pic | X; I output(pic.domain()); - level::fill(output, false); + data::fill(output, false); - level::paste(skeleton, output); + data::paste(skeleton, output); mln::io::pbm::save(output, "skeleton2.pbm"); std::cout << "image saved" << std::endl; Index: aroumougame/skeleton/thinning.hh --- aroumougame/skeleton/thinning.hh (revision 3075) +++ aroumougame/skeleton/thinning.hh (working copy) @@ -730,7 +730,7 @@ p_set<point2d> proj; image2d<value::int_u8> bisector(h, w); - level::fill(bisector, 0); + data::fill(bisector, 0); for(uint i=0; i<Y.nsites(); i++) { @@ -871,9 +871,9 @@ sub_image<I, S> es = pic | Z; I es1(pic.domain()); - level::fill(es1, false); + data::fill(es1, false); - level::paste(es, es1); + data::paste(es, es1); mln::io::pbm::save(es1, "euclidean.pbm"); @@ -906,9 +906,9 @@ sub_image<I, S> skel = pic | Y; I test(pic.domain()); - level::fill(test, false); + data::fill(test, false); - level::paste(skel, test); + data::paste(skel, test); mln::io::pbm::save(test, "Y.pbm"); @@ -919,9 +919,9 @@ sub_image<I, S> skeleton = pic | Z; I output(pic.domain()); - level::fill(output, false); + data::fill(output, false); - level::paste(skeleton, output); + data::paste(skeleton, output); return output; } Index: aroumougame/skeleton/sedt.hh --- aroumougame/skeleton/sedt.hh (revision 3075) +++ aroumougame/skeleton/sedt.hh (working copy) @@ -9,8 +9,8 @@ #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> -#include <mln/level/paste.hh> -#include <mln/level/fill.hh> +#include <mln/data/paste.hh> +#include <mln/data/fill.hh> #include <mln/geom/max_row.hh> #include <mln/geom/max_col.hh> #include <mln/geom/max_ind.hh> Index: nivault/tests/pouet.cc --- nivault/tests/pouet.cc (revision 3075) +++ nivault/tests/pouet.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/value/int_u8.hh> #include <mln/core/image2d_b.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <iostream> @@ -44,6 +44,6 @@ image2d_b<value::int_u8> out(lena.domain()); erosion_on_function(lena, h, out); - //level::paste(lena, out); + //data::paste(lena, out); io::pgm::save(out, "out.pgm"); } Index: nivault/plugin-gimp/src/build-image.hxx --- nivault/plugin-gimp/src/build-image.hxx (revision 3075) +++ nivault/plugin-gimp/src/build-image.hxx (working copy) @@ -59,7 +59,7 @@ std::cout << p1 << " : " << ima(p1) << std::endl; std::cout << p2 << " : " << ima(p2) << std::endl; std::cout << p3 << " : " << ima(p3) << std::endl; -// mln::level::fill(ima, mln::literal::blue); +// mln::data::fill(ima, mln::literal::blue); toto fun; mln::image2d<mln::value::rgb8> tmp2(ima.domain()); Index: nivault/plugin-gimp/src/build-image.hh --- nivault/plugin-gimp/src/build-image.hh (revision 3075) +++ nivault/plugin-gimp/src/build-image.hh (working copy) @@ -33,7 +33,7 @@ # include <src/gimp-image.hh> # include <mln/core/alias/point2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/literal/all.hh> Index: nivault/extract_score.cc --- nivault/extract_score.cc (revision 3075) +++ nivault/extract_score.cc (working copy) @@ -47,7 +47,7 @@ # include <mln/win/vline2d.hh> # include <mln/win/hline2d.hh> # include <mln/win/disk2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/labeling/blobs.hh> # include <mln/core/alias/neighb2d.hh> @@ -68,7 +68,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/sub_image.hh> -# include <mln/level/paste.hh> +# include <mln/data/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> # include <mln/morpho/opening_area.hh> @@ -148,7 +148,7 @@ IU projected(smb); IU8 projected_stretched(smb); - level::fill(projected, literal::zero); + data::fill(projected, literal::zero); mln_piter_(IB) p(ima.domain()); Index: nivault/extract_character.cc --- nivault/extract_character.cc (revision 3075) +++ nivault/extract_character.cc (working copy) @@ -46,7 +46,7 @@ # include <mln/win/vline2d.hh> # include <mln/win/hline2d.hh> # include <mln/win/disk2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/labeling/blobs.hh> # include <mln/core/alias/neighb2d.hh> @@ -65,7 +65,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/sub_image.hh> -# include <mln/level/paste.hh> +# include <mln/data/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> # include <mln/morpho/opening_area.hh> @@ -292,7 +292,7 @@ text_image(p) = val_image(p); // Here is the good way to do the previous action. -// level::paste (val_ima, text_image); +// data::paste (val_ima, text_image); } } @@ -314,7 +314,7 @@ // win::disk2d win (20); // I_LABEL pr = morpho::dilation(gr_image2, win); // I bool_ima (label_image.domain ()); -// level::paste(pr, bool_ima); +// data::paste(pr, bool_ima); // // Labeling the dilated image. // unsigned nb_dilated_node_labels; Index: jardonnet/test/icp_ref.cc --- jardonnet/test/icp_ref.cc (revision 3075) +++ jardonnet/test/icp_ref.cc (working copy) @@ -75,7 +75,7 @@ qk.apply_on(c, c, c.nsites()); image2d<value::rgb8> output(convert::to_box2d(working_box), 1); - level::fill(output, literal::white); + data::fill(output, literal::white); /* FIXME: remove or plot mu_Ck and mu_Xk //plot mu_Ck Index: jardonnet/test/icp.cc --- jardonnet/test/icp.cc (revision 3075) +++ jardonnet/test/icp.cc (working copy) @@ -84,7 +84,7 @@ //init output image image2d<value::rgb8> output(convert::to_box2d(working_box), 0); - level::fill(output, literal::white); + data::fill(output, literal::white); //print x Index: jardonnet/test/big_chess.cc --- jardonnet/test/big_chess.cc (revision 3075) +++ jardonnet/test/big_chess.cc (working copy) @@ -10,7 +10,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> #include <mln/io/pgm/load.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> @@ -70,7 +70,7 @@ debug::println(visio); - level::paste(visio, ima2); + data::paste(visio, ima2); io::ppm::save(ima2, "out.ppm"); } Index: jardonnet/n_cmpt/tikz.hh --- jardonnet/n_cmpt/tikz.hh (revision 3075) +++ jardonnet/n_cmpt/tikz.hh (working copy) @@ -43,7 +43,7 @@ # include <mln/morpho/tree/data.hh> # include <mln/morpho/tree/compute_attribute_image.hh> -# include <mln/level/paste.hh> +# include <mln/data/paste.hh> #include <mln/level/transform.hh> namespace mln @@ -115,7 +115,7 @@ morpho::tree::data<I,S> t(ima, sp, nbh); V volume(ima.domain()); - level::paste(morpho::tree::compute_attribute_image(A(), t), + data::paste(morpho::tree::compute_attribute_image(A(), t), volume); sp = level::sort_psites_increasing(volume); @@ -147,7 +147,7 @@ // init fused image mln_ch_value(I, bool) fused; initialize(fused, volume); - mln::level::fill(fused, false); + mln::data::fill(fused, false); // prepare union find typedef mln_psite(V) P; @@ -157,7 +157,7 @@ //deja_vu mln_ch_value(V, bool) deja_vu(volume.domain()); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); //parent mln_ch_value(V, P) parent(volume.domain()); Index: jardonnet/n_cmpt/nwst.hh --- jardonnet/n_cmpt/nwst.hh (revision 3075) +++ jardonnet/n_cmpt/nwst.hh (working copy) @@ -85,7 +85,7 @@ // init watershed image mln_ch_value(I, value::rgb8) wst(ima.domain()); - mln::level::fill(wst, literal::black); + mln::data::fill(wst, literal::black); // number of minima unsigned cmpts = label; @@ -97,10 +97,10 @@ // fused mln_ch_value(I, bool) fused; initialize(fused, ima); - mln::level::fill(fused, false); + mln::data::fill(fused, false); // deja_vu mln_ch_value(I, bool) deja_vu(ima.domain()); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); //parent mln_ch_value(I, P) parent(ima.domain()); { Index: jardonnet/n_cmpt/fused_filter.cc --- jardonnet/n_cmpt/fused_filter.cc (revision 3075) +++ jardonnet/n_cmpt/fused_filter.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/iota.hh> @@ -73,7 +73,7 @@ // init fused image mln_ch_value(I, bool) fused; initialize(fused, a); - mln::level::fill(fused, false); + mln::data::fill(fused, false); // iota mln_ch_value(I,value::int_u<16>) iota(a.domain()); @@ -94,7 +94,7 @@ // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); if (n_objects >= nbassins) Index: jardonnet/n_cmpt/n_cmpt2.hh --- jardonnet/n_cmpt/n_cmpt2.hh (revision 3075) +++ jardonnet/n_cmpt/n_cmpt2.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_N_CMPT2_HH # define MLN_N_CMPT2_HH -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/core/site_set/p_vaccess.hh> # include <mln/level/sort_psites.hh> # include <mln/accu/volume.hh> @@ -105,7 +105,7 @@ // init mln_ch_value(O, A) data; initialize(data, input); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); { mln_fwd_piter(S) p(sp); for_all(p) Index: jardonnet/n_cmpt/n_cmpt3.hh --- jardonnet/n_cmpt/n_cmpt3.hh (revision 3075) +++ jardonnet/n_cmpt/n_cmpt3.hh (working copy) @@ -111,7 +111,7 @@ mln_ch_value(V, accu::volume<V>) data(volume.domain()); //deja_vu mln_ch_value(V, bool) deja_vu(volume.domain()); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); //parent mln_ch_value(V, P) parent(volume.domain()); { Index: jardonnet/n_cmpt/n_cmpt4.hh --- jardonnet/n_cmpt/n_cmpt4.hh (revision 3075) +++ jardonnet/n_cmpt/n_cmpt4.hh (working copy) @@ -98,7 +98,7 @@ mln_ch_value(I, bool) fused; initialize(fused, volume); - mln::level::fill(fused, false); + mln::data::fill(fused, false); // number of minima unsigned cmpts = label; @@ -112,7 +112,7 @@ mln_ch_value(V, accu::volume<V>) data(volume.domain()); //deja_vu mln_ch_value(V, bool) deja_vu(volume.domain()); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); //parent mln_ch_value(V, P) parent(volume.domain()); { Index: jardonnet/n_cmpt/n_cmpt5.hh --- jardonnet/n_cmpt/n_cmpt5.hh (revision 3075) +++ jardonnet/n_cmpt/n_cmpt5.hh (working copy) @@ -111,7 +111,7 @@ // init fused image mln_ch_value(I, bool) fused; initialize(fused, volume); - mln::level::fill(fused, false); + mln::data::fill(fused, false); // prepare union find typedef mln_psite(V) P; @@ -121,7 +121,7 @@ //deja_vu mln_ch_value(V, bool) deja_vu(volume.domain()); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); //parent mln_ch_value(V, P) parent(volume.domain()); Index: jardonnet/n_cmpt/ref_filter.cc --- jardonnet/n_cmpt/ref_filter.cc (revision 3075) +++ jardonnet/n_cmpt/ref_filter.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> @@ -77,7 +77,7 @@ // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); // labels mln_ch_value(I, unsigned) regmin = labeling::regional_minima(a, nbh, Index: jardonnet/n_cmpt/n_cmpt.hh --- jardonnet/n_cmpt/n_cmpt.hh (revision 3075) +++ jardonnet/n_cmpt/n_cmpt.hh (working copy) @@ -30,7 +30,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/util/pix.hh> # include <mln/level/sort_psites.hh> # include <mln/accu/count.hh> @@ -107,7 +107,7 @@ // init mln_ch_value(O, A) data; initialize(data, input); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); { mln_fwd_piter(S) p(s); for_all(p) Index: jardonnet/igr/src/igr.cc --- jardonnet/igr/src/igr.cc (revision 3075) +++ jardonnet/igr/src/igr.cc (working copy) @@ -16,7 +16,7 @@ #include <mln/io/ppm/save.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <mln/level/apply.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> @@ -56,7 +56,7 @@ //FIXME: fix and use alexandre stuff /* thru<to_hsi, image2d<hsi_f> > tmp(hsi_f); image2d<int_u8> g_ima; - level::paste(tmp, g_ima);*/ + data::paste(tmp, g_ima);*/ image2d<int_u8> g_ima(ima.domain()); mln_piter_(image2d<rgb8>) p(g_ima.domain()); Index: jardonnet/virtual/access.cc --- jardonnet/virtual/access.cc (revision 3075) +++ jardonnet/virtual/access.cc (working copy) @@ -13,7 +13,7 @@ #include <mln/core/image/interpolated.hh> #include <mln/core/image/tr_image.hh> #include <mln/core/var.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> template < template <class> class N, typename I, typename T> @@ -84,7 +84,7 @@ mln_VAR(rt, compose(r,t)); mln_VAR(tr_ima, transposed_image(interp.domain(), interp, rt)); - // level::fill(output, tr_ima); + // data::fill(output, tr_ima); //border::adjust(interp, 20); Index: jardonnet/registration/save.hh --- jardonnet/registration/save.hh (revision 3075) +++ jardonnet/registration/save.hh (working copy) @@ -57,7 +57,7 @@ const box_<P> working_box = enlarge(bigger(ck.bbox(),x.bbox()),5); image2d<value::rgb8> out(convert::to_box2d(working_box), 1); - level::fill(out, literal::white); + data::fill(out, literal::white); //plot mu_Ck algebra::vec<P::dim,float> mu_Ck = geom::center(ck); Index: jardonnet/registration/chamfer.hh --- jardonnet/registration/chamfer.hh (revision 3075) +++ jardonnet/registration/chamfer.hh (working copy) @@ -159,7 +159,7 @@ // #include <mln/debug/println.hh> // #include <mln/core/image/image2d.hh> // #include <mln/make/win_chamfer.hh> -// #include <mln/level/fill.hh> +// #include <mln/data/fill.hh> // int main() // { @@ -175,7 +175,7 @@ // 0, 0, 0, 0, 0, // 0, 0, 0, 0, 0 }; -// level::fill(ima, vals); +// data::fill(ima, vals); // debug::println(ima); // std::pair<image2d<int>, image2d<mln_point_(image2d<bool>)> > Index: jardonnet/registration/icp_ref.hh --- jardonnet/registration/icp_ref.hh (revision 3075) +++ jardonnet/registration/icp_ref.hh (working copy) @@ -44,7 +44,7 @@ # include <mln/value/rgb8.hh> # include <mln/literal/all.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/ppm/save.hh> # include "tools.hh" @@ -178,7 +178,7 @@ #ifndef NDEBUG // FIXME: theo image2d<value::rgb8> tmp(500,800); - level::fill(tmp, literal::black); + data::fill(tmp, literal::black); //write X mln_piter(p_array<P>) p(x); for_all(p) Index: jardonnet/registration/registration.hh --- jardonnet/registration/registration.hh (revision 3075) +++ jardonnet/registration/registration.hh (working copy) @@ -44,7 +44,7 @@ # include <mln/value/rgb8.hh> # include <mln/literal/colors.hh> # include <mln/literal/black.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/ppm/save.hh> # include "tools.hh" Index: jardonnet/registration/icp.hh --- jardonnet/registration/icp.hh (revision 3075) +++ jardonnet/registration/icp.hh (working copy) @@ -45,7 +45,7 @@ # include <mln/value/rgb8.hh> # include <mln/literal/colors.hh> # include <mln/literal/black.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/ppm/save.hh> @@ -184,7 +184,7 @@ #ifndef NDEBUG // FIXME: theo const box<P> working_box = enlarge(bigger(geom::bbox(cloud),geom::bbox(x)),5); image2d<value::rgb8> tmp(convert::to_box2d(working_box), 1); - level::fill(tmp, literal::black); + data::fill(tmp, literal::black); //write X mln_piter(p_array<P>) p(x); for_all(p) Index: dalila/demat.hh --- dalila/demat.hh (revision 3075) +++ dalila/demat.hh (working copy) @@ -72,8 +72,8 @@ # include <mln/level/convert.hh> # include <mln/level/compute.hh> -# include <mln/level/fill.hh> -# include <mln/level/paste.hh> +# include <mln/data/fill.hh> +# include <mln/data/paste.hh> # include <mln/level/apply.hh> # include <mln/level/transform.hh> @@ -194,10 +194,10 @@ vend(in.nrows()), vcol(in.ncols()); - level::fill(hend, 0); - level::fill(hrow, 0); - level::fill(vend, 0); - level::fill(vcol, 0); + data::fill(hend, 0); + data::fill(hrow, 0); + data::fill(vend, 0); + data::fill(vcol, 0); for (unsigned i = 1; i < tboxes.first.nelements(); ++i) { @@ -215,7 +215,7 @@ #ifndef NOUT image2d<rgb8> tmp(in.domain()); - level::fill(tmp, literal::black); + data::fill(tmp, literal::black); for (unsigned i = 1; i < in.ncols(); ++i) { @@ -272,7 +272,7 @@ { boxes[i].enlarge(dim, bbox_enlarge + 1); boxes[i].crop_wrt(output.domain()); - level::paste((pw::cst(false) | boxes[i] | + data::paste((pw::cst(false) | boxes[i] | (pw::value(output) == pw::cst(true))), output); } } Index: garrigues/level_set.hh --- garrigues/level_set.hh (revision 3075) +++ garrigues/level_set.hh (working copy) @@ -61,7 +61,7 @@ # include <mln/border/fill.hh> # include <mln/level/compute.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/accu/min.hh> # include <mln/accu/max.hh> @@ -125,8 +125,8 @@ N.clear(); A.clear(); - level::fill(regions, 0); - level::fill(tagged, false); + data::fill(regions, 0); + data::fill(tagged, false); u = clone(input); border::fill(u, 0); @@ -150,7 +150,7 @@ // // FIXME : debug. // { // image2d<bool> d(make::box2d(-1, -1, 1, 1)); -// level::fill(d, 0); +// data::fill(d, 0); // mln_fwd_niter(clock_neighb2d) n(nbh , p); // mln_fwd_niter(clock_neighb2d) dn(nbh , point2d(0, 0)); // for_all_2(n, dn) @@ -261,7 +261,7 @@ env.A.insert(env.x0); // R <- {} env.R.clear(); - level::fill(env.shape, false); + data::fill(env.shape, false); border::fill(env.shape, true); env.n_cc = 0; // N <- {} @@ -342,7 +342,7 @@ // Count the number of conected components of the border of R. static image2d<int> tmp(env.u.domain().to_larger(1)); static image2d<bool> border_ima(tmp.domain()); - level::fill(border_ima, false); + data::fill(border_ima, false); mln_piter(p_set<P>) z(env.N); for_all(z) Index: garrigues/fllt/test_fllt_lena_tiles.cc --- garrigues/fllt/test_fllt_lena_tiles.cc (revision 3075) +++ garrigues/fllt/test_fllt_lena_tiles.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> # include <sstream> @@ -25,7 +25,7 @@ std::cout << path.str () << std::endl; image2d<value::int_u8> ima = io::pgm::load(path.str()); image2d<int> ima_int(ima.domain()); - level::fill(ima_int, ima); + data::fill(ima_int, ima); fllt::fllt(ima_int); } } Index: garrigues/fllt/test_fllt10.cc --- garrigues/fllt/test_fllt10.cc (revision 3075) +++ garrigues/fllt/test_fllt10.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> Index: garrigues/fllt/test_fllt_tiny.cc --- garrigues/fllt/test_fllt_tiny.cc (revision 3075) +++ garrigues/fllt/test_fllt_tiny.cc (working copy) @@ -2,7 +2,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/routine/clone.hh> # include <mln/value/int_u8.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> int main() @@ -14,6 +14,6 @@ image2d<int> ima_int(ima.domain()); - level::fill(ima_int, ima); + data::fill(ima_int, ima); fllt::fllt(ima_int); } Index: garrigues/fllt/test_fllt12.cc --- garrigues/fllt/test_fllt12.cc (revision 3075) +++ garrigues/fllt/test_fllt12.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> Index: garrigues/fllt/essai.cc --- garrigues/fllt/essai.cc (revision 3075) +++ garrigues/fllt/essai.cc (working copy) @@ -5,7 +5,7 @@ #include <mln/core/image_if_value.hh> #include <mln/accu/bbox.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include "types.hh" @@ -21,7 +21,7 @@ // : ima_(b) // { // bb_.init(); -// level::fill(ima_, false); +// data::fill(ima_, false); // bb_.take(point2d(2,2)); // bb_.take(point2d(2,3)); // } Index: garrigues/fllt/fllt_simple.svg.1.cc --- garrigues/fllt/fllt_simple.svg.1.cc (revision 3075) +++ garrigues/fllt/fllt_simple.svg.1.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> @@ -164,7 +164,7 @@ unsigned n_step_1 = 0, n_step_3 = 0; - level::fill(tagged, false); + data::fill(tagged, false); mln_piter(I) min(input.domain()); min.start(); // Step 1. @@ -192,7 +192,7 @@ std::cout << "Step 2" << std::endl; #endif if (N_box.is_valid()) - level::fill((is | N_box.to_result()).rw(), in_O); + data::fill((is | N_box.to_result()).rw(), in_O); N_box.init(); R_box.init(); Index: garrigues/fllt/fllt_simple.svg.3.cc --- garrigues/fllt/fllt_simple.svg.3.cc (revision 3075) +++ garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -204,7 +204,7 @@ unsigned limit) { fllt_branch_iter_ind(P, V) p(tree.main_branch()); - level::fill(output, 255); + data::fill(output, 255); for_all(p) { if ((*p).elt().nsites > limit) @@ -350,7 +350,7 @@ unsigned cc_cpt = 0; bool parent_found = false; - level::fill(tagged, false); + data::fill(tagged, false); mln_piter(I) min(input.domain()); min.start(); // Step 1. @@ -387,7 +387,7 @@ std::cout << "Step 2" << std::endl; #endif if (N_box.is_valid()) - level::fill((is | N_box.to_result()).rw(), in_O); + data::fill((is | N_box.to_result()).rw(), in_O); N_box.init(); R_box.init(); @@ -591,7 +591,7 @@ image2d<int> ima_(make::image2d(vs)); image2d<int_u8> ima(ima_.domain()); - level::fill(ima, ima_); + data::fill(ima, ima_); tree_type tree = my::fllt(ima); Index: garrigues/fllt/fllt_simple.cc --- garrigues/fllt/fllt_simple.cc (revision 3075) +++ garrigues/fllt/fllt_simple.cc (working copy) @@ -45,7 +45,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -343,7 +343,7 @@ unsigned limit) { fllt_branch_iter_ind(P, V) p(tree.main_branch()); - level::fill(output, 255); + data::fill(output, 255); for_all(p) { if ((*p).elt().nsites > limit) @@ -468,7 +468,7 @@ unsigned cc_cpt = 0; bool parent_found = false; - level::fill(tagged, false); + data::fill(tagged, false); mln_piter(I) min(input.domain()); min.start(); // Step 1. @@ -505,7 +505,7 @@ std::cout << "Step 2" << std::endl; #endif if (N_box.is_valid()) - level::fill((is | N_box.to_result()).rw(), in_O); + data::fill((is | N_box.to_result()).rw(), in_O); N_box.init(); R_box.init(); @@ -709,7 +709,7 @@ // image2d<int> ima_(make::image2d(vs)); // image2d<int_u8> ima(ima_.domain()); -// level::fill(ima, ima_); +// data::fill(ima, ima_); tree_type tree = my::fllt(ima); Index: garrigues/fllt/test_fllt10_inv.cc --- garrigues/fllt/test_fllt10_inv.cc (revision 3075) +++ garrigues/fllt/test_fllt10_inv.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> Index: garrigues/fllt/types.hh --- garrigues/fllt/types.hh (revision 3075) +++ garrigues/fllt/types.hh (working copy) @@ -117,7 +117,7 @@ bb_.init(); nsites_ = 0; - level::fill(ima_, false); + data::fill(ima_, false); } template <char domain> @@ -165,11 +165,11 @@ // mln_line_piter_(image2d<value::int_u8>) p(bb_.to_result()); // for_all(p) // { - // level::memset_(ima_, p, false, bb_ncols); + // data::memset_(ima_, p, false, bb_ncols); // } // } // else - level::fill(ima_, false); + data::fill(ima_, false); nsites_ = 0; bb_.init(); Index: garrigues/fllt/fllt_theo.cc --- garrigues/fllt/fllt_theo.cc (revision 3075) +++ garrigues/fllt/fllt_theo.cc (working copy) @@ -39,7 +39,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> @@ -112,7 +112,7 @@ accu::bbox<mln_point(I)> R_box; - level::fill(tagged, false); + data::fill(tagged, false); mln_piter(I) min(input.domain()); min.start(); // Step 1. @@ -146,7 +146,7 @@ std::cout << "Step 2" << std::endl; #endif R_box.init(); - level::fill(is, in_O); + data::fill(is, in_O); A.clear(); A.append(x0); for (unsigned i = 0; i < 256; ++i) Index: garrigues/fllt/test_fllt3.cc --- garrigues/fllt/test_fllt3.cc (revision 3075) +++ garrigues/fllt/test_fllt3.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> Index: garrigues/fllt/test_fllt5.cc --- garrigues/fllt/test_fllt5.cc (revision 3075) +++ garrigues/fllt/test_fllt5.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> @@ -34,7 +34,7 @@ // image2d<int> ima_int(ima.domain()); -// level::fill(ima_int, ima); +// data::fill(ima_int, ima); // debug::println(ima); // fllt::fllt(ima_int); } Index: garrigues/fllt/test_fllt7.cc --- garrigues/fllt/test_fllt7.cc (revision 3075) +++ garrigues/fllt/test_fllt7.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> @@ -37,7 +37,7 @@ image2d<int> ima(make::image2d(vs)); image2d<int_u8> out(ima.domain()); - level::fill(out, ima); + data::fill(out, ima); io::pgm::save(out, "ima.pgm "); fllt::fllt(ima); Index: garrigues/fllt/compute_level_set_fast2.hh --- garrigues/fllt/compute_level_set_fast2.hh (revision 3075) +++ garrigues/fllt/compute_level_set_fast2.hh (working copy) @@ -242,9 +242,9 @@ // // Count the number of conected components of the border of R. // static image2d<unsigned> tmp(u.domain().to_larger(1)); // static image2d<bool> border_ima(tmp.domain()); -// level::fill(border_ima, false); +// data::fill(border_ima, false); -// // level::fill((border_ima | N).rw(), true); +// // data::fill((border_ima | N).rw(), true); // // std::cout << "tmp border = " << tmp.border () << std::endl; // // std::cout << "ima border = " << border_ima.border () << std::endl; // mln_piter(p_image2d<P>) z(N); @@ -374,8 +374,8 @@ gn = 0; current_region = 0; - level::fill(regions, 0); - level::fill(tagged, false); + data::fill(regions, 0); + data::fill(tagged, false); // Get the locals extremums unsigned nlabels; Index: garrigues/fllt/test_fllt9.cc --- garrigues/fllt/test_fllt9.cc (revision 3075) +++ garrigues/fllt/test_fllt9.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> @@ -34,7 +34,7 @@ image2d<int> ima(make::image2d(vs)); image2d<int_u8> out(ima.domain()); - level::fill(out, ima); + data::fill(out, ima); io::pgm::save(out, "ima.pgm "); fllt::fllt(ima); Index: garrigues/fllt/test_fllt_lena.cc --- garrigues/fllt/test_fllt_lena.cc (revision 3075) +++ garrigues/fllt/test_fllt_lena.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> @@ -19,6 +19,6 @@ image2d<int> ima_int(ima.domain()); - level::fill(ima_int, ima); + data::fill(ima_int, ima); fllt::fllt(ima_int); } Index: garrigues/fllt/test_fllt3_inv.cc --- garrigues/fllt/test_fllt3_inv.cc (revision 3075) +++ garrigues/fllt/test_fllt3_inv.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> Index: garrigues/fllt/fllt_optimized.hh --- garrigues/fllt/fllt_optimized.hh (revision 3075) +++ garrigues/fllt/fllt_optimized.hh (working copy) @@ -59,7 +59,7 @@ fllt_tree(P, V)& tree) { fllt_branch_iter(P, V) p(tree.main_branch()); - level::fill(output, 0); + data::fill(output, 0); for_all(p) { //std::cout << (&*p) << ":" << p.deepness() << std::endl; @@ -80,7 +80,7 @@ unsigned limit) { fllt_branch_iter(P, V) p(tree.main_branch()); - level::fill(output, 255); + data::fill(output, 255); for_all(p) { if ((*p).elt().points.nsites() > limit) Index: garrigues/fllt/test_fllt.cc --- garrigues/fllt/test_fllt.cc (revision 3075) +++ garrigues/fllt/test_fllt.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> # include <sstream> Index: garrigues/fllt/debug.hh --- garrigues/fllt/debug.hh (revision 3075) +++ garrigues/fllt/debug.hh (working copy) @@ -55,7 +55,7 @@ fllt_tree(P, V)& tree) { fllt_branch_iter_ind(P, V) p(tree.main_branch()); - level::fill(output, 0); + data::fill(output, 0); for_all(p) { //std::cout << (&*p) << ":" << p.deepness() << std::endl; @@ -76,7 +76,7 @@ unsigned limit) { fllt_branch_iter_ind(P, V) p(tree.main_branch()); - level::fill(output, 255); + data::fill(output, 255); for_all(p) { if ((*p).elt().points.nsites() > limit) @@ -184,14 +184,14 @@ image2d<value::rgb8> out(ima.domain()); - level::fill(out, literal::white); + data::fill(out, literal::white); if (R.nsites() != 0) - level::fill((out | R).rw(), literal::green); + data::fill((out | R).rw(), literal::green); if (A.nsites() != 0) - level::fill((out | A).rw(), literal::blue); + data::fill((out | A).rw(), literal::blue); if (N.nsites() != 0) - level::fill((out | N).rw(), literal::red); + data::fill((out | N).rw(), literal::red); io::ppm::save(out, filename.str()); } Index: garrigues/fllt/test_flltb.cc --- garrigues/fllt/test_flltb.cc (revision 3075) +++ garrigues/fllt/test_flltb.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> @@ -33,7 +33,7 @@ image2d<int> ima(make::image2d(vs)); image2d<int_u8> out(ima.domain()); - level::fill(out, ima); + data::fill(out, ima); io::pgm::save(out, "ima.pgm "); fllt::fllt(ima); Index: garrigues/fllt/test_fllt7_inv.cc --- garrigues/fllt/test_fllt7_inv.cc (revision 3075) +++ garrigues/fllt/test_fllt7_inv.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> Index: garrigues/fllt/test_fllt13.cc --- garrigues/fllt/test_fllt13.cc (revision 3075) +++ garrigues/fllt/test_fllt13.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> Index: garrigues/fllt/compute_level_set_fast.hh --- garrigues/fllt/compute_level_set_fast.hh (revision 3075) +++ garrigues/fllt/compute_level_set_fast.hh (working copy) @@ -236,9 +236,9 @@ // // Count the number of conected components of the border of R. // static image2d<unsigned> tmp(u.domain().to_larger(1)); // static image2d<bool> border_ima(tmp.domain()); -// level::fill(border_ima, false); +// data::fill(border_ima, false); -// // level::fill((border_ima | N).rw(), true); +// // data::fill((border_ima | N).rw(), true); // // std::cout << "tmp border = " << tmp.border () << std::endl; // // std::cout << "ima border = " << border_ima.border () << std::endl; // mln_piter(p_image2d<P>) z(N); @@ -388,8 +388,8 @@ gn = 0; current_region = 0; - level::fill(regions, 0); - level::fill(tagged, false); + data::fill(regions, 0); + data::fill(tagged, false); // Get the locals extremums unsigned nlabels; Index: garrigues/fllt/test_fllt15.cc --- garrigues/fllt/test_fllt15.cc (revision 3075) +++ garrigues/fllt/test_fllt15.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> @@ -38,6 +38,6 @@ image2d<int> ima(make::image2d(vs)); image2d<int_u8> out(ima.domain()); - level::fill(out, ima); + data::fill(out, ima); fllt::fllt(ima); } Index: garrigues/fllt/fllt_simple.svg.2.cc --- garrigues/fllt/fllt_simple.svg.2.cc (revision 3075) +++ garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> @@ -181,7 +181,7 @@ unsigned n_step_1 = 0, n_step_3 = 0; - level::fill(tagged, false); + data::fill(tagged, false); mln_piter(I) min(input.domain()); min.start(); // Step 1. @@ -209,7 +209,7 @@ std::cout << "Step 2" << std::endl; #endif if (N_box.is_valid()) - level::fill((is | N_box.to_result()).rw(), in_O); + data::fill((is | N_box.to_result()).rw(), in_O); N_box.init(); R_box.init(); Index: garrigues/fllt/fllt.hh --- garrigues/fllt/fllt.hh (revision 3075) +++ garrigues/fllt/fllt.hh (working copy) @@ -52,7 +52,7 @@ # include <mln/border/fill.hh> # include <mln/level/compute.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/accu/min.hh> # include <mln/accu/max.hh> Index: garrigues/fllt/test.cc --- garrigues/fllt/test.cc (revision 3075) +++ garrigues/fllt/test.cc (working copy) @@ -11,7 +11,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> @@ -41,7 +41,7 @@ image2d<value::int_u8> ima_ = io::pgm::load<value::int_u8>("small.pgm"); image2d<V> ima(ima_.domain()); - level::fill(ima, ima_); + data::fill(ima, ima_); // { // image2d<fllt_node(P, V)*> low_reg(ima.domain()); Index: garrigues/fllt/give_confs.cc --- garrigues/fllt/give_confs.cc (revision 3075) +++ garrigues/fllt/give_confs.cc (working copy) @@ -5,7 +5,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/labeling/level.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <iomanip> @@ -23,7 +23,7 @@ bool tab[8][8]; for (int i = 0; i < 256; i++) { - level::fill(ima, false); + data::fill(ima, false); int_u8 tmp = i; mln_fwd_niter_(clock_neighb2d) n(nbh , p); Index: garrigues/fllt/test_fllt2.cc --- garrigues/fllt/test_fllt2.cc (revision 3075) +++ garrigues/fllt/test_fllt2.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> Index: garrigues/fllt/test_fllt4.cc --- garrigues/fllt/test_fllt4.cc (revision 3075) +++ garrigues/fllt/test_fllt4.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> @@ -34,7 +34,7 @@ // image2d<int> ima_int(ima.domain()); -// level::fill(ima_int, ima); +// data::fill(ima_int, ima); // debug::println(ima); // fllt::fllt(ima_int); } Index: garrigues/fllt/test_fllt6.cc --- garrigues/fllt/test_fllt6.cc (revision 3075) +++ garrigues/fllt/test_fllt6.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> # include <sstream> Index: garrigues/fllt/compute_level_set.hh --- garrigues/fllt/compute_level_set.hh (revision 3075) +++ garrigues/fllt/compute_level_set.hh (working copy) @@ -177,9 +177,9 @@ // Count the number of conected components of the border of R. static image2d<unsigned> tmp(u.domain().to_larger(1)); static image2d<bool> border_ima(tmp.domain()); - level::fill(border_ima, false); + data::fill(border_ima, false); - // level::fill((border_ima | N).rw(), true); + // data::fill((border_ima | N).rw(), true); // std::cout << "tmp border = " << tmp.border () << std::endl; // std::cout << "ima border = " << border_ima.border () << std::endl; mln_piter(p_set<P>) z(N); @@ -318,8 +318,8 @@ gn = 0; current_region = 0; - level::fill(regions, 0); - level::fill(tagged, false); + data::fill(regions, 0); + data::fill(tagged, false); // Get the locals extremums unsigned nlabels; Index: garrigues/fllt/test_fllt8.cc --- garrigues/fllt/test_fllt8.cc (revision 3075) +++ garrigues/fllt/test_fllt8.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/convert/to_w_window.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pbm/load.hh> @@ -26,7 +26,7 @@ image2d<int> ima(make::image2d(vs)); image2d<int_u8> out(ima.domain()); - level::fill(out, ima); + data::fill(out, ima); io::pgm::save(out, "ima.pgm "); fllt::fllt(ima); Index: garrigues/ocr/skeleton.old.hh --- garrigues/ocr/skeleton.old.hh (revision 3075) +++ garrigues/ocr/skeleton.old.hh (working copy) @@ -390,7 +390,7 @@ p_set<point2d> proj; image2d<value::int_u8> bisector(h, w); - level::fill(bisector, 0); + data::fill(bisector, 0); for (uint i=0; i<Y.nsites(); i++) { @@ -553,9 +553,9 @@ sub_image<I, S> es = pic | Z; I es1(pic.domain()); - level::fill(es1, false); + data::fill(es1, false); - level::paste(es, es1); + data::paste(es, es1); mln::io::pbm::save(es1, "euclidean.pbm"); @@ -588,9 +588,9 @@ sub_image<I, S> skel = pic | Y; I test(pic.domain()); - level::fill(test, false); + data::fill(test, false); - level::paste(skel, test); + data::paste(skel, test); mln::io::pbm::save(test, "Y.pbm"); @@ -601,9 +601,9 @@ sub_image<I, S> skeleton = pic | Z; I output(pic.domain()); - level::fill(output, false); + data::fill(output, false); - level::paste(skeleton, output); + data::paste(skeleton, output); return output; } Index: garrigues/ocr/skeleton.hh --- garrigues/ocr/skeleton.hh (revision 3075) +++ garrigues/ocr/skeleton.hh (working copy) @@ -46,7 +46,7 @@ # include <mln/make/w_window2d_int.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/debug/println.hh> @@ -81,7 +81,7 @@ { image2d<bool> is_crest; initialize(is_crest, input); - level::fill(is_crest, false); + data::fill(is_crest, false); mln_piter_(image2d<bool>) p(input.domain()); mln_niter_(neighb2d) n(nbh, p); @@ -134,7 +134,7 @@ { p_priority<value::int_u8, p_queue_fast<P> > q_tmp; - level::fill(output, input); + data::fill(output, input); mln_piter_(image2d<bool>) p(input.domain()); for_all(p) if (!input(p) && Index: garrigues/ocr/check_simple_point.cc --- garrigues/ocr/check_simple_point.cc (revision 3075) +++ garrigues/ocr/check_simple_point.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include "simple_point.hh" @@ -20,7 +20,7 @@ for (unsigned i = 0; i < 256; i++) { - level::fill(ima, false); + data::fill(ima, false); int_u8 tmp = i; mln_niter_(neighb2d) n(c8() , p); @@ -41,7 +41,7 @@ for (unsigned i = 0; i < 256; i++) { - level::fill(ima, false); + data::fill(ima, false); int_u8 tmp = i; mln_niter_(neighb2d) n(c8() , p); Index: garrigues/ocr/compute_local_configurations.cc --- garrigues/ocr/compute_local_configurations.cc (revision 3075) +++ garrigues/ocr/compute_local_configurations.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <iomanip> @@ -23,7 +23,7 @@ for (unsigned i = 0; i < 256; i++) { - level::fill(ima, false); + data::fill(ima, false); int_u8 tmp = i; mln_fwd_niter_(neighb2d) n(c8(), p); Index: garrigues/ocr/skeleton.old.cc --- garrigues/ocr/skeleton.old.cc (revision 3075) +++ garrigues/ocr/skeleton.old.cc (working copy) @@ -1,8 +1,8 @@ #include <mln/core/alias/point2d.hh> #include "skeleton.hh" -#include <mln/level/paste.hh> -#include <mln/level/fill.hh> +#include <mln/data/paste.hh> +#include <mln/data/fill.hh> #include <mln/core/image/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> Index: garrigues/ocr/simple_point.cc --- garrigues/ocr/simple_point.cc (revision 3075) +++ garrigues/ocr/simple_point.cc (working copy) @@ -1,7 +1,7 @@ # include <mln/core/image/image2d.hh> # include <mln/io/pbm/load.hh> # include <mln/io/pbm/save.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include "simple_point.hh" @@ -28,7 +28,7 @@ I output; initialize(output, input); - level::fill(output, false); + data::fill(output, false); mln_piter_(I) p(input.domain()); for_all(p) Index: garrigues/union_find/reconstructions_on_function.hh --- garrigues/union_find/reconstructions_on_function.hh (revision 3075) +++ garrigues/union_find/reconstructions_on_function.hh (working copy) @@ -32,9 +32,9 @@ # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/routine/clone.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/level/compare.hh> -# include <mln/level/paste.hh> +# include <mln/data/paste.hh> # include <mln/level/sort_psites.hh> # include <mln/literal/zero.hh> # include <mln/math/max.hh> Index: garrigues/union_find/reconstructions_on_set.hh --- garrigues/union_find/reconstructions_on_set.hh (revision 3075) +++ garrigues/union_find/reconstructions_on_set.hh (working copy) @@ -31,8 +31,8 @@ # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> -# include <mln/level/fill.hh> -# include <mln/level/paste.hh> +# include <mln/data/fill.hh> +# include <mln/data/paste.hh> # include <mln/level/compare.hh> # include "canvas/reconstruction_on_set.hh" @@ -53,7 +53,7 @@ {} bool is_in_D(P p) { return mask(p); } - void set_default_output() { level::fill(output, false); } + void set_default_output() { data::fill(output, false); } void init(P p) { output(p) = marker(p); } void merge(P r, P p) { output(p) = output(p) || output(r); } void visit_ext_border(P n, P p) { (void) n; (void) p; } @@ -74,7 +74,7 @@ {} bool is_in_D(P p) { return mask(p) && !marker(p); } - void set_default_output() { level::paste(marker, output); } + void set_default_output() { data::paste(marker, output); } void init(P p) { output(p) = false; } void merge(P r, P p) { output(p) = output(p) || output(r); } void visit_ext_border(P n, P p) { if (marker(n)) output(p) = true; } @@ -95,7 +95,7 @@ {} bool is_in_D(P p) { return !mask(p); } - void set_default_output() { level::fill(output, true); } + void set_default_output() { data::fill(output, true); } void init(P p) { output(p) = marker(p); } void merge(P r, P p) { output(p) = output(p) && output(r); } void visit_ext_border(P n, P p) { (void) n; (void) p; } @@ -115,7 +115,7 @@ {} bool is_in_D(P p) { return !mask(p) && marker(p); } - void set_default_output() { level::paste(mask, output); } + void set_default_output() { data::paste(mask, output); } void init(P p) { output(p) = true; } void merge(P r, P p) { output(p) = output(p) && output(r); } void visit_ext_border(P n, P p) { if (!marker(n)) output(p) = false; } Index: garrigues/union_find/canvas/reconstruction_on_function.hh --- garrigues/union_find/canvas/reconstruction_on_function.hh (revision 3075) +++ garrigues/union_find/canvas/reconstruction_on_function.hh (working copy) @@ -30,7 +30,7 @@ # define MLN_RECONSTRUCTION_ON_FUNCTION_HH # include <mln/core/image/image2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/literal/zero.hh> # include <mln/convert/to_upper_window.hh> # include <mln/accu/count.hh> @@ -123,8 +123,8 @@ initialize(deja_vu, f.mask); initialize(parent, f.mask); - mln::level::fill(deja_vu, false); - level::fill(f.output, f.marker); + mln::data::fill(deja_vu, false); + data::fill(f.output, f.marker); } // first pass Index: garrigues/union_find/canvas/reconstruction_on_set.hh --- garrigues/union_find/canvas/reconstruction_on_set.hh (revision 3075) +++ garrigues/union_find/canvas/reconstruction_on_set.hh (working copy) @@ -30,7 +30,7 @@ # define MLN_RECONSTRUCTION_ON_SET_HH # include <mln/core/image/image2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/literal/zero.hh> # include <mln/convert/to_upper_window.hh> # include <mln/accu/count.hh> @@ -87,7 +87,7 @@ initialize(deja_vu, f.mask); initialize(parent, f.mask); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); f.set_default_output(); // Client initialization. } Index: garrigues/union_find/canvas/self_dual_reconstruction.hh --- garrigues/union_find/canvas/self_dual_reconstruction.hh (revision 3075) +++ garrigues/union_find/canvas/self_dual_reconstruction.hh (working copy) @@ -30,7 +30,7 @@ # define MLN_SELF_DUAL_RECONSTRUCTION_HH # include <mln/core/image/image2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/literal/zero.hh> # include <mln/convert/to_upper_window.hh> # include <mln/accu/count.hh> @@ -127,8 +127,8 @@ initialize(deja_vu, f.mask); initialize(parent, f.mask); - mln::level::fill(deja_vu, false); - level::fill(f.output, f.marker); + mln::data::fill(deja_vu, false); + data::fill(f.output, f.marker); } // first pass @@ -161,7 +161,7 @@ } } - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); // Body of D2. { Index: garrigues/union_find/self_dual_reconstruction.hh --- garrigues/union_find/self_dual_reconstruction.hh (revision 3075) +++ garrigues/union_find/self_dual_reconstruction.hh (working copy) @@ -32,9 +32,9 @@ # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/routine/clone.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/level/compare.hh> -# include <mln/level/paste.hh> +# include <mln/data/paste.hh> # include <mln/level/sort_psites.hh> # include <mln/literal/zero.hh> # include <mln/math/max.hh> Index: garrigues/tiled_image2d/tiled_image2d.cc --- garrigues/tiled_image2d/tiled_image2d.cc (revision 3075) +++ garrigues/tiled_image2d/tiled_image2d.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/core/image/cast_image.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u8.hh> #include <mln/debug/println.hh> #include <mln/debug/iota.hh> Index: garrigues/image_identity/interpolated.cc --- garrigues/image_identity/interpolated.cc (revision 3075) +++ garrigues/image_identity/interpolated.cc (working copy) @@ -37,7 +37,7 @@ #include <mln/algebra/vec.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> @@ -56,7 +56,7 @@ 4., 7., 10., 13., 7., 11., 15., 19., 10., 15., 20., 25.}; - level::fill(f, tab); + data::fill(f, tab); interpolated< image2d_b<float> > inter(f); Index: garrigues/factures/extract_array_highlight.cc --- garrigues/factures/extract_array_highlight.cc (revision 3075) +++ garrigues/factures/extract_array_highlight.cc (working copy) @@ -150,7 +150,7 @@ // Binarisation. ima2d_bool bin(in.domain()); - level::paste(pw::value(in) > pw::cst(50) | in.domain(), bin); + data::paste(pw::value(in) > pw::cst(50) | in.domain(), bin); image2d<value::rgb8> output_h = highlight_hlines(bin); image2d<value::rgb8> output_v = highlight_vlines(bin); Index: garrigues/factures/extract_array.cc --- garrigues/factures/extract_array.cc (revision 3075) +++ garrigues/factures/extract_array.cc (working copy) @@ -63,7 +63,7 @@ // Binarisation. ima2d_bool bin(small.domain()); - level::paste(pw::value(small) > pw::cst(50) | small.domain(), bin); + data::paste(pw::value(small) > pw::cst(50) | small.domain(), bin); // Labeling. unsigned nlabels; Index: garrigues/area_filter_auto_dual.cc --- garrigues/area_filter_auto_dual.cc (revision 3075) +++ garrigues/area_filter_auto_dual.cc (working copy) @@ -30,7 +30,7 @@ # define MLN_AREA_FILTER_HH # include <mln/core/image/image2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/literal/zero.hh> # include <mln/convert/to_upper_window.hh> # include <mln/accu/count.hh> @@ -88,7 +88,7 @@ // init { initialize(deja_vu, input); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); initialize(parent, input); initialize(data, input); f.init(); // init required. Index: abraham/tests/core/image/thru_norm.cc --- abraham/tests/core/image/thru_norm.cc (revision 3075) +++ abraham/tests/core/image/thru_norm.cc (working copy) @@ -29,7 +29,7 @@ # include <mln/core/image/thru.hh> # include <mln/fun/v2w_w2v/norm.hh> # include <mln/algebra/vec.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/core/image/violent_cast_image.hh> @@ -49,7 +49,7 @@ ima(point2d(2,1)).set (3, 1); thru<mln::fun::v2w_w2v::l1_norm<algebra::vec<2, double>, double>, I > out(ima); - level::fill(out, 1); + data::fill(out, 1); box_fwd_piter_<point2d> p(ima.domain()); Index: abraham/tests/core/image/fun_image_norm.cc --- abraham/tests/core/image/fun_image_norm.cc (revision 3075) +++ abraham/tests/core/image/fun_image_norm.cc (working copy) @@ -29,7 +29,7 @@ # include <mln/core/image/fun_image.hh> # include <mln/fun/v2w_w2v/norm.hh> # include <mln/algebra/vec.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/core/image/violent_cast_image.hh> #include <mln/morpho/erosion.hh> @@ -50,7 +50,7 @@ ima(point2d(2,1)).set (3, 1); fun_image<mln::fun::v2w_w2v::l1_norm<algebra::vec<2, double>, double>, I > out(ima); - // level::fill(out, 1); + // data::fill(out, 1); win::rectangle2d rect(3, 3); morpho::erosion(out, rect); Index: abraham/mln/morpho/najman_wst.hh --- abraham/mln/morpho/najman_wst.hh (revision 3075) +++ abraham/mln/morpho/najman_wst.hh (working copy) @@ -31,7 +31,7 @@ #include <mln/level/sort_psites.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/estim/min_max.hh> @@ -239,7 +239,7 @@ S = level::sort_psites_increasing(pima); // Clear the marker map - level::fill(isproc, false); + data::fill(isproc, false); for (int ip = 0; ip < int(S.nsites()); ++ip) { site p = S[ip]; @@ -504,7 +504,7 @@ ordered_queue_type l(util::make_greater_psite(pima)); // Clear the marker map - level::fill(isproc, false); + data::fill(isproc, false); mln_piter(I) it(pima.domain()); for_all(it) Index: abraham/mln/morpho/basic_najman.hh --- abraham/mln/morpho/basic_najman.hh (revision 3075) +++ abraham/mln/morpho/basic_najman.hh (working copy) @@ -27,7 +27,7 @@ #include <mln/level/sort_psites.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/estim/min_max.hh> @@ -161,7 +161,7 @@ S = level::sort_psites_increasing(pima); // Clear the marker map - level::fill(isproc, false); + data::fill(isproc, false); for (int ip = 0; ip < int(S.nsites()); ++ip) { site p = S[ip]; @@ -480,7 +480,7 @@ ordered_queue_type l(util::make_greater_psite(pima)); // Clear the marker map - level::fill(isproc, false); + data::fill(isproc, false); mln_piter(I) it(pima.domain()); for_all(it) @@ -647,8 +647,8 @@ std::cout << "Init" << std::endl; // Flag C-maxima - level::fill(cmax, false); - level::fill(enqueued, false); + data::fill(cmax, false); + data::fill(enqueued, false); mln_piter(I) it(Par_node.domain()); for_all(it) Index: abraham/mln/morpho/autarkical_leveling.hh --- abraham/mln/morpho/autarkical_leveling.hh (revision 3075) +++ abraham/mln/morpho/autarkical_leveling.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/morpho/includes.hh> # include <mln/morpho/general.hh> # include <mln/norm/l2.hh> -# include <mln/level/paste.hh> +# include <mln/data/paste.hh> namespace mln { @@ -120,7 +120,7 @@ output(p) = ref(p); } } - level::paste(output, ref); + data::paste(output, ref); } trace::exiting("morpho::impl::general_on_set_centered__autarkical_leveling"); Index: abraham/mln/morpho/topo_wst.hh --- abraham/mln/morpho/topo_wst.hh (revision 3075) +++ abraham/mln/morpho/topo_wst.hh (working copy) @@ -31,7 +31,7 @@ #include <mln/level/sort_psites.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/estim/min_max.hh> @@ -249,7 +249,7 @@ S = level::sort_psites_increasing(pima); // Clear the marker map - level::fill(isproc, false); + data::fill(isproc, false); for (int ip = 0; ip < int(S.nsites()); ++ip) { site p = S[ip]; @@ -500,8 +500,8 @@ std::cout << "Init" << std::endl; // Flag C-maxima - level::fill(cmax, false); - level::fill(enqueued, false); + data::fill(cmax, false); + data::fill(enqueued, false); mln_piter(I) it(Par_node.domain()); for_all(it) Index: inim/classif/src/max_tree.hh --- inim/classif/src/max_tree.hh (revision 3075) +++ inim/classif/src/max_tree.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/util/pix.hh> # include <mln/morpho/includes.hh> # include <mln/level/sort_psites.hh> @@ -44,7 +44,7 @@ : f(f), nbh(nbh), is_active(f.domain()), new_parent(f.domain()) { run(); - level::fill(is_active, true); + data::fill(is_active, true); new_parent = parent; } @@ -54,7 +54,7 @@ // init { initialize(deja_vu, f); - mln::level::fill(deja_vu, false); + mln::data::fill(deja_vu, false); initialize(parent, f); initialize(zpar, f); s = level::sort_psites_decreasing(f); @@ -107,7 +107,7 @@ { image3d<unsigned> nb_represent(f.domain()); - level::fill(nb_represent, 0); + data::fill(nb_represent, 0); mln_fwd_piter(S) p(s); for_all(p) @@ -124,7 +124,7 @@ { image3d<unsigned> volume(f.domain()); - level::fill(volume, 0); + data::fill(volume, 0); mln_fwd_piter(S) p(s); for_all(p) @@ -259,7 +259,7 @@ update_parents(); J out(ima.domain()); - level::fill(out, value::rgb8(0, 0, 0)); + data::fill(out, value::rgb8(0, 0, 0)); mln_piter(J) p(ima.domain()); for_all(p) Index: inim/classif/src/display.hh --- inim/classif/src/display.hh (revision 3075) +++ inim/classif/src/display.hh (working copy) @@ -52,7 +52,7 @@ chdir(dir); image2d< value::rgb8 > out(geom::nrows(histo), geom::ncols(histo)); - level::fill(out, literal::white); + data::fill(out, literal::white); for (int s = 0; s < geom::nslis(histo); ++s) { Index: inim/classif/src/iccvg04.cc --- inim/classif/src/iccvg04.cc (revision 3075) +++ inim/classif/src/iccvg04.cc (working copy) @@ -5,7 +5,7 @@ #include <mln/histo/data.hh> #include <mln/value/all.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/morpho/closing_volume.hh> #include <mln/morpho/closing_area.hh> @@ -52,7 +52,7 @@ { const value::int_u8 v = 255 / f; // FIXME image3d<unsigned> histo(v,v,v); - level::fill(histo, 0); + data::fill(histo, 0); mln_piter(I) p(ima.domain()); for_all(p) Index: inim/classif/src/proj.hh --- inim/classif/src/proj.hh (revision 3075) +++ inim/classif/src/proj.hh (working copy) @@ -30,7 +30,7 @@ #include <mln/io/ppm/save.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <mln/accu/mean.hh> #include <mln/accu/maj_h.hh> #include <mln/literal/white.hh> @@ -52,7 +52,7 @@ opt::at(acc, p.sli(), p.row()).take(input(p)); image2d<mln_result(A)> output(acc.domain()); - level::paste(acc, output); + data::paste(acc, output); return output; } @@ -70,7 +70,7 @@ //std::cout << histo; image2d<value::rgb8> out(proj_class.domain()); - level::fill(out, literal::white); + data::fill(out, literal::white); mln_piter(image2d<value::int_u8>) p(proj_class.domain()); for_all(p) @@ -95,7 +95,7 @@ opt::at(acc, p.sli(), p.row()).take(input(p)); image2d<mln_result(A)> output(acc.domain()); - level::paste(acc, output); + data::paste(acc, output); return output; } @@ -122,7 +122,7 @@ proj_vec(out3d, histo, maj_2); image2d<value::rgb8> out(geom::nslis(histo), geom::nrows(histo)); - level::fill(out, literal::white); + data::fill(out, literal::white); mln_piter(image2d<value::int_u8>) p1(out.domain()); for_all(p1) Index: inim/classif/src/v2.cc --- inim/classif/src/v2.cc (revision 3075) +++ inim/classif/src/v2.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/value/all.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/geom/nrows.hh> #include <mln/geom/ncols.hh> #include <mln/geom/nslis.hh> @@ -29,7 +29,7 @@ { const value::int_u8 v = 256 / f; // FIXME image3d<unsigned> histo(v,v,v); - level::fill(histo, 0); + data::fill(histo, 0); mln_piter(I) p(ima.domain()); for_all(p) Index: inim/binarization/proof-of-concept/src/gradient.cc --- inim/binarization/proof-of-concept/src/gradient.cc (revision 3075) +++ inim/binarization/proof-of-concept/src/gradient.cc (working copy) @@ -24,7 +24,7 @@ #include <mln/geom/all.hh> #include <mln/morpho/closing_area.hh> #include <mln/morpho/gradient.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> // DEBUG @@ -79,7 +79,7 @@ initialize(grad, in); grad = morpho::gradient(in, win_c4p()); - level::fill(hist, 0); + data::fill(hist, 0); image2d<value::int_u8>::fwd_piter p (in.domain ()); for_all (p) opt::at(hist, in(p)) += (unsigned) strength_of<2> (grad (p)); Index: ballas/test.cc --- ballas/test.cc (revision 3075) +++ ballas/test.cc (working copy) @@ -28,7 +28,7 @@ #include <oln/core/2d/image2d.hh> #include <oln/core/3d/image3d.hh> #include <oln/core/1d/image1d.hh> -#include <oln/level/fill.hh> +#include <oln/data/fill.hh> using namespace oln; @@ -40,30 +40,30 @@ image1d<float> ima1d3(5); image1d<double> ima1d4(5); - level::fill(ima1d1, 5); - level::fill(ima1d2, 5); - level::fill(ima1d3, 5); - level::fill(ima1d4, 5); + data::fill(ima1d1, 5); + data::fill(ima1d2, 5); + data::fill(ima1d3, 5); + data::fill(ima1d4, 5); image2d<char> ima2d1(5, 5); image2d<int> ima2d2(5, 5); image2d<float> ima2d3(5, 5); image2d<double> ima2d4(5, 5); - level::fill(ima2d1, 5); - level::fill(ima2d2, 5); - level::fill(ima2d3, 5); - level::fill(ima2d4, 5); + data::fill(ima2d1, 5); + data::fill(ima2d2, 5); + data::fill(ima2d3, 5); + data::fill(ima2d4, 5); image3d<char> ima3d1(5, 5, 5); image3d<int> ima3d2(5, 5, 5); image3d<float> ima3d3(5, 5, 5); image3d<double> ima3d4(5, 5, 5); - level::fill(ima3d1, 5); - level::fill(ima3d2, 5); - level::fill(ima3d3, 5); - level::fill(ima3d4, 5); + data::fill(ima3d1, 5); + data::fill(ima3d2, 5); + data::fill(ima3d3, 5); + data::fill(ima3d4, 5); return 0; } Index: ballas/color/min_tree_volume_filter.cc --- ballas/color/min_tree_volume_filter.cc (revision 3075) +++ ballas/color/min_tree_volume_filter.cc (working copy) @@ -27,8 +27,8 @@ # include <mln/fun/i2v/array.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> @@ -90,9 +90,9 @@ initialize(volume, f); initialize(color, f); - mln::level::fill(deja_vu, false); - mln::level::fill(color, value::rgb8(255, 255, 255)); - mln::level::fill(volume, 0); + mln::data::fill(deja_vu, false); + mln::data::fill(color, value::rgb8(255, 255, 255)); + mln::data::fill(volume, 0); s = level::sort_psites_increasing(f); } @@ -288,7 +288,7 @@ unsigned ncols = ima.ncols() / 2 + 1; I output(nrows * (zoom + 1) - 1, ncols * (zoom + 1) - 1); - level::fill(output, bg); + data::fill(output, bg); mln_VAR(edge, ima | is_edge); mln_piter(edge_t) p(edge.domain()); @@ -426,9 +426,9 @@ colorize colors(nnodes); image2d<value::rgb8> tmp(ref.domain()); - level::fill(tmp, literal::black); + data::fill(tmp, literal::black); image2d<value::rgb8> tmp2(ref.domain()); - level::fill(tmp, ref); + data::fill(tmp, ref); mln_piter(I) q(f.domain()); unsigned int i = 0; @@ -455,13 +455,13 @@ image2d<value::rgb8> to_display(tmp.domain()); image2d<value::rgb8> to_display2(tmp2.domain()); - level::fill(to_display, literal::black); - level::paste((tmp | is_edge), to_display); - level::paste(morpho::dilation(to_display, c4()), to_display); - - level::fill(to_display2, literal::black); - level::paste((tmp2 | is_edge), to_display2); - level::paste(morpho::dilation(to_display2, c4()), to_display2); + data::fill(to_display, literal::black); + data::paste((tmp | is_edge), to_display); + data::paste(morpho::dilation(to_display, c4()), to_display); + + data::fill(to_display2, literal::black); + data::paste((tmp2 | is_edge), to_display2); + data::paste(morpho::dilation(to_display2, c4()), to_display2); io::ppm::save(display_edge(tmp, literal::black, 3), "edge.ppm"); Index: ballas/color/reference.cc --- ballas/color/reference.cc (revision 3075) +++ ballas/color/reference.cc (working copy) @@ -28,8 +28,8 @@ # include <mln/fun/i2v/array.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> # include <mln/convert/to.hh> @@ -279,7 +279,7 @@ unsigned ncols = ima.ncols() / 2 + 1; I output(nrows * (zoom + 1) - 1, ncols * (zoom + 1) - 1); - level::fill(output, bg); + data::fill(output, bg); mln_VAR( edge, ima | is_edge ); mln_piter(edge_t) p(edge.domain()); for_all(p) @@ -507,21 +507,21 @@ } #if 0 - level::paste(morpho::gradient(edge, e2c), edge); - level::paste(morpho::closing_volume(edge, e2e, lambda), edge); - level::fill(edge, morpho::meyer_wst(edge, e2e, nbasins)); + data::paste(morpho::gradient(edge, e2c), edge); + data::paste(morpho::closing_volume(edge, e2e, lambda), edge); + data::fill(edge, morpho::meyer_wst(edge, e2e, nbasins)); // Fill regions (with colorize) (won't work with laplacian...) colorize colors(nbasins); image2d<value::rgb8> cells(ima.domain()); - level::fill(cells, literal::white); - level::paste(level::transform(edge, colors), cells); + data::fill(cells, literal::white); + data::paste(level::transform(edge, colors), cells); io::ppm::save(display_edge_with_bg(cells, 3, literal::white), "tmp_edge.ppm"); // Move the color of an edge which is non black in the cell - level::paste(morpho::dilation(cells, c4()), cells); + data::paste(morpho::dilation(cells, c4()), cells); #endif //cells = convert_to_rgb8(ima); Index: ballas/color/min_tree_area_filter.cc --- ballas/color/min_tree_area_filter.cc (revision 3075) +++ ballas/color/min_tree_area_filter.cc (working copy) @@ -28,8 +28,8 @@ # include <mln/fun/i2v/array.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> @@ -100,9 +100,9 @@ initialize(area, f); //initialize(comp, f); - mln::level::fill(deja_vu, false); - //mln::level::fill(resp, false); - mln::level::fill(area, 0); + mln::data::fill(deja_vu, false); + //mln::data::fill(resp, false); + mln::data::fill(area, 0); s = level::sort_psites_increasing(f); } @@ -265,7 +265,7 @@ unsigned ncols = ima.ncols() / 2 + 1; I output(nrows * (zoom + 1) - 1, ncols * (zoom + 1) - 1); - level::fill(output, bg); + data::fill(output, bg); mln_VAR(edge, ima | is_edge); mln_piter(edge_t) p(edge.domain()); @@ -404,7 +404,7 @@ colorize colors(nnodes); image2d<value::rgb8> tmp(ref.domain()); - level::fill(tmp, ref); + data::fill(tmp, ref); mln_piter(I) q(f.domain()); unsigned int i = 0; @@ -428,9 +428,9 @@ image2d<value::rgb8> to_display(tmp.domain()); - level::fill(to_display, value::rgb8(255, 255, 255)); - level::paste((tmp | is_edge), to_display); - level::paste(morpho::dilation(to_display, c4()), to_display); + data::fill(to_display, value::rgb8(255, 255, 255)); + data::paste((tmp | is_edge), to_display); + data::paste(morpho::dilation(to_display, c4()), to_display); io::ppm::save(display_edge(tmp, literal::white, 3), "edge.ppm"); Index: ballas/color/min_tree_height_filter.cc --- ballas/color/min_tree_height_filter.cc (revision 3075) +++ ballas/color/min_tree_height_filter.cc (working copy) @@ -27,8 +27,8 @@ # include <mln/fun/i2v/array.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> # include <mln/opt/at.hh> @@ -90,9 +90,9 @@ initialize(height, f); initialize(color, f); - mln::level::fill(deja_vu, false); - mln::level::fill(color, value::rgb8(255, 255, 255)); - mln::level::fill(height, 0); + mln::data::fill(deja_vu, false); + mln::data::fill(color, value::rgb8(255, 255, 255)); + mln::data::fill(height, 0); s = level::sort_psites_increasing(f); } @@ -288,7 +288,7 @@ unsigned ncols = ima.ncols() / 2 + 1; I output(nrows * (zoom + 1) - 1, ncols * (zoom + 1) - 1); - level::fill(output, bg); + data::fill(output, bg); mln_VAR(edge, ima | is_edge); mln_piter(edge_t) p(edge.domain()); @@ -428,9 +428,9 @@ colorize colors(nnodes); image2d<value::rgb8> tmp(ref.domain()); - level::fill(tmp, literal::black); + data::fill(tmp, literal::black); image2d<value::rgb8> tmp2(ref.domain()); - level::fill(tmp, ref); + data::fill(tmp, ref); mln_piter(I) q(f.domain()); unsigned int i = 0; @@ -457,13 +457,13 @@ image2d<value::rgb8> to_display(tmp.domain()); image2d<value::rgb8> to_display2(tmp2.domain()); - level::fill(to_display, literal::black); - level::paste((tmp | is_edge), to_display); - level::paste(morpho::dilation(to_display, c4()), to_display); - - level::fill(to_display2, literal::black); - level::paste((tmp2 | is_edge), to_display2); - level::paste(morpho::dilation(to_display2, c4()), to_display2); + data::fill(to_display, literal::black); + data::paste((tmp | is_edge), to_display); + data::paste(morpho::dilation(to_display, c4()), to_display); + + data::fill(to_display2, literal::black); + data::paste((tmp2 | is_edge), to_display2); + data::paste(morpho::dilation(to_display2, c4()), to_display2); io::ppm::save(display_edge(tmp, literal::black, 3), "edge.ppm"); Index: ballas/color/min_tree_color.cc --- ballas/color/min_tree_color.cc (revision 3075) +++ ballas/color/min_tree_color.cc (working copy) @@ -28,8 +28,8 @@ # include <mln/fun/i2v/array.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> @@ -99,9 +99,9 @@ initialize(color, f); //initialize(comp, f); - mln::level::fill(deja_vu, false); - //mln::level::fill(resp, false); - mln::level::fill(color, value::rgb8(0, 0, 0)); + mln::data::fill(deja_vu, false); + //mln::data::fill(resp, false); + mln::data::fill(color, value::rgb8(0, 0, 0)); s = level::sort_psites_increasing(f); } @@ -283,7 +283,7 @@ unsigned ncols = ima.ncols() / 2 + 1; I output(nrows * (zoom + 1) - 1, ncols * (zoom + 1) - 1); - level::fill(output, bg); + data::fill(output, bg); mln_VAR(edge, ima | is_edge); mln_piter(edge_t) p(edge.domain()); @@ -421,7 +421,7 @@ #if 1 colorize colors(nnodes); image2d<value::rgb8> tmp(ref.domain()); - level::fill(tmp, ref); + data::fill(tmp, ref); mln_piter(I) q(f.domain()); @@ -443,9 +443,9 @@ image2d<value::rgb8> to_display(tmp.domain()); - level::fill(to_display, value::rgb8(255, 255, 255)); - level::paste((tmp | is_edge), to_display); - level::paste(morpho::dilation(to_display, c4()), to_display); + data::fill(to_display, value::rgb8(255, 255, 255)); + data::paste((tmp | is_edge), to_display); + data::paste(morpho::dilation(to_display, c4()), to_display); io::ppm::save(display_edge(tmp, literal::white, 3), "edge.ppm"); Index: ballas/color/reference2.cc --- ballas/color/reference2.cc (revision 3075) +++ ballas/color/reference2.cc (working copy) @@ -28,8 +28,8 @@ # include <mln/fun/i2v/array.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> @@ -262,7 +262,7 @@ unsigned ncols = ima.ncols() / 2 + 1; I output(nrows * (zoom + 1) - 1, ncols * (zoom + 1) - 1); - level::fill(output, bg); + data::fill(output, bg); mln_VAR( edge, ima | is_edge ); mln_piter(edge_t) p(edge.domain()); for_all(p) @@ -361,21 +361,21 @@ // FIXME until laplacian is working use gradient / closing_area / wst - level::paste(morpho::gradient(edge, e2c), edge); - level::paste(morpho::closing_volume(edge, e2e, lambda), edge); - level::fill(edge, morpho::meyer_wst(edge, e2e, nbasins)); + data::paste(morpho::gradient(edge, e2c), edge); + data::paste(morpho::closing_volume(edge, e2e, lambda), edge); + data::fill(edge, morpho::meyer_wst(edge, e2e, nbasins)); // Fill regions (with colorize) (won't work with laplacian...) colorize colors(nbasins); image2d<value::rgb8> cells(ima.domain()); - level::fill(cells, literal::white); - level::paste(level::transform(edge, colors), cells); + data::fill(cells, literal::white); + data::paste(level::transform(edge, colors), cells); io::ppm::save(display_edge(cells, literal::white, 3), "tmp_edge.ppm"); // Move the color of an edge which is non black in the cell - level::paste(morpho::dilation(cells, c4()), cells); + data::paste(morpho::dilation(cells, c4()), cells); return cells2image(cells); } Index: ballas/color/src/graph.hh --- ballas/color/src/graph.hh (revision 3075) +++ ballas/color/src/graph.hh (working copy) @@ -9,7 +9,7 @@ # include <mln/value/int_u16.hh> # include <mln/value/rgb8.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/opt/at.hh> # include <mln/core/image/image2d.hh> @@ -51,7 +51,7 @@ { graph = I(ima.nrows() * 2 -1, ima.ncols() * 2 - 1); - mln::level::fill(graph, val); + mln::data::fill(graph, val); mln_piter(I) p(ima.domain()); for_all(p) Index: ballas/color/min_tree_color_v2.cc --- ballas/color/min_tree_color_v2.cc (revision 3075) +++ ballas/color/min_tree_color_v2.cc (working copy) @@ -27,8 +27,8 @@ # include <mln/fun/i2v/array.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> @@ -89,8 +89,8 @@ initialize(zpar, f); initialize(color, f); - mln::level::fill(deja_vu, false); - mln::level::fill(color, value::rgb8(255, 255, 255)); + mln::data::fill(deja_vu, false); + mln::data::fill(color, value::rgb8(255, 255, 255)); s = level::sort_psites_increasing(f); } @@ -272,7 +272,7 @@ unsigned ncols = ima.ncols() / 2 + 1; I output(nrows * (zoom + 1) - 1, ncols * (zoom + 1) - 1); - level::fill(output, bg); + data::fill(output, bg); mln_VAR(edge, ima | is_edge); mln_piter(edge_t) p(edge.domain()); @@ -409,9 +409,9 @@ colorize colors(nnodes); image2d<value::rgb8> tmp(ref.domain()); - level::fill(tmp, literal::black); + data::fill(tmp, literal::black); image2d<value::rgb8> tmp2(ref.domain()); - level::fill(tmp, ref); + data::fill(tmp, ref); mln_piter(I) q(f.domain()); unsigned int i = 0; @@ -438,13 +438,13 @@ image2d<value::rgb8> to_display(tmp.domain()); image2d<value::rgb8> to_display2(tmp2.domain()); - level::fill(to_display, literal::black); - level::paste((tmp | is_edge), to_display); - level::paste(morpho::dilation(to_display, c4()), to_display); - - level::fill(to_display2, literal::black); - level::paste((tmp2 | is_edge), to_display2); - level::paste(morpho::dilation(to_display2, c4()), to_display2); + data::fill(to_display, literal::black); + data::paste((tmp | is_edge), to_display); + data::paste(morpho::dilation(to_display, c4()), to_display); + + data::fill(to_display2, literal::black); + data::paste((tmp2 | is_edge), to_display2); + data::paste(morpho::dilation(to_display2, c4()), to_display2); io::ppm::save(display_edge(tmp, literal::black, 3), "edge.ppm"); Index: ballas/color/laplacien.cc --- ballas/color/laplacien.cc (revision 3075) +++ ballas/color/laplacien.cc (working copy) @@ -71,9 +71,9 @@ convert_to_gl(gray_input, input); - //level::paste(morpho::dilation((gray_graph | is_cell), e2c.win()), gray_graph); + //data::paste(morpho::dilation((gray_graph | is_cell), e2c.win()), gray_graph); // Igray save(gray_graph.bbox()); -// level::paste(gray_graph | is_cell, save); +// data::paste(gray_graph | is_cell, save); // IO::save(save, "tmp3.ppm"); // Create the laplacian image Index: nature/nature.cc --- nature/nature.cc (revision 3075) +++ nature/nature.cc (working copy) @@ -37,7 +37,7 @@ #include <mln/histo/compute.hh> #include <mln/level/transform.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <mln/level/to_enc.hh> #include <mln/value/rgb8.hh> @@ -164,7 +164,7 @@ image2d<int_u8> uinty (qinty.domain()); { image2d<unsigned char> tmp = level::transform(qinty, fun::v2v::enc< float01_8 >()); - level::paste(tmp, uinty); + data::paste(tmp, uinty); /* mln_piter_(image2d<unsigned char>) p(tmp.domain()); for_all(p) uinty(p) = tmp(p); Index: nature/co_occurence.hh --- nature/co_occurence.hh (revision 3075) +++ nature/co_occurence.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/dpoint.hh> # include <mln/core/image/image2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/opt/at.hh> @@ -59,7 +59,7 @@ const I &ima = exact(ima_); const D &dp = exact(dp_); image2d<unsigned> mco(mln_card(mln_value(I)), mln_card(mln_value(I)), 0); - level::fill(mco, 0); + data::fill(mco, 0); mln_piter(I) p(ima.domain()); Index: nature/hom.cc --- nature/hom.cc (revision 3075) +++ nature/hom.cc (working copy) @@ -279,7 +279,7 @@ name = argv[i]; name.erase(name.length() - 4); // image2d<bool> final(right.domain()); - // level::fill(final, false); + // data::fill(final, false); // mln_piter_(image2d<bool>) p(final.domain()); // for_all(p) // final(p) = up_left(p) || up_right(p) || bottom_right(p) || bottom_left(p) || up(p) || bottom(p) || left(p) || right(p); Index: nature/proj.hh --- nature/proj.hh (revision 3075) +++ nature/proj.hh (working copy) @@ -29,12 +29,12 @@ # define MLN_PROJ_HH #include <mln/io/pgm/save.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <mln/accu/mean.hh> #include <mln/literal/white.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/image1d.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> namespace mln @@ -44,7 +44,7 @@ proj_nat(const image2d<T>& input) { image1d<float> out(geom::nrows(input)); - level::fill(out, 0); + data::fill(out, 0); mln_piter(image2d<T>) p(input.domain()); for_all(p) // 2d Index: nature/histo_hsi.cc --- nature/histo_hsi.cc (revision 3075) +++ nature/histo_hsi.cc (working copy) @@ -53,7 +53,7 @@ #include <mln/accu/histo.hh> #include <mln/histo/compute.hh> #include <mln/level/transform.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> using namespace mln; using namespace value; @@ -80,7 +80,7 @@ image2d<bool> output(max, mln_card(float01_8), 0); std::cout << max << "x" << mln_card(float01_8) << std::endl; - level::fill(output, true); + data::fill(output, true); for_all(v) for (size_t i = 0; i < h(v); ++i) Index: geraud/skel.cc --- geraud/skel.cc (revision 3075) +++ geraud/skel.cc (working copy) @@ -8,7 +8,7 @@ # include <mln/io/pgm/save.hh> # include <mln/value/int_u8.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include <mln/debug/println.hh> @@ -25,14 +25,14 @@ mln_ch_value(I, bool) deja_vu; initialize(deja_vu, input); - level::fill(deja_vu, input); + data::fill(deja_vu, input); typedef mln_site(I) P; p_queue_fast<P> q; // Initialization. { - level::fill(output, M); + data::fill(output, M); mln_piter(I) p(input.domain()); mln_niter(N) n(nbh, p); for_all(p) Index: geraud/wst_edge.cc --- geraud/wst_edge.cc (revision 3075) +++ geraud/wst_edge.cc (working copy) @@ -27,8 +27,8 @@ # include <mln/fun/i2v/array.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> @@ -209,7 +209,7 @@ unsigned ncols = ima.ncols() / 2 + 1; I output(nrows * (zoom + 1) - 1, ncols * (zoom + 1) - 1); - level::fill(output, bg); + data::fill(output, bg); mln_VAR( edge, ima | is_edge ); mln_piter(edge_t) p(edge.domain()); for_all(p) @@ -302,7 +302,7 @@ mln_VAR(edge, extend((ima | is_edge).rw(), pw::value(ima))); - level::paste(morpho::gradient(edge, e2c), edge); + data::paste(morpho::gradient(edge, e2c), edge); // ^^^ // edge -> neighboring cells @@ -318,7 +318,7 @@ } - level::paste( morpho::closing_volume(edge, e2e, lambda), edge ); + data::paste( morpho::closing_volume(edge, e2e, lambda), edge ); image2d<unsigned> label(ima.bbox(), 0); @@ -328,7 +328,7 @@ mln_VAR(wst, label | is_edge); - level::fill(wst, morpho::meyer_wst(edge, e2e, nbasins)); + data::fill(wst, morpho::meyer_wst(edge, e2e, nbasins)); // ^^^ // edge -> neighboring edges @@ -342,9 +342,9 @@ { image2d<value::rgb8> temp(label.domain()); - level::fill(temp, literal::white); + data::fill(temp, literal::white); - level::paste( level::transform(label | is_edge, + data::paste( level::transform(label | is_edge, colors), temp ); @@ -357,7 +357,7 @@ mln_VAR(lab, label | is_cell); - level::paste(morpho::dilation(extend(lab, label), + data::paste(morpho::dilation(extend(lab, label), c4()), label); Index: geraud/fllt.svg.6.cc --- geraud/fllt.svg.6.cc (revision 3075) +++ geraud/fllt.svg.6.cc (working copy) @@ -43,7 +43,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -219,7 +219,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -262,7 +262,7 @@ if (label == 0) { - level::fill(is_labeled, 0); + data::fill(is_labeled, 0); label++; } @@ -356,7 +356,7 @@ // if (label == 0) // { -// level::fill(is_labeled, 0); +// data::fill(is_labeled, 0); // label++; // } @@ -563,13 +563,13 @@ V g, gN; mln_fwd_piter(I) p(input.domain()); p.start(); - level::fill(smallest_shapes, 0); + data::fill(smallest_shapes, 0); node_type* current_cc; unsigned in_N = 1, in_R = 2; image2d<int> deja_vu(input.domain().to_larger(1)); - level::fill(deja_vu, 0); + data::fill(deja_vu, 0); typedef p_array<P> arr_t; arr_t* A = new arr_t(); @@ -993,7 +993,7 @@ const I& input = exact(input_); image2d<bool> ima(input.domain()); - level::fill(ima, false); + data::fill(ima, false); compute_area_rec(tree.root(), ima); } @@ -1006,7 +1006,7 @@ fllt_tree(P, V) subtree(node); fllt_branch_iter_ind(P, V) s(fllt_branch(P, V)(subtree, *node)); for_all(s) - level::fill(output | (*s).elt().points), (*s).elt().value); + data::fill(output | (*s).elt().points), (*s).elt().value); } void area_filter(image2d<value::int_u8>& output, @@ -1018,7 +1018,7 @@ typedef point2d P ; typedef value::int_u8 V; - level::fill(output, bg); + data::fill(output, bg); fllt_tree(P, V) subtree(node); fllt_branch_iter_ind(P, V) s(fllt_branch(P, V)(subtree, *node)); for_all(s) @@ -1040,7 +1040,7 @@ } accu += (*node).elt().nsites; - level::fill(output | (*node).elt().points), g); + data::fill(output | (*node).elt().points), g); for (int i = 0; i < node->children().size();i++) area_filter_min(output, node->children()[i], min_area, g, accu); @@ -1125,7 +1125,7 @@ // image2d<int> lena_(make::image2d(vs)); // image2d<int_u8> lena(lena_.domain()); -// level::fill(lena, lena_); +// data::fill(lena, lena_); tree_type tree = my::fllt(lena); compute_area(lena, tree); Index: geraud/cs2d/cs2d.cc --- geraud/cs2d/cs2d.cc (revision 3075) +++ geraud/cs2d/cs2d.cc (working copy) @@ -8,8 +8,8 @@ # include <mln/io/pgm/save.hh> # include <mln/io/ppm/save.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/morpho/dilation.hh> # include <mln/morpho/meyer_wst.hh> @@ -66,11 +66,11 @@ cs2d<int_u8, int_u8, int_u8> cs(lena.domain()); fill_cells_with(cs, lena); - level::fill(cs.vertex, 0); + data::fill(cs.vertex, 0); cmorpho::dbl_neighb2d nbh_g; nbh_g.insert_odd(up).insert_even(left); - level::paste(cmorpho::gradient(cs.edge, nbh_g), + data::paste(cmorpho::gradient(cs.edge, nbh_g), cs.edge); // io::pgm::save(cs.impl, "grad.pgm"); @@ -79,18 +79,18 @@ usage(argv); if (lambda != 0) - level::paste(morpho::closing_area(cs.edge, nbh_e, lambda), cs.edge); + data::paste(morpho::closing_area(cs.edge, nbh_e, lambda), cs.edge); cs2d<int_u8, bool, bool> cs_(lena.domain()); - level::fill(cs_.impl, false); + data::fill(cs_.impl, false); fill_cells_with(cs_, lena); unsigned l; - level::fill(cs_.edge, + data::fill(cs_.edge, pw::value(cmorpho::meyer_wst(cs.edge, nbh_e, l)) == pw::cst(0)); std::cout << "l = " << l << std::endl; - level::paste(morpho::dilation(cs_.vertex, + data::paste(morpho::dilation(cs_.vertex, convert::to_window(c4())), cs_.vertex); @@ -103,7 +103,7 @@ std::vector<int_u8> v(l + 1); accu::compute<accu::mean>(cs_.cell, label, v); - level::fill(cs_.cell, level::transform(label, v)); + data::fill(cs_.cell, level::transform(label, v)); io::pgm::save(cell_image(cs_), argv[3]); // io::ppm::save(pack(cs_, colorize, 7), "log.ppm"); Index: geraud/cs2d/tuto.cc --- geraud/cs2d/tuto.cc (revision 3075) +++ geraud/cs2d/tuto.cc (working copy) @@ -7,8 +7,8 @@ # include <mln/debug/println.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/morpho/dilation.hh> @@ -54,7 +54,7 @@ { image2d<char> ima(3, 5); - level::fill(ima, 'o'); + data::fill(ima, 'o'); debug::println(ima); // o o o o o @@ -66,9 +66,9 @@ // // o o o - level::fill((ima | is_cell).rw(), 'c'); - level::fill((ima | is_edge).rw(), 'e'); - level::fill((ima | is_point).rw(), 'p'); + data::fill((ima | is_cell).rw(), 'c'); + data::fill((ima | is_edge).rw(), 'e'); + data::fill((ima | is_point).rw(), 'p'); debug::println(ima); // c e c e c @@ -79,13 +79,13 @@ { image2d<int> ima(3, 5); - level::fill(ima, 0); + data::fill(ima, 0); debug::println(ima); // 0 0 0 0 0 // 0 0 0 0 0 // 0 0 0 0 0 - level::fill((ima | is_cell).rw(), fun::p2v::iota); + data::fill((ima | is_cell).rw(), fun::p2v::iota); debug::println(ima | is_cell); // 1 2 3 // @@ -125,7 +125,7 @@ // En revanche, rien n'empêche de "coller" le résultat d'un // traitement dans l'image d'entrée : - level::paste(morpho::dilation(ima | is_edge, c4), ima); + data::paste(morpho::dilation(ima | is_edge, c4), ima); // Maintenant, le dilaté de "ima restreint à edge" est collé dans // 'ima' : @@ -135,7 +135,7 @@ // 4 0 5 0 6 // 4 5 5 6 6 - level::paste(morpho::dilation(ima | is_point, c4), ima); + data::paste(morpho::dilation(ima | is_point, c4), ima); debug::println(ima); // 1 2 2 3 3 // 4 5 5 6 6 Index: geraud/cs2d/kruskal.cc --- geraud/cs2d/kruskal.cc (revision 3075) +++ geraud/cs2d/kruskal.cc (working copy) @@ -12,8 +12,8 @@ # include <mln/debug/println.hh> # include <mln/debug/iota.hh> # include <mln/fun/p2v/iota.hh> -# include <mln/level/paste.hh> -# include <mln/level/fill.hh> +# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/morpho/gradient.hh> # include <mln/morpho/meyer_wst.hh> @@ -120,7 +120,7 @@ box2d b(nrows * clen + 3 * (nrows - 1), ncols * clen + 3 * (ncols - 1)); image2d<value::rgb8> output(b); - level::fill(output, literal::black); + data::fill(output, literal::black); // 0 1 2 3 4 @@ -271,7 +271,7 @@ } mln_VAR(edge, ima | is_edge); - level::paste(morpho::gradient(edge, nbh_e2c), edge); + data::paste(morpho::gradient(edge, nbh_e2c), edge); // ^^^^^^^ // edge -> neighboring cells @@ -285,7 +285,7 @@ // Aux data. mln_ch_value_(edge_t, bool) T; initialize(T, edge); - level::fill(T, false); + data::fill(T, false); mln_ch_value_(cell_t, point2d) DS; initialize(DS, cell); Index: geraud/cs2d/cs2d_utils.hh --- geraud/cs2d/cs2d_utils.hh (revision 3075) +++ geraud/cs2d/cs2d_utils.hh (working copy) @@ -4,7 +4,7 @@ # include <mln/literal/white.hh> # include <mln/literal/colors.hh> # include <mln/win/rectangle2d.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> namespace mln @@ -151,7 +151,7 @@ box2d b(cs.nrows() * clen + 3 * (cs.nrows() - 1), cs.ncols() * clen + 3 * (cs.ncols() - 1)); image2d<R> output(b); - level::fill(output, literal::black); + data::fill(output, literal::black); // Cells. mln_piter(Cs::cell_t) c(cs.cell.domain()); Index: geraud/fllt/fllt.hh --- geraud/fllt/fllt.hh (revision 3075) +++ geraud/fllt/fllt.hh (working copy) @@ -45,8 +45,8 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> -#include <mln/level/paste.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> #include <mln/level/stretch.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> @@ -207,7 +207,7 @@ //std::cout << " Save in " << filename.str() << std::endl; image2d<value::int_u8> out(is.domain());// = clone(cast_image<value::int_u8>(is)); - level::fill(out, 0); + data::fill(out, 0); mln_assertion(R_box.nsites() > 0); mln_piter_(box2d) p(R_box); for_all(p) @@ -234,7 +234,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -276,7 +276,7 @@ if (label == 0) { - level::fill(is_labeled, 0); + data::fill(is_labeled, 0); label++; } @@ -595,13 +595,13 @@ V g, gN; mln_fwd_piter(I) p(input.domain()); p.start(); - level::fill(smallest_shapes, 0); + data::fill(smallest_shapes, 0); node_type* current_cc; unsigned in_N = 1, in_R = 2; image2d<int> deja_vu(input.domain().to_larger(1)); - level::fill(deja_vu, 0); + data::fill(deja_vu, 0); typedef p_array<P> arr_t; arr_t* A = new arr_t(); Index: geraud/fllt/simple_tests.cc --- geraud/fllt/simple_tests.cc (revision 3075) +++ geraud/fllt/simple_tests.cc (working copy) @@ -77,7 +77,7 @@ image2d<int> lena_(make::image2d(vs)); image2d<int_u8> lena(lena_.domain()); - level::fill(lena, lena_); + data::fill(lena, lena_); tree_type tree = fllt(lena); draw_tree(lena, tree); Index: geraud/fllt/fllt.svg.1.cc --- geraud/fllt/fllt.svg.1.cc (revision 3075) +++ geraud/fllt/fllt.svg.1.cc (working copy) @@ -37,7 +37,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> @@ -73,7 +73,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -137,7 +137,7 @@ step_2: { R_box.init(); - level::fill(is, in_O); + data::fill(is, in_O); A.append(x0); } Index: geraud/fllt/fllt.svg.7.hh --- geraud/fllt/fllt.svg.7.hh (revision 3075) +++ geraud/fllt/fllt.svg.7.hh (working copy) @@ -49,7 +49,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -219,7 +219,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -261,7 +261,7 @@ if (label == 0) { - level::fill(is_labeled, 0); + data::fill(is_labeled, 0); label++; } @@ -480,13 +480,13 @@ V g, gN; mln_fwd_piter(I) p(input.domain()); p.start(); - level::fill(smallest_shapes, 0); + data::fill(smallest_shapes, 0); node_type* current_cc; unsigned in_N = 1, in_R = 2; image2d<int> deja_vu(input.domain().to_larger(1)); - level::fill(deja_vu, 0); + data::fill(deja_vu, 0); typedef p_array<P> arr_t; arr_t* A = new arr_t(); Index: geraud/fllt/fllt_tree_to_image.hh --- geraud/fllt/fllt_tree_to_image.hh (revision 3075) +++ geraud/fllt/fllt_tree_to_image.hh (working copy) @@ -9,7 +9,7 @@ void fllt_tree_to_image_(I& output, fllt_node(point2d, value::int_u8)* node) { - level::fill((output | node->elt().points).rw(), node->elt().value); + data::fill((output | node->elt().points).rw(), node->elt().value); for (int i = 0; i < node->children().size(); i++) fllt_tree_to_image_(output, node->children()[i]); Index: geraud/fllt/fllt.svg.2.cc --- geraud/fllt/fllt.svg.2.cc (revision 3075) +++ geraud/fllt/fllt.svg.2.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> @@ -115,7 +115,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -187,7 +187,7 @@ // Step 2. step_2: { - level::fill(is, in_O); + data::fill(is, in_O); // R <- 0 R_box.init(); R.clear(); Index: geraud/fllt/fllt.svg.3.cc --- geraud/fllt/fllt.svg.3.cc (revision 3075) +++ geraud/fllt/fllt.svg.3.cc (working copy) @@ -39,7 +39,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> @@ -116,7 +116,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -163,7 +163,7 @@ image2d<unsigned char> is(input.domain()); const unsigned in_R = 1, in_N = 2, in_A = 3, in_O = 0; - level::fill(is, in_O); + data::fill(is, in_O); typedef p_array<mln_point(I)> arr_t; arr_t A; @@ -192,7 +192,7 @@ { // R <- 0 and N <- 0 if (N_box.is_valid() != 0) - level::fill((is | N_box.to_result()).rw(), in_O); + data::fill((is | N_box.to_result()).rw(), in_O); clear_N(N); N_box.init(); Index: geraud/fllt/fllt.svg.4.cc --- geraud/fllt/fllt.svg.4.cc (revision 3075) +++ geraud/fllt/fllt.svg.4.cc (working copy) @@ -39,7 +39,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -118,7 +118,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -165,10 +165,10 @@ // image2d<unsigned char> is(input.domain()); // const unsigned in_R = 1, in_N = 2, in_A = 3, in_O = 0; -// level::fill(is, in_O); +// data::fill(is, in_O); image2d<bool> deja_vu(input.domain()); - level::fill(deja_vu, false); + data::fill(deja_vu, false); typedef p_array<mln_point(I)> arr_t; arr_t A; @@ -198,8 +198,8 @@ // R <- 0 and N <- 0 if (N_box.is_valid() != 0) { -// level::fill((is | N_box.to_result()).rw(), in_O); - level::fill(deja_vu | N_box.to_result()), false); +// data::fill((is | N_box.to_result()).rw(), in_O); + data::fill(deja_vu | N_box.to_result()), false); } clear_N(N); N_box.init(); @@ -299,7 +299,7 @@ for (unsigned i = 0; i < 256; ++i) if (N[i].nsites()) - level::fill(deja_vu | N[i]), false); + data::fill(deja_vu | N[i]), false); // { // mln_piter(arr_t) p(N[i]); // for_all(p) Index: geraud/fllt/fllt.svg.5.cc --- geraud/fllt/fllt.svg.5.cc (revision 3075) +++ geraud/fllt/fllt.svg.5.cc (working copy) @@ -39,7 +39,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -118,7 +118,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -165,10 +165,10 @@ // image2d<unsigned char> is(input.domain()); // const unsigned in_R = 1, in_N = 2, in_A = 3, in_O = 0; -// level::fill(is, in_O); +// data::fill(is, in_O); image2d<bool> deja_vu(input.domain()); - level::fill(deja_vu, false); + data::fill(deja_vu, false); typedef p_array<mln_point(I)> arr_t; arr_t* A = new arr_t(); @@ -200,8 +200,8 @@ // R <- 0 and N <- 0 if (N_box.is_valid() != 0) { -// level::fill((is | N_box.to_result()).rw(), in_O); - level::fill(deja_vu | N_box.to_result()), false); +// data::fill((is | N_box.to_result()).rw(), in_O); + data::fill(deja_vu | N_box.to_result()), false); } clear_N(N); N_box.init(); @@ -305,7 +305,7 @@ for (unsigned i = 0; i < 256; ++i) if (N[i]->nsites()) - level::fill(deja_vu | *N[i]), false); + data::fill(deja_vu | *N[i]), false); // mln_invariant(deja_vu == ((pw::value(is) == pw::cst(in_R)) | input.domain())); Index: geraud/fllt/fllt.svg.6.cc --- geraud/fllt/fllt.svg.6.cc (revision 3075) +++ geraud/fllt/fllt.svg.6.cc (working copy) @@ -43,7 +43,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -216,7 +216,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -259,7 +259,7 @@ if (label == 0) { - level::fill(is_labeled, 0); + data::fill(is_labeled, 0); label++; } @@ -353,7 +353,7 @@ // if (label == 0) // { -// level::fill(is_labeled, 0); +// data::fill(is_labeled, 0); // label++; // } @@ -560,13 +560,13 @@ V g, gN; mln_fwd_piter(I) p(input.domain()); p.start(); - level::fill(smallest_shapes, 0); + data::fill(smallest_shapes, 0); node_type* current_cc; unsigned in_N = 1, in_R = 2; image2d<int> deja_vu(input.domain().to_larger(1)); - level::fill(deja_vu, 0); + data::fill(deja_vu, 0); typedef p_array<P> arr_t; arr_t* A = new arr_t(); @@ -990,7 +990,7 @@ const I& input = exact(input_); image2d<bool> ima(input.domain()); - level::fill(ima, false); + data::fill(ima, false); compute_area_rec(tree.root(), ima); } @@ -1003,7 +1003,7 @@ fllt_tree(P, V) subtree(node); fllt_branch_iter_ind(P, V) s(fllt_branch(P, V)(subtree, *node)); for_all(s) - level::fill(output | (*s).elt().points), (*s).elt().value); + data::fill(output | (*s).elt().points), (*s).elt().value); } void area_filter(image2d<value::int_u8>& output, @@ -1015,7 +1015,7 @@ typedef point2d P ; typedef value::int_u8 V; - level::fill(output, bg); + data::fill(output, bg); fllt_tree(P, V) subtree(node); fllt_branch_iter_ind(P, V) s(fllt_branch(P, V)(subtree, *node)); for_all(s) @@ -1037,7 +1037,7 @@ } accu += (*node).elt().nsites; - level::fill(output | (*node).elt().points), g); + data::fill(output | (*node).elt().points), g); for (int i = 0; i < node->children().size();i++) area_filter_min(output, node->children()[i], min_area, g, accu); @@ -1122,7 +1122,7 @@ // image2d<int> lena_(make::image2d(vs)); // image2d<int_u8> lena(lena_.domain()); -// level::fill(lena, lena_); +// data::fill(lena, lena_); tree_type tree = my::fllt(lena); compute_area(lena, tree); Index: geraud/fllt/connected_filters/area_filter.hh --- geraud/fllt/connected_filters/area_filter.hh (revision 3075) +++ geraud/fllt/connected_filters/area_filter.hh (working copy) @@ -38,7 +38,7 @@ const I& input = exact(input_); image2d<bool> ima(input.domain()); - level::fill(ima, false); + data::fill(ima, false); compute_area_rec(tree.root(), ima); } Index: geraud/fllt/fllt_test.hh --- geraud/fllt/fllt_test.hh (revision 3075) +++ geraud/fllt/fllt_test.hh (working copy) @@ -45,7 +45,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -231,7 +231,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -273,7 +273,7 @@ if (label == 0) { - level::fill(is_labeled, 0); + data::fill(is_labeled, 0); label++; } @@ -472,11 +472,11 @@ p_array<P> tmp; image2d<bool> ima(input.domain().to_larger(1)); - level::fill(ima, false); + data::fill(ima, false); fllt_branch_iter(P, V) n(*child); for_all(n) - level::fill((ima | (*n).elt().points).rw(), true); + data::fill((ima | (*n).elt().points).rw(), true); tmp.append((*n).elt().points); @@ -509,13 +509,13 @@ V g, gN; mln_fwd_piter(I) p(input.domain()); p.start(); - level::fill(smallest_shapes, 0); + data::fill(smallest_shapes, 0); node_type* current_cc; unsigned in_N = 1, in_R = 2; image2d<int> deja_vu(input.domain().to_larger(1)); - level::fill(deja_vu, 0); + data::fill(deja_vu, 0); typedef p_array<P> arr_t; arr_t* A = new arr_t(); Index: geraud/fllt.svg.7.hh --- geraud/fllt.svg.7.hh (revision 3075) +++ geraud/fllt.svg.7.hh (working copy) @@ -47,7 +47,7 @@ #include <mln/io/pgm/save.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> @@ -218,7 +218,7 @@ using value::rgb8; image2d<rgb8> temp(is.domain()); - level::fill(temp, literal::black); + data::fill(temp, literal::black); mln_piter(I) p(is.domain()); for_all(p) @@ -260,7 +260,7 @@ if (label == 0) { - level::fill(is_labeled, 0); + data::fill(is_labeled, 0); label++; } @@ -472,13 +472,13 @@ V g, gN; mln_fwd_piter(I) p(input.domain()); p.start(); - level::fill(smallest_shapes, 0); + data::fill(smallest_shapes, 0); node_type* current_cc; unsigned in_N = 1, in_R = 2; image2d<int> deja_vu(input.domain().to_larger(1)); - level::fill(deja_vu, 0); + data::fill(deja_vu, 0); typedef p_array<P> arr_t; arr_t* A = new arr_t(); Index: geraud/Rd/queue_based.hh --- geraud/Rd/queue_based.hh (revision 3075) +++ geraud/Rd/queue_based.hh (working copy) @@ -47,7 +47,7 @@ { mln_ch_value(I, bool) que(f.domain()); - level::fill(que, false); + data::fill(que, false); if (echo) std::cout << std::endl; Index: geraud/Rd/union_find.hh --- geraud/Rd/union_find.hh (revision 3075) +++ geraud/Rd/union_find.hh (working copy) @@ -68,9 +68,9 @@ // init - level::fill(deja_vu, false); + data::fill(deja_vu, false); S = histo_reverse_sort(g); - level::paste(f, o); // Replace: for all p, make_set(p) { data(p) = f(p) } + data::paste(f, o); // Replace: for all p, make_set(p) { data(p) = f(p) } // first pass Index: geraud/Rd/parallel.hh --- geraud/Rd/parallel.hh (revision 3075) +++ geraud/Rd/parallel.hh (working copy) @@ -57,7 +57,7 @@ bool stability; do { - level::paste(o, o_); // memorisation + data::paste(o, o_); // memorisation // opere for_all(p) Index: geraud/Rd/utils.hh --- geraud/Rd/utils.hh (revision 3075) +++ geraud/Rd/utils.hh (working copy) @@ -35,8 +35,8 @@ # include <mln/util/ord.hh> -# include <mln/level/fill_with_value.hh> -# include <mln/level/paste.hh> +# include <mln/data/fill_with_value.hh> +# include <mln/data/paste.hh> # include <mln/level/compare.hh> @@ -188,7 +188,7 @@ // init - level::fill_with_value(deja_vu, false); + data::fill_with_value(deja_vu, false); S = histo_reverse_sort(f); // first pass Index: geraud/Rd/sequential_bench.hh --- geraud/Rd/sequential_bench.hh (revision 3075) +++ geraud/Rd/sequential_bench.hh (working copy) @@ -62,7 +62,7 @@ { ++nloops; - level::paste(o, o_); // memorisation + data::paste(o, o_); // memorisation // passe 1 { Index: geraud/Rd/sequential.hh --- geraud/Rd/sequential.hh (revision 3075) +++ geraud/Rd/sequential.hh (working copy) @@ -53,7 +53,7 @@ bool stability; do { - level::paste(o, o_); // memorisation + data::paste(o, o_); // memorisation // passe 1 { Index: geraud/Rd/debase.union_find.hh --- geraud/Rd/debase.union_find.hh (revision 3075) +++ geraud/Rd/debase.union_find.hh (working copy) @@ -70,7 +70,7 @@ // init std::cout << "0 "; - level::fill(is_proc, false); + data::fill(is_proc, false); S = histo_reverse_sort(g); // first pass @@ -91,7 +91,7 @@ // second pass std::cout << "2 "; - level::fill(is_proc, false); + data::fill(is_proc, false); for (int i = S.size() - 1; i >= 0; --i) { point p = S[i]; Index: geraud/dmap.cc --- geraud/dmap.cc (revision 3075) +++ geraud/dmap.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/w_window2d_int.hh> #include <mln/debug/println.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/stretch.hh> #include <mln/accu/max.hh> #include <mln/io/pbm/load.hh> @@ -107,7 +107,7 @@ const unsigned n = 9; image2d<bool> ima(n, n); - level::fill(ima, false); + data::fill(ima, false); opt::at(ima, n / 2, n / 2) = true; // int ws[] = { 3, 2, 3, Index: geraud/compute_parent_more.hh --- geraud/compute_parent_more.hh (revision 3075) +++ geraud/compute_parent_more.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> namespace mln @@ -90,7 +90,7 @@ S roots; // Initialization. - level::fill(deja_vu, false); + data::fill(deja_vu, false); unsigned nnodes = 0; // Body. Index: geraud/tufa_2008/steps.0.cc --- geraud/tufa_2008/steps.0.cc (revision 3075) +++ geraud/tufa_2008/steps.0.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> @@ -93,7 +93,7 @@ for_all(p) par(p) = p; initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); } // First pass. Index: geraud/tufa_2008/steps.1.cc --- geraud/tufa_2008/steps.1.cc (revision 3075) +++ geraud/tufa_2008/steps.1.cc (working copy) @@ -43,7 +43,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> @@ -100,7 +100,7 @@ // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); // labels mln_ch_value(I, unsigned) regmin = labeling::regional_minima(a, nbh, Index: geraud/tufa_2008/steps.2.cc --- geraud/tufa_2008/steps.2.cc (revision 3075) +++ geraud/tufa_2008/steps.2.cc (working copy) @@ -43,7 +43,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> @@ -105,7 +105,7 @@ // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); // labels mln_ch_value(I, unsigned) regmin = labeling::regional_minima(a, nbh, Index: geraud/tufa_2008/steps.3.cc --- geraud/tufa_2008/steps.3.cc (revision 3075) +++ geraud/tufa_2008/steps.3.cc (working copy) @@ -43,7 +43,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> @@ -101,7 +101,7 @@ // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); // labels mln_ch_value(I, unsigned) regmin = labeling::regional_minima(a, nbh, Index: geraud/tufa_2008/steps.2b.cc --- geraud/tufa_2008/steps.2b.cc (revision 3075) +++ geraud/tufa_2008/steps.2b.cc (working copy) @@ -43,7 +43,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> @@ -100,7 +100,7 @@ // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); // labels mln_ch_value(I, unsigned) regmin = labeling::regional_minima(a, nbh, Index: geraud/tufa_2008/compute_a.cc --- geraud/tufa_2008/compute_a.cc (revision 3075) +++ geraud/tufa_2008/compute_a.cc (working copy) @@ -37,8 +37,8 @@ #include <mln/core/site_set/p_array.hh> #include <mln/level/sort_psites.hh> -#include <mln/level/fill.hh> -#include <mln/level/paste.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> #include <mln/level/compare.hh> #include <mln/morpho/tree/data.hh> @@ -109,11 +109,11 @@ // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); // flag initialize(flag, f); - level::fill(flag, true); + data::fill(flag, true); // attr initialize(attr, f); @@ -191,7 +191,7 @@ mln_ch_value(I, mln_result(A)) a; initialize(a, f); - level::paste(attr, a); + data::paste(attr, a); // Finalization. { @@ -250,7 +250,7 @@ image2d<bool> seen; initialize(seen, f); - level::fill(seen, false); + data::fill(seen, false); s = level::sort_psites_increasing(a); mln_bkd_piter(S) p(s); @@ -305,11 +305,11 @@ // for_all(p) // par(p) = p; // initialize(deja_vu, f); -// level::fill(deja_vu, false); +// data::fill(deja_vu, false); // // flag // initialize(flag, f); -// level::fill(flag, true); +// data::fill(flag, true); // } Index: geraud/tufa_2008/n_cmpt.cc --- geraud/tufa_2008/n_cmpt.cc (revision 3075) +++ geraud/tufa_2008/n_cmpt.cc (working copy) @@ -36,7 +36,7 @@ #include <mln/debug/iota.hh> #include <mln/labeling/regional_minima.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> @@ -97,7 +97,7 @@ // init fused image mln_ch_value(I, bool) fused; initialize(fused, attr); - mln::level::fill(fused, false); + mln::data::fill(fused, false); // prepare union find typedef mln_psite(I) P; @@ -105,7 +105,7 @@ //deja_vu mln_ch_value(I, bool) deja_vu; initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); //parent mln_ch_value(I, P) parent(attr.domain()); Index: geraud/tufa_2008/experiment.cc --- geraud/tufa_2008/experiment.cc (revision 3075) +++ geraud/tufa_2008/experiment.cc (working copy) @@ -50,7 +50,7 @@ #include <mln/morpho/opening.hh> #include <mln/morpho/closing_area.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/level/transform.hh> #include <mln/level/stretch.hh> Index: geraud/tufa_2008/filter.cc --- geraud/tufa_2008/filter.cc (revision 3075) +++ geraud/tufa_2008/filter.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/level/sort_psites.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> @@ -81,7 +81,7 @@ for_all(p) par(p) = p; initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); } // First pass. Index: geraud/tufa_2008/fz_count.cc --- geraud/tufa_2008/fz_count.cc (revision 3075) +++ geraud/tufa_2008/fz_count.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/labeling/flat_zones.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> @@ -94,7 +94,7 @@ // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); } // First pass. Index: geraud/tufa_2008/regmin_count.cc --- geraud/tufa_2008/regmin_count.cc (revision 3075) +++ geraud/tufa_2008/regmin_count.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/labeling/flat_zones.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/opt/at.hh> @@ -96,11 +96,11 @@ // flag initialize(flag, f); - level::fill(flag, true); + data::fill(flag, true); // deja_vu initialize(deja_vu, f); - level::fill(deja_vu, false); + data::fill(deja_vu, false); } // First pass. Index: geraud/laurent/classif.cc --- geraud/laurent/classif.cc (revision 3075) +++ geraud/laurent/classif.cc (working copy) @@ -54,7 +54,7 @@ #include <mln/core/image/complex_neighborhood_piter.hh> #include <mln/debug/iota.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/norm/l2.hh> #include <mln/morpho/closing_area.hh> @@ -170,14 +170,14 @@ std::cout << "n seeds = " << nlabels << std::endl; { image2d<int_u8> lab(label.domain()); - level::paste(label, lab); + data::paste(label, lab); io::pgm::save(lab, "label.pgm"); } image2d<unsigned> iz = influence_zones(label, c4()); { image2d<int_u8> IZ(iz.domain()); - level::paste(iz, IZ); + data::paste(iz, IZ); io::pgm::save(IZ, "iz.pgm"); } // debug::println( (pw::value(iz) - pw::cst(1)) | iz.domain() ); @@ -269,7 +269,7 @@ image2d<int_u8> canvas(seeds.domain()); - level::fill(canvas, 0); + data::fill(canvas, 0); /*---------------------. @@ -288,7 +288,7 @@ // Create and initialize an image based on PC. dist_ima_t dist_ima(pc); - level::fill(dist_ima, 0u); + data::fill(dist_ima, 0u); /*--------------------------------. | Complex-based image iterators. | @@ -400,7 +400,7 @@ image2d<int_u8> canvas_wst(seeds.domain()); - level::fill(canvas_wst, 255); + data::fill(canvas_wst, 255); for_all(e) { Index: vigouroux/yuv/get_blue.hh --- vigouroux/yuv/get_blue.hh (revision 3075) +++ vigouroux/yuv/get_blue.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_yuv.hh" Index: vigouroux/yuv/get_red.hh --- vigouroux/yuv/get_red.hh (revision 3075) +++ vigouroux/yuv/get_red.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "my_yuv.hh" Index: vigouroux/yuv/rgb_to_yuv.hh --- vigouroux/yuv/rgb_to_yuv.hh (revision 3075) +++ vigouroux/yuv/rgb_to_yuv.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include <mln/math/round.hh> Index: vigouroux/yuv/get_green.hh --- vigouroux/yuv/get_green.hh (revision 3075) +++ vigouroux/yuv/get_green.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_yuv.hh" Index: vigouroux/hsi/get_blue.hh --- vigouroux/hsi/get_blue.hh (revision 3075) +++ vigouroux/hsi/get_blue.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_hsi.hh" Index: vigouroux/hsi/get_red.hh --- vigouroux/hsi/get_red.hh (revision 3075) +++ vigouroux/hsi/get_red.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_hsi.hh" Index: vigouroux/hsi/rgb_to_hsi.hh --- vigouroux/hsi/rgb_to_hsi.hh (revision 3075) +++ vigouroux/hsi/rgb_to_hsi.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "my_hsi.hh" Index: vigouroux/hsi/get_green.hh --- vigouroux/hsi/get_green.hh (revision 3075) +++ vigouroux/hsi/get_green.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_hsi.hh" Index: vigouroux/function.hh --- vigouroux/function.hh (revision 3075) +++ vigouroux/function.hh (working copy) @@ -4,7 +4,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include <mln/metal/is_a.hh> Index: vigouroux/tests.cc --- vigouroux/tests.cc (revision 3075) +++ vigouroux/tests.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include "rgb_to_yuv.hh" #include "my_yuv.hh" Index: vigouroux/cmy/rgb_to_cmy.hh --- vigouroux/cmy/rgb_to_cmy.hh (revision 3075) +++ vigouroux/cmy/rgb_to_cmy.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include <mln/math/round.hh> Index: vigouroux/cmy/get_blue.hh --- vigouroux/cmy/get_blue.hh (revision 3075) +++ vigouroux/cmy/get_blue.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_cmy.hh" Index: vigouroux/cmy/fun.hh --- vigouroux/cmy/fun.hh (revision 3075) +++ vigouroux/cmy/fun.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "my_cmy.hh" Index: vigouroux/cmy/get_green.hh --- vigouroux/cmy/get_green.hh (revision 3075) +++ vigouroux/cmy/get_green.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_cmy.hh" Index: vigouroux/xyz/rgb_to_xyz.hh --- vigouroux/xyz/rgb_to_xyz.hh (revision 3075) +++ vigouroux/xyz/rgb_to_xyz.hh (working copy) @@ -7,7 +7,7 @@ # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include "my_xyz.hh" Index: vigouroux/xyz/get_blue.hh --- vigouroux/xyz/get_blue.hh (revision 3075) +++ vigouroux/xyz/get_blue.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_xyz.hh" Index: vigouroux/xyz/get_red.hh --- vigouroux/xyz/get_red.hh (revision 3075) +++ vigouroux/xyz/get_red.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "my_xyz.hh" Index: vigouroux/xyz/get_green.hh --- vigouroux/xyz/get_green.hh (revision 3075) +++ vigouroux/xyz/get_green.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_xyz.hh" Index: vigouroux/yiq/get_blue.hh --- vigouroux/yiq/get_blue.hh (revision 3075) +++ vigouroux/yiq/get_blue.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_yiq.hh" Index: vigouroux/yiq/get_red.hh --- vigouroux/yiq/get_red.hh (revision 3075) +++ vigouroux/yiq/get_red.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "my_yiq.hh" Index: vigouroux/yiq/rgb_to_yiq.hh --- vigouroux/yiq/rgb_to_yiq.hh (revision 3075) +++ vigouroux/yiq/rgb_to_yiq.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include <mln/math/round.hh> Index: vigouroux/yiq/get_green.hh --- vigouroux/yiq/get_green.hh (revision 3075) +++ vigouroux/yiq/get_green.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "../color/my_yiq.hh" Index: vigouroux/conv/getred.hh --- vigouroux/conv/getred.hh (revision 3075) +++ vigouroux/conv/getred.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include <mln/math/round.hh> Index: vigouroux/conv/tored.hh --- vigouroux/conv/tored.hh (revision 3075) +++ vigouroux/conv/tored.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include <mln/math/round.hh> Index: vigouroux/conv/torgb.hh --- vigouroux/conv/torgb.hh (revision 3075) +++ vigouroux/conv/torgb.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include <mln/math/round.hh> Index: vigouroux/conv/rgbto.hh --- vigouroux/conv/rgbto.hh (revision 3075) +++ vigouroux/conv/rgbto.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include <mln/math/round.hh> Index: vigouroux/color/rgb_to_hsl.hh --- vigouroux/color/rgb_to_hsl.hh (revision 3075) +++ vigouroux/color/rgb_to_hsl.hh (working copy) @@ -7,7 +7,7 @@ # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include "my_hsl.hh" Index: vigouroux/color/rgb_to_cmy.hh --- vigouroux/color/rgb_to_cmy.hh (revision 3075) +++ vigouroux/color/rgb_to_cmy.hh (working copy) @@ -4,7 +4,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include "my_cmy.hh" Index: vigouroux/color/rgb_to_xyz.hh --- vigouroux/color/rgb_to_xyz.hh (revision 3075) +++ vigouroux/color/rgb_to_xyz.hh (working copy) @@ -7,7 +7,7 @@ # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include "my_xyz.hh" Index: vigouroux/color/tests.cc --- vigouroux/color/tests.cc (revision 3075) +++ vigouroux/color/tests.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include "rgb_to_yuv.hh" #include "my_yuv.hh" Index: vigouroux/color/rgb_to_hsv.hh --- vigouroux/color/rgb_to_hsv.hh (revision 3075) +++ vigouroux/color/rgb_to_hsv.hh (working copy) @@ -7,7 +7,7 @@ # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> -# include <mln/level/fill.hh> +# include <mln/data/fill.hh> # include "my_hsv.hh" Index: vigouroux/color/rgb_to_yiq.hh --- vigouroux/color/rgb_to_yiq.hh (revision 3075) +++ vigouroux/color/rgb_to_yiq.hh (working copy) @@ -4,7 +4,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include "my_yiq.hh" Index: vigouroux/color/rgb_to_hsi.hh --- vigouroux/color/rgb_to_hsi.hh (revision 3075) +++ vigouroux/color/rgb_to_hsi.hh (working copy) @@ -7,7 +7,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/math/round.hh> #include "my_hsi.hh" Index: vigouroux/color/rgb_to_yuv.hh --- vigouroux/color/rgb_to_yuv.hh (revision 3075) +++ vigouroux/color/rgb_to_yuv.hh (working copy) @@ -4,7 +4,7 @@ #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/value/int_u.hh> #include "my_yuv.hh" Index: folio/test/psn.cc --- folio/test/psn.cc (revision 3075) +++ folio/test/psn.cc (working copy) @@ -153,7 +153,7 @@ #include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> @@ -175,7 +175,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}; - level::fill(ima, vals); + data::fill(ima, vals); image2d<bool> msk(5,5); bool rest[] = { 1, 0, 1, 1, 1, @@ -183,7 +183,7 @@ 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1}; - level::fill(msk, rest); + data::fill(msk, rest); int ws[] = { 2, 1, 2, 1, 0, 1, Index: folio/test/psn_log.cc --- folio/test/psn_log.cc (revision 3075) +++ folio/test/psn_log.cc (working copy) @@ -240,7 +240,7 @@ #include <iostream> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> @@ -267,13 +267,13 @@ bool vals[] = { 1, 0, 0, 0, 0, 0, 0, 0, 0}; - level::fill(ima, vals); + data::fill(ima, vals); image2d<bool> msk(3,3); bool rest[] = { 1, 0, 1, 1, 0, 1, 1, 1, 1}; - level::fill(msk, rest); + data::fill(msk, rest); image2d<unsigned> out; out = dt::psn(ima | pw::value(msk), c4()); Index: folio/test/naive.cc --- folio/test/naive.cc (revision 3075) +++ folio/test/naive.cc (working copy) @@ -115,7 +115,7 @@ #include <iostream> #include <mln/debug/println.hh> #include <mln/core/image/image2d.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/fun/v2v/norm.hh> int main() @@ -130,7 +130,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - level::fill(ima, vals); + data::fill(ima, vals); debug::println(ima); typedef fun::v2v::l2_norm< algebra::vec<2,float>, float > L2; Index: folio/test/dt_maze.cc --- folio/test/dt_maze.cc (revision 3075) +++ folio/test/dt_maze.cc (working copy) @@ -7,14 +7,14 @@ #include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/level/stretch.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: folio/test/chamfer.cc --- folio/test/chamfer.cc (revision 3075) +++ folio/test/chamfer.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> @@ -26,7 +26,7 @@ // 0, 0, 0, 0, 0, // 0, 0, 0, 0, 0 }; -// level::fill(ima, vals); +// data::fill(ima, vals); // debug::println(ima); // std::pair<image2d<int>, image2d<mln_point_(image2d<bool>)> > out; Index: folio/test/dt_bench.cc --- folio/test/dt_bench.cc (revision 3075) +++ folio/test/dt_bench.cc (working copy) @@ -7,13 +7,13 @@ #include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> #include <mln/level/stretch.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <mln/value/int_u8.hh> #include <mln/core/image/sub_image.hh> Index: folio/test/dt.cc --- folio/test/dt.cc (revision 3075) +++ folio/test/dt.cc (working copy) @@ -7,13 +7,13 @@ #include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> #include <mln/level/stretch.hh> -#include <mln/level/paste.hh> +#include <mln/data/paste.hh> #include <mln/value/int_u8.hh> #include <mln/core/image/sub_image.hh> @@ -42,7 +42,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}; - level::fill(ima, vals); + data::fill(ima, vals); image2d<bool> msk(5,5); bool rest[] = { 1, 0, 1, 1, 1, @@ -50,7 +50,7 @@ 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1}; - level::fill(msk, rest); + data::fill(msk, rest); int ws[] = { 3, 2, 3, 2, 0, 2, Index: folio/psn.cc --- folio/psn.cc (revision 3075) +++ folio/psn.cc (working copy) @@ -153,7 +153,7 @@ #include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> @@ -175,7 +175,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}; - level::fill(ima, vals); + data::fill(ima, vals); image2d<bool> msk(5,5); bool rest[] = { 1, 0, 1, 1, 1, @@ -183,7 +183,7 @@ 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1}; - level::fill(msk, rest); + data::fill(msk, rest); int ws[] = { 2, 1, 2, 1, 0, 1, Index: folio/psn_log.cc --- folio/psn_log.cc (revision 3075) +++ folio/psn_log.cc (working copy) @@ -240,7 +240,7 @@ #include <iostream> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> @@ -267,13 +267,13 @@ bool vals[] = { 1, 0, 0, 0, 0, 0, 0, 0, 0}; - level::fill(ima, vals); + data::fill(ima, vals); image2d<bool> msk(3,3); bool rest[] = { 1, 0, 1, 1, 0, 1, 1, 1, 1}; - level::fill(msk, rest); + data::fill(msk, rest); image2d<unsigned> out; out = dt::psn(ima | pw::value(msk), c4()); Index: folio/naive.cc --- folio/naive.cc (revision 3075) +++ folio/naive.cc (working copy) @@ -115,7 +115,7 @@ #include <iostream> #include <mln/debug/println.hh> #include <mln/core/image/image2d.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/fun/v2v/norm.hh> int main() @@ -130,7 +130,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - level::fill(ima, vals); + data::fill(ima, vals); debug::println(ima); typedef fun::v2v::l2_norm< algebra::vec<2,float>, float > L2; Index: folio/chamfer.cc --- folio/chamfer.cc (revision 3075) +++ folio/chamfer.cc (working copy) @@ -159,7 +159,7 @@ #include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> @@ -180,7 +180,7 @@ // 0, 0, 0, 0, 0, // 0, 0, 0, 0, 0 }; -// level::fill(ima, vals); +// data::fill(ima, vals); // debug::println(ima); // std::pair<image2d<int>, image2d<mln_point_(image2d<bool>)> > out; Index: folio/dt.cc --- folio/dt.cc (revision 3075) +++ folio/dt.cc (working copy) @@ -7,7 +7,7 @@ #include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> @@ -31,7 +31,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}; - level::fill(ima, vals); + data::fill(ima, vals); image2d<bool> msk(5,5); bool rest[] = { 1, 0, 1, 1, 1, @@ -39,7 +39,7 @@ 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1}; - level::fill(msk, rest); + data::fill(msk, rest); int ws[] = { 2, 1, 2, 1, 0, 1,