https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Move image files in the proper core sub-directory. Move image files from mln/core/ to mln/core/image/. * mln/core/bgraph_image.hh, * mln/core/bgraph_psite.hh, * mln/core/cast_image.hh, * mln/core/decorated_image.hh, * mln/core/fi_adaptor.hh, * mln/core/graph_elt_neighborhood.hh, * mln/core/graph_elt_window.hh, * mln/core/graph_image.hh, * mln/core/graph_neighborhood_piter.hh, * mln/core/graph_psite.hh, * mln/core/graph_window_piter.hh, * mln/core/hexa.hh, * mln/core/hexa_piter.hh, * mln/core/image1d.hh, * mln/core/image2d.hh, * mln/core/image2d_h.hh, * mln/core/image3d.hh, * mln/core/image_if.hh, * mln/core/inplace.hh, * mln/core/interpolated.hh, * mln/core/line_graph_elt_neighborhood.hh, * mln/core/line_graph_elt_window.hh, * mln/core/line_graph_image.hh, * mln/core/line_graph_neighborhood_piter.hh, * mln/core/line_graph_psite.hh, * mln/core/line_graph_window_piter.hh, * mln/core/mono_obased_rle_encode.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_encode.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_encode.hh, * mln/core/obased_rle_image.hh, * mln/core/plain.hh, * mln/core/rle_encode.hh, * mln/core/rle_image.hh, * mln/core/safe.hh, * mln/core/sparse_encode.hh, * mln/core/sparse_image.hh, * mln/core/sub_image.hh, * mln/core/t_image.hh, * mln/core/tr_image.hh, * mln/core/tr_mesh.hh, * mln/core/translate_image.hh, * mln/core/value_enc_image.hh, * mln/core/value_encode.hh: Rename as... * mln/core/image/bgraph_image.hh, * mln/core/image/bgraph_psite.hh, * mln/core/image/cast_image.hh, * mln/core/image/decorated_image.hh, * mln/core/image/fi_adaptor.hh, * mln/core/image/graph_elt_neighborhood.hh, * mln/core/image/graph_elt_window.hh, * mln/core/image/graph_image.hh, * mln/core/image/graph_neighborhood_piter.hh, * mln/core/image/graph_psite.hh, * mln/core/image/graph_window_piter.hh, * mln/core/image/hexa.hh, * mln/core/image/hexa_piter.hh, * mln/core/image/image1d.hh, * mln/core/image/image2d.hh, * mln/core/image/image2d_h.hh, * mln/core/image/image3d.hh, * mln/core/image/image_if.hh, * mln/core/image/inplace.hh, * mln/core/image/interpolated.hh, * mln/core/image/line_graph_elt_neighborhood.hh, * mln/core/image/line_graph_elt_window.hh, * mln/core/image/line_graph_image.hh, * mln/core/image/line_graph_neighborhood_piter.hh, * mln/core/image/line_graph_psite.hh, * mln/core/image/line_graph_window_piter.hh, * mln/core/image/mono_obased_rle_encode.hh, * mln/core/image/mono_obased_rle_image.hh, * mln/core/image/mono_rle_encode.hh, * mln/core/image/mono_rle_image.hh, * mln/core/image/obased_rle_encode.hh, * mln/core/image/obased_rle_image.hh, * mln/core/image/plain.hh, * mln/core/image/rle_encode.hh, * mln/core/image/rle_image.hh, * mln/core/image/safe.hh, * mln/core/image/sparse_encode.hh, * mln/core/image/sparse_image.hh, * mln/core/image/sub_image.hh, * mln/core/image/t_image.hh, * mln/core/image/tr_image.hh, * mln/core/image/tr_mesh.hh, * mln/core/image/translate_image.hh, * mln/core/image/value_enc_image.hh, * mln/core/image/value_encode.hh: ...these. Update guards and includes. * tools/seed2tiling.cc, * tools/area_flooding.cc, * tests/trait/image/images.cc, * tests/trait/ch_value.cc, * tests/debug/iota.cc, * tests/debug/println_with_border.cc, * tests/debug/println.cc, * tests/histo/compute.cc, * tests/histo/to_image1d.cc, * tests/core/graph_elt_neighborhood.cc, * tests/core/image_if_value.cc, * tests/core/window1d.cc, * tests/core/window2d.cc, * tests/core/clock_neighb2d.cc, * tests/core/window3d.cc, * tests/core/graph_image_wst.cc, * tests/core/image_if_interval.cc, * tests/core/bgraph_image.cc, * tests/core/mono_rle_image.cc, * tests/core/pixter2d_more.cc, * tests/core/cast_image.cc, * tests/core/point_set_compatibility.cc, * tests/core/pixter1d.cc, * tests/core/pixter2d.cc, * tests/core/obased_rle_image.cc, * tests/core/pixter3d.cc, * tests/core/graph_image.cc, * tests/core/pixel.cc, * tests/core/pixter3d_more.cc, * tests/core/pset_if.cc, * tests/core/mono_obased_rle_image.cc, * tests/core/sub_image.cc, * tests/core/graph_elt_window.cc, * tests/core/sparse_image.cc, * tests/core/clone.cc, * tests/core/plain.cc, * tests/core/t_image.cc, * tests/core/p_runs.cc, * tests/core/image1d.cc, * tests/core/fi_adaptor.cc, * tests/core/image2d.cc, * tests/core/image3d.cc, * tests/core/image2d_h.cc, * tests/core/clock_test.cc, * tests/core/decorated_image.cc, * tests/core/translate_image.cc, * tests/core/image_if.cc, * tests/core/initialize.cc, * tests/core/line_graph_elt_window.cc, * tests/core/value_enc_image.cc, * tests/core/line_graph_elt_neighborhood.cc, * tests/core/pset_array.cc, * tests/core/line_graph_image.cc, * tests/core/dpoints_pixter.cc, * tests/core/safe_image.cc, * tests/core/pixter1d_more.cc, * tests/core/rle_image.cc, * tests/core/hexa.cc, * tests/core/tr_image.cc, * tests/core/interpolated.cc, * tests/core/line_piter.cc, * tests/neighb/image.cc, * tests/draw/label.cc, * tests/draw/graph.cc, * tests/draw/line.cc, * tests/level/transform_full.cc, * tests/level/median.cc, * tests/level/compute_full.cc, * tests/level/sort_psites_full.cc, * tests/level/median_hline2d.cc, * tests/level/abs.cc, * tests/level/assign_full.cc, * tests/level/apply_full.cc, * tests/level/fill_full.cc, * tests/level/median_fast.cc, * tests/level/compute.cc, * tests/level/sort_psites.cc, * tests/level/assign.cc, * tests/level/approx/median.cc, * tests/level/fill.cc, * tests/level/abs_full.cc, * tests/level/memcpy_.cc, * tests/level/median_dir.cc, * tests/level/stretch_full.cc, * tests/level/paste_full.cc, * tests/level/compare_full.cc, * tests/level/saturate_full.cc, * tests/level/transform.cc, * tests/level/replace.cc, * tests/level/stretch.cc, * tests/level/paste.cc, * tests/level/fill_with_value.cc, * tests/level/naive/median.cc, * tests/level/take.cc, * tests/level/apply.cc, * tests/level/compare.cc, * tests/level/saturate.cc, * tests/level/memset_.cc, * tests/arith/minus.cc, * tests/arith/minus_full.cc, * tests/arith/times.cc, * tests/arith/times_full.cc, * tests/arith/plus.cc, * tests/arith/plus_full.cc, * tests/arith/revert.cc, * tests/arith/revert_full.cc, * tests/linear/convolve.cc, * tests/linear/lap.cc, * tests/linear/log.cc, * tests/linear/line_convolve.cc, * tests/linear/sobel.cc, * tests/linear/local/convolve.cc, * tests/linear/gaussian.cc, * tests/accu/pair.cc, * tests/accu/median.cc, * tests/accu/compute.cc, * tests/accu/mean.cc, * tests/accu/nil.cc, * tests/accu/min.cc, * tests/accu/max.cc, * tests/value/stack.cc, * tests/value/float01.cc, * tests/border/duplicate_full.cc, * tests/border/mirror_full.cc, * tests/border/equalize_full.cc, * tests/border/get_full.cc, * tests/border/resize.cc, * tests/border/find_full.cc, * tests/border/resize_image1d_1.cc, * tests/border/fill_full.cc, * tests/border/resize_image2d_1.cc, * tests/border/resize_image1d_2.cc, * tests/border/duplicate.cc, * tests/border/resize_image1d_3.cc, * tests/border/mirror.cc, * tests/border/resize_image3d_1.cc, * tests/border/resize_image2d_2.cc, * tests/border/resize_image2d_3.cc, * tests/border/resize_image3d_2.cc, * tests/border/adjust_full.cc, * tests/border/resize_image3d_3.cc, * tests/border/resize_sub_image.cc, * tests/border/equalize.cc, * tests/border/get.cc, * tests/border/find.cc, * tests/border/resize_image_if.cc, * tests/border/resize_full.cc, * tests/border/fill.cc, * tests/border/adjust.cc, * tests/test/positive.cc, * tests/convert/to_p_set.cc, * tests/convert/to_tiles.cc, * tests/convert/to_image.cc, * tests/convert/to_window.cc, * tests/estim/mean.cc, * tests/pw/value.cc, * tests/geom/max_sli.cc, * tests/geom/resize.cc, * tests/geom/nrows.cc, * tests/geom/seed2tiling_roundness.cc, * tests/geom/seed2tiling.cc, * tests/geom/min_row.cc, * tests/geom/ninds.cc, * tests/geom/max_row.cc, * tests/geom/min_ind.cc, * tests/geom/ncols.cc, * tests/geom/max_ind.cc, * tests/geom/min_col.cc, * tests/geom/max_col.cc, * tests/geom/nslis.cc, * tests/geom/min_sli.cc, * tests/fun/x2x/rotation.cc, * tests/fun/v2v/rgb_hsi_conversion.cc, * tests/binarization/threshold.cc, * tests/morpho/contrast.cc, * tests/morpho/meyer_wst_long.cc, * tests/morpho/gradient.cc, * tests/morpho/artificial_line_graph_image_wst.cc, * tests/morpho/rank_filter.cc, * tests/morpho/dilation.cc, * tests/morpho/line_graph_image_wst.cc, * tests/morpho/meyer_wst.cc, * tests/morpho/thinning.cc, * tests/morpho/erosion.cc, * tests/morpho/dilation_max_h.cc, * tests/morpho/hit_or_miss.cc, * tests/morpho/combined.cc, * tests/morpho/gradient_elementary.cc, * tests/morpho/laplacian.cc, * tests/morpho/closing_volume.cc, * tests/morpho/closing_area.cc, * tests/morpho/closing_height.cc, * tests/morpho/opening_volume.cc, * tests/morpho/opening_area.cc, * tests/morpho/lena_line_graph_image_wst1.cc, * tests/morpho/opening_height.cc, * tests/morpho/erosion_min_h.cc, * tests/morpho/lena_line_graph_image_wst2.cc, * tests/display/show.cc, * tests/display/save_and_show.cc, * tests/display/color_pretty.cc, * tests/io/pgm/pgm27.cc, * tests/io/pgm/pgm19.cc, * tests/io/pgm/pgm.cc, * tests/io/pgm/pgm16.cc, * tests/io/fits/fits.cc, * tests/io/ppm/ppm.cc, * tests/io/ppm/ppm23.cc, * tests/io/ppm/ppm16.cc, * tests/io/pbm/pbm.cc, * tests/logical/or.cc, * tests/logical/not.cc, * tests/logical/or_full.cc, * tests/logical/and_not.cc, * tests/logical/and.cc, * tests/logical/not_full.cc, * tests/logical/and_not_full.cc, * tests/logical/and_full.cc, * tests/canvas/chamfer.cc, * tests/canvas/browsing/directional.cc, * tests/canvas/browsing/fwd.cc, * tests/canvas/browsing/snake_fwd.cc, * tests/util/tree_to_image.cc, * tests/util/branch_iter_ind.cc, * tests/util/lemmings.cc, * tests/util/tree_fast_to_image.cc, * tests/util/branch_iter.cc, * tests/labeling/regional_maxima.cc, * tests/labeling/background.cc, * tests/labeling/blobs.cc, * tests/labeling/flat_zones.cc, * tests/labeling/level.cc, * tests/labeling/foreground.cc, * tests/labeling/regional_minima.cc, * apps/statues/mesh-segm.cc, * apps/statues/mesh-skel.cc, * doc/tutorial/examples/sub_image.cc, * doc/tutorial/examples/p_line2d.cc, * doc/tutorial/examples/p_array.cc, * doc/tutorial/examples/p_array.2.cc, * doc/tutorial/examples/image_if.cc, * doc/tutorial/examples/p_image.cc, * doc/tutorial/examples/p_queue.cc, * doc/tutorial/examples/image_plain.cc, * doc/tutorial/examples/p_vaccess.cc, * doc/tutorial/examples/window.cc, * doc/tutorial/examples/p_key.cc, * doc/tutorial/examples/p_key.2.cc, * doc/tutorial/examples/image2d.cc, * doc/tutorial/examples/image_safe.cc, * doc/tutorial/examples/proxy.cc, * doc/tutorial/examples/p_run.cc, * doc/tutorial/examples/box.cc, * doc/tutorial/examples/image_flat.cc, * doc/tutorial/examples/p_mutable_array_of.cc, * doc/benchmark/p_runs.cc, * doc/benchmark/image2d.cc, * doc/examples/labeling_algo.cc, * mln/debug/put_word.hh, * mln/core/internal/graph_vicinity_piter.hh, * mln/core/internal/line_graph_vicinity_piter.hh, * mln/core/p_image2d.hh, * mln/core/site_set/p_bgraph.hh, * mln/core/site_set/p_graph_piter.hh, * mln/core/site_set/p_bgraph_piter.hh, * mln/core/site_set/p_line_graph.hh, * mln/core/site_set/p_line_graph_piter.hh, * mln/core/site_set/p_graph.hh, * mln/draw/graph.hh, * mln/level/fill_with_image.hh, * mln/level/replace.hh, * mln/level/paste.hh, * mln/level/fill.spe.hh, * mln/level/fill_with_value.hh, * mln/linear/line_x2_convolve.hh, * mln/accu/count_adjacent_vertices.hh, * mln/accu/rank.hh, * mln/accu/rank_high_quant.hh, * mln/accu/rank_bool.hh, * mln/border/mirror.hh, * mln/make/image1d.hh, * mln/make/image2d.hh, * mln/convert/to_tiles.hh, * mln/convert/to_image.hh, * mln/convert/to_window.hh, * mln/geom/chamfer.hh, * mln/morpho/opening_area_on_vertices.hh, * mln/morpho/line_gradient.hh, * mln/morpho/closing_area_on_vertices.hh, * mln/display/color_pretty.hh, * mln/display/remove.hh, * mln/display/save.hh, * mln/display/show.hh, * mln/io/pfm/load.hh, * mln/io/pgm/load.hh, * mln/io/fits/load.hh, * mln/io/pnm/load.hh, * mln/io/ppm/load.hh, * mln/io/pbm/load.hh, * sandbox/duhamel/main_mesh_image.cc, * sandbox/duhamel/queue_p_priority.cc, * sandbox/duhamel/graph_labeling.hh, * sandbox/duhamel/translate_image.hh, * sandbox/duhamel/slow_seed2tiling.cc, * sandbox/duhamel/labeling_algo.cc, * sandbox/duhamel/main.cc, * sandbox/duhamel/paste.hh, * sandbox/duhamel/color_sub.cc, * sandbox/duhamel/chamfer.cc, * sandbox/duhamel/mem.hh, * sandbox/duhamel/labeling_algo.hh, * sandbox/duhamel/extract_array.cc, * sandbox/duhamel/abr_to_image.cc, * sandbox/duhamel/translate_image.cc, * sandbox/pellegrin/first_test.cc, * sandbox/pellegrin/set/test/p_runs.cc, * sandbox/pellegrin/set/test/pset_if.cc, * sandbox/pellegrin/set/core/p_bgraph.hh, * sandbox/pellegrin/set/core/p_line_graph.hh, * sandbox/pellegrin/set/core/p_graph.hh, * sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc, * sandbox/aroumougame/skeleton/mesh-skel_region.cc, * sandbox/aroumougame/skeleton/miscellenous.hh, * sandbox/aroumougame/skeleton/test.cc, * sandbox/aroumougame/skeleton/test_image2d.cc, * sandbox/aroumougame/skeleton/mesh-skel.cc, * sandbox/aroumougame/skeleton/test_image3d.cc, * sandbox/aroumougame/skeleton/thinning.hh, * sandbox/aroumougame/skeleton/sedt.hh, * sandbox/nivault/rotation.cc, * sandbox/nivault/plugin-gimp/src/build-image.hh, * sandbox/nivault/extract_score.cc, * sandbox/nivault/extract_character.cc, * sandbox/nivault/median.hh, * sandbox/jardonnet/test/reduce.cc, * sandbox/jardonnet/test/icp_ref.cc, * sandbox/jardonnet/test/gaussian.cc, * sandbox/jardonnet/test/icp.cc, * sandbox/jardonnet/test/gaussian_subsampling.cc, * sandbox/jardonnet/test/test.cc, * sandbox/jardonnet/test/type.cc, * sandbox/jardonnet/test/subsampling.cc, * sandbox/jardonnet/registration/chamfer.hh, * sandbox/geraud/fllt/fllt.hh, * sandbox/geraud/fllt/fllt.svg.1.cc, * sandbox/geraud/fllt/fllt.svg.7.hh, * sandbox/geraud/fllt/fllt.svg.2.cc, * sandbox/geraud/fllt/fllt.svg.3.cc, * sandbox/geraud/fllt/fllt.svg.4.cc, * sandbox/geraud/fllt/fllt.svg.5.cc, * sandbox/geraud/fllt/fllt.svg.6.cc, * sandbox/geraud/fllt/fllt_test.hh, * sandbox/geraud/fllt.svg.7.hh, * sandbox/geraud/dmap.cc, * sandbox/geraud/fllt.svg.6.cc, * sandbox/geraud/win_fun.cc, * sandbox/geraud/irm.cc, * sandbox/geraud/cs2d/tuto.cc, * sandbox/geraud/cs2d/kruskal.cc, * sandbox/geraud/cs2d/dbl_neighb.cc, * sandbox/geraud/cs2d/cs2d.hh, * sandbox/geraud/cs2d/tuto_bis.cc, * sandbox/geraud/max_tree_nnodes.cc, * sandbox/vigouroux/yuv/test.cc, * sandbox/vigouroux/yuv/get_blue.hh, * sandbox/vigouroux/yuv/get_red.hh, * sandbox/vigouroux/yuv/testfun.cc, * sandbox/vigouroux/yuv/rgb_to_yuv.hh, * sandbox/vigouroux/yuv/get_green.hh, * sandbox/vigouroux/hsi/get_blue.hh, * sandbox/vigouroux/hsi/get_red.hh, * sandbox/vigouroux/hsi/rgb_to_hsi.hh, * sandbox/vigouroux/hsi/get_green.hh, * sandbox/vigouroux/function.hh, * sandbox/vigouroux/tests.cc, * sandbox/vigouroux/cmy/rgb_to_cmy.hh, * sandbox/vigouroux/cmy/test.cc, * sandbox/vigouroux/cmy/get_blue.hh, * sandbox/vigouroux/cmy/fun.hh, * sandbox/vigouroux/cmy/testfun.cc, * sandbox/vigouroux/cmy/get_green.hh, * sandbox/vigouroux/xyz/test.cc, * sandbox/vigouroux/xyz/rgb_to_xyz.hh, * sandbox/vigouroux/xyz/get_blue.hh, * sandbox/vigouroux/xyz/get_red.hh, * sandbox/vigouroux/xyz/testfun.cc, * sandbox/vigouroux/xyz/get_green.hh, * sandbox/vigouroux/moyenne.cc, * sandbox/vigouroux/lap.cc, * sandbox/vigouroux/yiq/test.cc, * sandbox/vigouroux/yiq/get_blue.hh, * sandbox/vigouroux/yiq/get_red.hh, * sandbox/vigouroux/yiq/rgb_to_yiq.hh, * sandbox/vigouroux/yiq/testfun.cc, * sandbox/vigouroux/yiq/get_green.hh, * sandbox/vigouroux/color.cc, * sandbox/vigouroux/load.cc, * sandbox/vigouroux/conv/test.cc, * sandbox/vigouroux/conv/getred.hh, * sandbox/vigouroux/conv/tored.hh, * sandbox/vigouroux/conv/torgb.hh, * sandbox/vigouroux/conv/rgbto.hh, * sandbox/vigouroux/gradation.hh, * sandbox/vigouroux/testfun.cc, * sandbox/vigouroux/color/rgb_to_hsl.hh, * sandbox/vigouroux/color/rgb_to_cmy.hh, * sandbox/vigouroux/color/rgb_to_xyz.hh, * sandbox/vigouroux/color/tests.cc, * sandbox/vigouroux/color/rgb_to_hsv.hh, * sandbox/vigouroux/color/rgb_to_yiq.hh, * sandbox/vigouroux/color/rgb_to_hsi.hh, * sandbox/vigouroux/color/rgb_to_yuv.hh, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/test_fllt_lena_tiles.cc, * sandbox/garrigues/fllt/test_fllt10.cc, * sandbox/garrigues/fllt/test_fllt_tiny.cc, * sandbox/garrigues/fllt/test_fllt12.cc, * sandbox/garrigues/fllt/essai.cc, * sandbox/garrigues/fllt/fllt_simple.svg.1.cc, * sandbox/garrigues/fllt/fllt_simple.svg.3.cc, * sandbox/garrigues/fllt/fllt_simple.cc, * sandbox/garrigues/fllt/test_fllt10_inv.cc, * sandbox/garrigues/fllt/fllt_theo.cc, * sandbox/garrigues/fllt/test_fllt3.cc, * sandbox/garrigues/fllt/test_fllt5.cc, * sandbox/garrigues/fllt/test_fllt7.cc, * sandbox/garrigues/fllt/test_fllt9.cc, * sandbox/garrigues/fllt/fllt_merge.hh, * sandbox/garrigues/fllt/test_fllt3_inv.cc, * sandbox/garrigues/fllt/test_fllt_lena.cc, * sandbox/garrigues/fllt/test_fllt.cc, * sandbox/garrigues/fllt/test_flltb.cc, * sandbox/garrigues/fllt/test_fllt7_inv.cc, * sandbox/garrigues/fllt/test_fllt13.cc, * sandbox/garrigues/fllt/test_fllt15.cc, * sandbox/garrigues/fllt/fllt_simple.svg.2.cc, * sandbox/garrigues/fllt/fllt.hh, * sandbox/garrigues/fllt/test.cc, * sandbox/garrigues/fllt/give_confs.cc, * sandbox/garrigues/fllt/test_fllt2.cc, * sandbox/garrigues/fllt/test_fllt4.cc, * sandbox/garrigues/fllt/test_fllt6.cc, * sandbox/garrigues/fllt/test_fllt8.cc, * sandbox/garrigues/tiled_image2d/tiled_image2d.hh, * sandbox/garrigues/tiled_image2d/tiled_image2d.cc, * sandbox/garrigues/image_identity/interpolated.hh, * sandbox/garrigues/factures/extract_array_highlight.cc, * sandbox/garrigues/factures/extract_array.cc, * sandbox/folio/test/psn.cc, * sandbox/folio/test/psn_log.cc, * sandbox/folio/test/naive.cc, * sandbox/folio/test/dt_maze.cc, * sandbox/folio/test/chamfer.cc, * sandbox/folio/test/dt_bench.cc, * sandbox/folio/test/dt.cc, * sandbox/folio/psn.cc, * sandbox/folio/psn_log.cc, * sandbox/folio/naive.cc, * sandbox/folio/chamfer.cc, * sandbox/folio/dt.cc, * sandbox/beguin/irm_g.cc, * sandbox/beguin/fusion_graph.hh, * sandbox/beguin/irm.cc, * sandbox/abraham/tests/morpho/test_component_tree.cc, * sandbox/abraham/tests/morpho/test_watershed.cc, * sandbox/abraham/tests/morpho/test_watershed_topo.cc, * sandbox/abraham/tests/io/tikz/tikz.cc, * sandbox/abraham/mln/morpho/basic_najman.hh: Update. apps/statues/mesh-segm.cc | 4 ++-- apps/statues/mesh-skel.cc | 4 ++-- doc/benchmark/image2d.cc | 2 +- doc/benchmark/p_runs.cc | 2 +- doc/examples/labeling_algo.cc | 4 ++-- doc/tutorial/examples/box.cc | 2 +- doc/tutorial/examples/image2d.cc | 2 +- doc/tutorial/examples/image_flat.cc | 2 +- doc/tutorial/examples/image_if.cc | 4 ++-- doc/tutorial/examples/image_plain.cc | 4 ++-- doc/tutorial/examples/image_safe.cc | 4 ++-- doc/tutorial/examples/p_array.2.cc | 2 +- doc/tutorial/examples/p_array.cc | 2 +- doc/tutorial/examples/p_image.cc | 2 +- doc/tutorial/examples/p_key.2.cc | 2 +- doc/tutorial/examples/p_key.cc | 2 +- doc/tutorial/examples/p_line2d.cc | 4 ++-- doc/tutorial/examples/p_mutable_array_of.cc | 4 ++-- doc/tutorial/examples/p_queue.cc | 2 +- doc/tutorial/examples/p_run.cc | 4 ++-- doc/tutorial/examples/p_vaccess.cc | 4 ++-- doc/tutorial/examples/proxy.cc | 2 +- doc/tutorial/examples/sub_image.cc | 4 ++-- doc/tutorial/examples/window.cc | 2 +- mln/accu/count_adjacent_vertices.hh | 2 +- mln/accu/rank.hh | 2 +- mln/accu/rank_bool.hh | 2 +- mln/accu/rank_high_quant.hh | 2 +- mln/border/mirror.hh | 6 +++--- mln/convert/to_image.hh | 6 +++--- mln/convert/to_tiles.hh | 2 +- mln/convert/to_window.hh | 4 ++-- mln/core/image/bgraph_image.hh | 10 +++++----- mln/core/image/bgraph_psite.hh | 8 ++++---- mln/core/image/cast_image.hh | 8 ++++---- mln/core/image/decorated_image.hh | 8 ++++---- mln/core/image/fi_adaptor.hh | 8 ++++---- mln/core/image/graph_elt_neighborhood.hh | 12 ++++++------ mln/core/image/graph_elt_window.hh | 12 ++++++------ mln/core/image/graph_image.hh | 10 +++++----- mln/core/image/graph_neighborhood_piter.hh | 8 ++++---- mln/core/image/graph_psite.hh | 8 ++++---- mln/core/image/graph_window_piter.hh | 8 ++++---- mln/core/image/hexa.hh | 10 +++++----- mln/core/image/hexa_piter.hh | 10 +++++----- mln/core/image/image1d.hh | 8 ++++---- mln/core/image/image2d.hh | 8 ++++---- mln/core/image/image2d_h.hh | 12 ++++++------ mln/core/image/image3d.hh | 8 ++++---- mln/core/image/image_if.hh | 8 ++++---- mln/core/image/inplace.hh | 8 ++++---- mln/core/image/interpolated.hh | 8 ++++---- mln/core/image/line_graph_elt_neighborhood.hh | 12 ++++++------ mln/core/image/line_graph_elt_window.hh | 12 ++++++------ mln/core/image/line_graph_image.hh | 10 +++++----- mln/core/image/line_graph_neighborhood_piter.hh | 8 ++++---- mln/core/image/line_graph_psite.hh | 8 ++++---- mln/core/image/line_graph_window_piter.hh | 8 ++++---- mln/core/image/mono_obased_rle_encode.hh | 10 +++++----- mln/core/image/mono_obased_rle_image.hh | 10 +++++----- mln/core/image/mono_rle_encode.hh | 10 +++++----- mln/core/image/mono_rle_image.hh | 8 ++++---- mln/core/image/obased_rle_encode.hh | 10 +++++----- mln/core/image/obased_rle_image.hh | 8 ++++---- mln/core/image/plain.hh | 8 ++++---- mln/core/image/rle_encode.hh | 10 +++++----- mln/core/image/rle_image.hh | 8 ++++---- mln/core/image/safe.hh | 8 ++++---- mln/core/image/sparse_encode.hh | 10 +++++----- mln/core/image/sparse_image.hh | 8 ++++---- mln/core/image/sub_image.hh | 8 ++++---- mln/core/image/t_image.hh | 8 ++++---- mln/core/image/tr_image.hh | 8 ++++---- mln/core/image/tr_mesh.hh | 8 ++++---- mln/core/image/translate_image.hh | 8 ++++---- mln/core/image/value_enc_image.hh | 2 +- mln/core/image/value_encode.hh | 10 +++++----- mln/core/internal/graph_vicinity_piter.hh | 2 +- mln/core/internal/line_graph_vicinity_piter.hh | 2 +- mln/core/p_image2d.hh | 4 ++-- mln/core/site_set/p_bgraph.hh | 2 +- mln/core/site_set/p_bgraph_piter.hh | 2 +- mln/core/site_set/p_graph.hh | 2 +- mln/core/site_set/p_graph_piter.hh | 2 +- mln/core/site_set/p_line_graph.hh | 2 +- mln/core/site_set/p_line_graph_piter.hh | 2 +- mln/debug/println.spe.hh | 4 ++-- mln/debug/put_word.hh | 2 +- mln/display/color_pretty.hh | 2 +- mln/display/remove.hh | 2 +- mln/display/save.hh | 2 +- mln/display/show.hh | 2 +- mln/draw/graph.hh | 4 ++-- mln/geom/chamfer.hh | 4 ++-- mln/io/fits/load.hh | 2 +- mln/io/pbm/load.hh | 2 +- mln/io/pfm/load.hh | 2 +- mln/io/pgm/load.hh | 2 +- mln/io/pnm/load.hh | 2 +- mln/io/ppm/load.hh | 2 +- mln/level/fill.spe.hh | 2 +- mln/level/fill_with_image.hh | 2 +- mln/level/fill_with_value.hh | 2 +- mln/level/paste.hh | 2 +- mln/level/replace.hh | 2 +- mln/linear/line_x2_convolve.hh | 2 +- mln/make/image1d.hh | 2 +- mln/make/image2d.hh | 2 +- mln/morpho/closing_area_on_vertices.hh | 2 +- mln/morpho/line_gradient.hh | 4 ++-- mln/morpho/opening_area_on_vertices.hh | 2 +- sandbox/abraham/mln/morpho/basic_najman.hh | 2 +- sandbox/abraham/tests/io/tikz/tikz.cc | 2 +- sandbox/abraham/tests/morpho/test_component_tree.cc | 2 +- sandbox/abraham/tests/morpho/test_watershed.cc | 2 +- sandbox/abraham/tests/morpho/test_watershed_topo.cc | 2 +- sandbox/aroumougame/skeleton/mesh-skel.cc | 4 ++-- sandbox/aroumougame/skeleton/mesh-skel_region.cc | 4 ++-- sandbox/aroumougame/skeleton/miscellenous.hh | 2 +- sandbox/aroumougame/skeleton/sedt.hh | 4 ++-- sandbox/aroumougame/skeleton/test.cc | 2 +- sandbox/aroumougame/skeleton/test_image2d.cc | 4 ++-- sandbox/aroumougame/skeleton/test_image3d.cc | 6 +++--- sandbox/aroumougame/skeleton/thinning.hh | 4 ++-- sandbox/beguin/fusion_graph.hh | 4 ++-- sandbox/beguin/irm.cc | 4 ++-- sandbox/beguin/irm_g.cc | 4 ++-- sandbox/duhamel/abr_to_image.cc | 2 +- sandbox/duhamel/chamfer.cc | 4 ++-- sandbox/duhamel/color_sub.cc | 8 ++++---- sandbox/duhamel/extract_array.cc | 2 +- sandbox/duhamel/graph_labeling.hh | 2 +- sandbox/duhamel/labeling_algo.cc | 2 +- sandbox/duhamel/labeling_algo.hh | 2 +- sandbox/duhamel/main.cc | 2 +- sandbox/duhamel/main_mesh_image.cc | 2 +- sandbox/duhamel/mem.hh | 8 ++++---- sandbox/duhamel/paste.hh | 8 ++++---- sandbox/duhamel/queue_p_priority.cc | 2 +- sandbox/duhamel/slow_seed2tiling.cc | 10 +++++----- sandbox/duhamel/translate_image.cc | 4 ++-- sandbox/duhamel/translate_image.hh | 8 ++++---- sandbox/folio/chamfer.cc | 2 +- sandbox/folio/dt.cc | 6 +++--- sandbox/folio/naive.cc | 2 +- sandbox/folio/psn.cc | 6 +++--- sandbox/folio/psn_log.cc | 6 +++--- sandbox/folio/test/chamfer.cc | 2 +- sandbox/folio/test/dt.cc | 6 +++--- sandbox/folio/test/dt_bench.cc | 6 +++--- sandbox/folio/test/dt_maze.cc | 6 +++--- sandbox/folio/test/naive.cc | 2 +- sandbox/folio/test/psn.cc | 6 +++--- sandbox/folio/test/psn_log.cc | 6 +++--- sandbox/garrigues/factures/extract_array.cc | 4 ++-- sandbox/garrigues/factures/extract_array_highlight.cc | 4 ++-- sandbox/garrigues/fllt/essai.cc | 4 ++-- sandbox/garrigues/fllt/fllt.hh | 8 ++++---- sandbox/garrigues/fllt/fllt_merge.hh | 2 +- sandbox/garrigues/fllt/fllt_simple.cc | 6 +++--- sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 6 +++--- sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 6 +++--- sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 6 +++--- sandbox/garrigues/fllt/fllt_theo.cc | 4 ++-- sandbox/garrigues/fllt/give_confs.cc | 2 +- sandbox/garrigues/fllt/test.cc | 4 ++-- sandbox/garrigues/fllt/test_fllt.cc | 2 +- sandbox/garrigues/fllt/test_fllt10.cc | 2 +- sandbox/garrigues/fllt/test_fllt10_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt12.cc | 2 +- sandbox/garrigues/fllt/test_fllt13.cc | 2 +- sandbox/garrigues/fllt/test_fllt15.cc | 2 +- sandbox/garrigues/fllt/test_fllt2.cc | 2 +- sandbox/garrigues/fllt/test_fllt3.cc | 2 +- sandbox/garrigues/fllt/test_fllt3_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt4.cc | 2 +- sandbox/garrigues/fllt/test_fllt5.cc | 2 +- sandbox/garrigues/fllt/test_fllt6.cc | 2 +- sandbox/garrigues/fllt/test_fllt7.cc | 2 +- sandbox/garrigues/fllt/test_fllt7_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt8.cc | 2 +- sandbox/garrigues/fllt/test_fllt9.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc | 2 +- sandbox/garrigues/fllt/test_fllt_tiny.cc | 2 +- sandbox/garrigues/fllt/test_flltb.cc | 2 +- sandbox/garrigues/image_identity/interpolated.hh | 8 ++++---- sandbox/garrigues/level_set.hh | 8 ++++---- sandbox/garrigues/tiled_image2d/tiled_image2d.cc | 2 +- sandbox/garrigues/tiled_image2d/tiled_image2d.hh | 2 +- sandbox/geraud/cs2d/cs2d.hh | 4 ++-- sandbox/geraud/cs2d/dbl_neighb.cc | 2 +- sandbox/geraud/cs2d/kruskal.cc | 6 +++--- sandbox/geraud/cs2d/tuto.cc | 4 ++-- sandbox/geraud/cs2d/tuto_bis.cc | 6 +++--- sandbox/geraud/dmap.cc | 2 +- sandbox/geraud/fllt.svg.6.cc | 6 +++--- sandbox/geraud/fllt.svg.7.hh | 6 +++--- sandbox/geraud/fllt/fllt.hh | 6 +++--- sandbox/geraud/fllt/fllt.svg.1.cc | 2 +- sandbox/geraud/fllt/fllt.svg.2.cc | 2 +- sandbox/geraud/fllt/fllt.svg.3.cc | 4 ++-- sandbox/geraud/fllt/fllt.svg.4.cc | 4 ++-- sandbox/geraud/fllt/fllt.svg.5.cc | 4 ++-- sandbox/geraud/fllt/fllt.svg.6.cc | 6 +++--- sandbox/geraud/fllt/fllt.svg.7.hh | 6 +++--- sandbox/geraud/fllt/fllt_test.hh | 6 +++--- sandbox/geraud/irm.cc | 4 ++-- sandbox/geraud/max_tree_nnodes.cc | 2 +- sandbox/geraud/win_fun.cc | 2 +- sandbox/jardonnet/registration/chamfer.hh | 2 +- sandbox/jardonnet/test/gaussian.cc | 2 +- sandbox/jardonnet/test/gaussian_subsampling.cc | 2 +- sandbox/jardonnet/test/icp.cc | 2 +- sandbox/jardonnet/test/icp_ref.cc | 2 +- sandbox/jardonnet/test/reduce.cc | 2 +- sandbox/jardonnet/test/subsampling.cc | 2 +- sandbox/jardonnet/test/test.cc | 2 +- sandbox/jardonnet/test/type.cc | 2 +- sandbox/nivault/extract_character.cc | 4 ++-- sandbox/nivault/extract_score.cc | 4 ++-- sandbox/nivault/median.hh | 2 +- sandbox/nivault/plugin-gimp/src/build-image.hh | 2 +- sandbox/nivault/rotation.cc | 2 +- sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc | 2 +- sandbox/pellegrin/first_test.cc | 2 +- sandbox/pellegrin/set/core/p_bgraph.hh | 2 +- sandbox/pellegrin/set/core/p_graph.hh | 2 +- sandbox/pellegrin/set/core/p_line_graph.hh | 2 +- sandbox/pellegrin/set/test/p_runs.cc | 2 +- sandbox/pellegrin/set/test/pset_if.cc | 2 +- sandbox/vigouroux/cmy/fun.hh | 2 +- sandbox/vigouroux/cmy/get_blue.hh | 2 +- sandbox/vigouroux/cmy/get_green.hh | 2 +- sandbox/vigouroux/cmy/rgb_to_cmy.hh | 2 +- sandbox/vigouroux/cmy/test.cc | 2 +- sandbox/vigouroux/cmy/testfun.cc | 2 +- sandbox/vigouroux/color.cc | 2 +- sandbox/vigouroux/color/rgb_to_cmy.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsi.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsl.hh | 2 +- sandbox/vigouroux/color/rgb_to_hsv.hh | 2 +- sandbox/vigouroux/color/rgb_to_xyz.hh | 2 +- sandbox/vigouroux/color/rgb_to_yiq.hh | 2 +- sandbox/vigouroux/color/rgb_to_yuv.hh | 2 +- sandbox/vigouroux/color/tests.cc | 2 +- sandbox/vigouroux/conv/getred.hh | 2 +- sandbox/vigouroux/conv/rgbto.hh | 2 +- sandbox/vigouroux/conv/test.cc | 2 +- sandbox/vigouroux/conv/tored.hh | 2 +- sandbox/vigouroux/conv/torgb.hh | 2 +- sandbox/vigouroux/function.hh | 2 +- sandbox/vigouroux/gradation.hh | 2 +- sandbox/vigouroux/hsi/get_blue.hh | 2 +- sandbox/vigouroux/hsi/get_green.hh | 2 +- sandbox/vigouroux/hsi/get_red.hh | 2 +- sandbox/vigouroux/hsi/rgb_to_hsi.hh | 2 +- sandbox/vigouroux/lap.cc | 2 +- sandbox/vigouroux/load.cc | 4 ++-- sandbox/vigouroux/moyenne.cc | 2 +- sandbox/vigouroux/testfun.cc | 2 +- sandbox/vigouroux/tests.cc | 2 +- sandbox/vigouroux/xyz/get_blue.hh | 2 +- sandbox/vigouroux/xyz/get_green.hh | 2 +- sandbox/vigouroux/xyz/get_red.hh | 2 +- sandbox/vigouroux/xyz/rgb_to_xyz.hh | 2 +- sandbox/vigouroux/xyz/test.cc | 2 +- sandbox/vigouroux/xyz/testfun.cc | 2 +- sandbox/vigouroux/yiq/get_blue.hh | 2 +- sandbox/vigouroux/yiq/get_green.hh | 2 +- sandbox/vigouroux/yiq/get_red.hh | 2 +- sandbox/vigouroux/yiq/rgb_to_yiq.hh | 2 +- sandbox/vigouroux/yiq/test.cc | 2 +- sandbox/vigouroux/yiq/testfun.cc | 2 +- sandbox/vigouroux/yuv/get_blue.hh | 2 +- sandbox/vigouroux/yuv/get_green.hh | 2 +- sandbox/vigouroux/yuv/get_red.hh | 2 +- sandbox/vigouroux/yuv/rgb_to_yuv.hh | 2 +- sandbox/vigouroux/yuv/test.cc | 2 +- sandbox/vigouroux/yuv/testfun.cc | 2 +- tests/accu/compute.cc | 2 +- tests/accu/max.cc | 2 +- tests/accu/mean.cc | 2 +- tests/accu/median.cc | 2 +- tests/accu/min.cc | 2 +- tests/accu/nil.cc | 2 +- tests/accu/pair.cc | 2 +- tests/arith/minus.cc | 2 +- tests/arith/minus_full.cc | 10 +++++----- tests/arith/plus.cc | 4 ++-- tests/arith/plus_full.cc | 10 +++++----- tests/arith/revert.cc | 2 +- tests/arith/revert_full.cc | 10 +++++----- tests/arith/times.cc | 2 +- tests/arith/times_full.cc | 10 +++++----- tests/binarization/threshold.cc | 2 +- tests/border/adjust.cc | 2 +- tests/border/adjust_full.cc | 2 +- tests/border/duplicate.cc | 2 +- tests/border/duplicate_full.cc | 4 ++-- tests/border/equalize.cc | 2 +- tests/border/equalize_full.cc | 6 +++--- tests/border/fill.cc | 2 +- tests/border/fill_full.cc | 6 +++--- tests/border/find.cc | 4 ++-- tests/border/find_full.cc | 10 +++++----- tests/border/get.cc | 6 +++--- tests/border/get_full.cc | 6 +++--- tests/border/mirror.cc | 4 ++-- tests/border/mirror_full.cc | 4 ++-- tests/border/resize.cc | 2 +- tests/border/resize_full.cc | 6 +++--- tests/border/resize_image1d_1.cc | 2 +- tests/border/resize_image1d_2.cc | 2 +- tests/border/resize_image1d_3.cc | 2 +- tests/border/resize_image2d_1.cc | 2 +- tests/border/resize_image2d_2.cc | 2 +- tests/border/resize_image2d_3.cc | 2 +- tests/border/resize_image3d_1.cc | 2 +- tests/border/resize_image3d_2.cc | 2 +- tests/border/resize_image3d_3.cc | 2 +- tests/border/resize_image_if.cc | 6 +++--- tests/border/resize_sub_image.cc | 6 +++--- tests/canvas/browsing/directional.cc | 4 ++-- tests/canvas/browsing/fwd.cc | 2 +- tests/canvas/browsing/snake_fwd.cc | 2 +- tests/canvas/chamfer.cc | 6 +++--- tests/convert/to_image.cc | 2 +- tests/convert/to_p_set.cc | 6 +++--- tests/convert/to_tiles.cc | 4 ++-- tests/convert/to_window.cc | 6 +++--- tests/core/bgraph_image.cc | 4 ++-- tests/core/cast_image.cc | 4 ++-- tests/core/clock_neighb2d.cc | 2 +- tests/core/clock_test.cc | 2 +- tests/core/clone.cc | 4 ++-- tests/core/decorated_image.cc | 4 ++-- tests/core/dpoints_pixter.cc | 6 +++--- tests/core/fi_adaptor.cc | 4 ++-- tests/core/graph_elt_neighborhood.cc | 2 +- tests/core/graph_elt_window.cc | 2 +- tests/core/graph_image.cc | 6 +++--- tests/core/graph_image_wst.cc | 6 +++--- tests/core/hexa.cc | 4 ++-- tests/core/image1d.cc | 2 +- tests/core/image2d.cc | 2 +- tests/core/image2d_h.cc | 2 +- tests/core/image3d.cc | 2 +- tests/core/image_if.cc | 4 ++-- tests/core/image_if_interval.cc | 2 +- tests/core/image_if_value.cc | 2 +- tests/core/initialize.cc | 4 ++-- tests/core/interpolated.cc | 4 ++-- tests/core/line_graph_elt_neighborhood.cc | 2 +- tests/core/line_graph_elt_window.cc | 2 +- tests/core/line_graph_image.cc | 6 +++--- tests/core/line_piter.cc | 6 +++--- tests/core/mono_obased_rle_image.cc | 4 ++-- tests/core/mono_rle_image.cc | 4 ++-- tests/core/obased_rle_image.cc | 4 ++-- tests/core/p_runs.cc | 2 +- tests/core/pixel.cc | 2 +- tests/core/pixter1d.cc | 2 +- tests/core/pixter1d_more.cc | 2 +- tests/core/pixter2d.cc | 2 +- tests/core/pixter2d_more.cc | 2 +- tests/core/pixter3d.cc | 2 +- tests/core/pixter3d_more.cc | 2 +- tests/core/plain.cc | 4 ++-- tests/core/point_set_compatibility.cc | 2 +- tests/core/pset_array.cc | 2 +- tests/core/pset_if.cc | 2 +- tests/core/rle_image.cc | 4 ++-- tests/core/safe_image.cc | 4 ++-- tests/core/sparse_image.cc | 4 ++-- tests/core/sub_image.cc | 6 +++--- tests/core/t_image.cc | 4 ++-- tests/core/tr_image.cc | 4 ++-- tests/core/translate_image.cc | 4 ++-- tests/core/value_enc_image.cc | 6 +++--- tests/core/window1d.cc | 2 +- tests/core/window2d.cc | 2 +- tests/core/window3d.cc | 2 +- tests/debug/iota.cc | 2 +- tests/debug/println.cc | 2 +- tests/debug/println_with_border.cc | 4 ++-- tests/display/color_pretty.cc | 6 +++--- tests/display/save_and_show.cc | 6 +++--- tests/display/show.cc | 6 +++--- tests/draw/graph.cc | 6 +++--- tests/draw/label.cc | 4 ++-- tests/draw/line.cc | 6 +++--- tests/estim/mean.cc | 2 +- tests/fun/v2v/rgb_hsi_conversion.cc | 2 +- tests/fun/x2x/rotation.cc | 4 ++-- tests/geom/max_col.cc | 2 +- tests/geom/max_ind.cc | 2 +- tests/geom/max_row.cc | 2 +- tests/geom/max_sli.cc | 2 +- tests/geom/min_col.cc | 2 +- tests/geom/min_ind.cc | 2 +- tests/geom/min_row.cc | 2 +- tests/geom/min_sli.cc | 2 +- tests/geom/ncols.cc | 2 +- tests/geom/ninds.cc | 2 +- tests/geom/nrows.cc | 2 +- tests/geom/nslis.cc | 2 +- tests/geom/resize.cc | 6 +++--- tests/geom/seed2tiling.cc | 2 +- tests/geom/seed2tiling_roundness.cc | 2 +- tests/histo/compute.cc | 2 +- tests/histo/to_image1d.cc | 4 ++-- tests/io/fits/fits.cc | 2 +- tests/io/pbm/pbm.cc | 2 +- tests/io/pgm/pgm.cc | 2 +- tests/io/pgm/pgm16.cc | 2 +- tests/io/pgm/pgm19.cc | 2 +- tests/io/pgm/pgm27.cc | 2 +- tests/io/ppm/ppm.cc | 2 +- tests/io/ppm/ppm16.cc | 2 +- tests/io/ppm/ppm23.cc | 2 +- tests/labeling/background.cc | 2 +- tests/labeling/blobs.cc | 2 +- tests/labeling/flat_zones.cc | 2 +- tests/labeling/foreground.cc | 2 +- tests/labeling/level.cc | 4 ++-- tests/labeling/regional_maxima.cc | 2 +- tests/labeling/regional_minima.cc | 2 +- tests/level/abs.cc | 2 +- tests/level/abs_full.cc | 10 +++++----- tests/level/apply.cc | 2 +- tests/level/apply_full.cc | 6 +++--- tests/level/approx/median.cc | 2 +- tests/level/assign.cc | 2 +- tests/level/assign_full.cc | 10 +++++----- tests/level/compare.cc | 2 +- tests/level/compare_full.cc | 6 +++--- tests/level/compute.cc | 2 +- tests/level/compute_full.cc | 10 +++++----- tests/level/fill.cc | 2 +- tests/level/fill_full.cc | 10 +++++----- tests/level/fill_with_value.cc | 2 +- tests/level/median.cc | 2 +- tests/level/median_dir.cc | 2 +- tests/level/median_fast.cc | 2 +- tests/level/median_hline2d.cc | 2 +- tests/level/memcpy_.cc | 4 ++-- tests/level/memset_.cc | 2 +- tests/level/naive/median.cc | 2 +- tests/level/paste.cc | 6 +++--- tests/level/paste_full.cc | 10 +++++----- tests/level/replace.cc | 2 +- tests/level/saturate.cc | 2 +- tests/level/saturate_full.cc | 6 +++--- tests/level/sort_psites.cc | 2 +- tests/level/sort_psites_full.cc | 10 +++++----- tests/level/stretch.cc | 2 +- tests/level/stretch_full.cc | 6 +++--- tests/level/take.cc | 2 +- tests/level/transform.cc | 2 +- tests/level/transform_full.cc | 10 +++++----- tests/linear/convolve.cc | 2 +- tests/linear/gaussian.cc | 2 +- tests/linear/lap.cc | 2 +- tests/linear/line_convolve.cc | 2 +- tests/linear/local/convolve.cc | 2 +- tests/linear/log.cc | 2 +- tests/linear/sobel.cc | 2 +- tests/logical/and.cc | 2 +- tests/logical/and_full.cc | 6 +++--- tests/logical/and_not.cc | 2 +- tests/logical/and_not_full.cc | 6 +++--- tests/logical/not.cc | 2 +- tests/logical/not_full.cc | 6 +++--- tests/logical/or.cc | 2 +- tests/logical/or_full.cc | 6 +++--- tests/morpho/artificial_line_graph_image_wst.cc | 8 ++++---- tests/morpho/closing_area.cc | 2 +- tests/morpho/closing_height.cc | 2 +- tests/morpho/closing_volume.cc | 2 +- tests/morpho/combined.cc | 2 +- tests/morpho/contrast.cc | 2 +- tests/morpho/dilation.cc | 2 +- tests/morpho/dilation_max_h.cc | 2 +- tests/morpho/erosion.cc | 2 +- tests/morpho/erosion_min_h.cc | 2 +- tests/morpho/gradient.cc | 2 +- tests/morpho/gradient_elementary.cc | 2 +- tests/morpho/hit_or_miss.cc | 2 +- tests/morpho/laplacian.cc | 4 ++-- tests/morpho/lena_line_graph_image_wst1.cc | 8 ++++---- tests/morpho/lena_line_graph_image_wst2.cc | 8 ++++---- tests/morpho/line_graph_image_wst.cc | 6 +++--- tests/morpho/meyer_wst.cc | 2 +- tests/morpho/meyer_wst_long.cc | 4 ++-- tests/morpho/opening_area.cc | 2 +- tests/morpho/opening_height.cc | 2 +- tests/morpho/opening_volume.cc | 2 +- tests/morpho/rank_filter.cc | 2 +- tests/morpho/thinning.cc | 2 +- tests/neighb/image.cc | 2 +- tests/pw/value.cc | 2 +- tests/test/positive.cc | 2 +- tests/trait/ch_value.cc | 2 +- tests/trait/image/images.cc | 6 +++--- tests/util/branch_iter.cc | 2 +- tests/util/branch_iter_ind.cc | 2 +- tests/util/lemmings.cc | 2 +- tests/util/tree_fast_to_image.cc | 2 +- tests/util/tree_to_image.cc | 2 +- tests/value/float01.cc | 2 +- tests/value/stack.cc | 2 +- tools/area_flooding.cc | 8 ++++---- tools/seed2tiling.cc | 10 +++++----- 514 files changed, 946 insertions(+), 946 deletions(-) Index: tools/seed2tiling.cc --- tools/seed2tiling.cc (revision 2171) +++ tools/seed2tiling.cc (working copy) @@ -31,8 +31,8 @@ */ -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> @@ -46,10 +46,10 @@ # include <mln/geom/seeds2tiling_roundness.hh> # include <mln/make/voronoi.hh> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/make/win_chamfer.hh> Index: tools/area_flooding.cc --- tools/area_flooding.cc (revision 2171) +++ tools/area_flooding.cc (working copy) @@ -51,12 +51,12 @@ #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing_area_on_vertices.hh> Index: tests/trait/image/images.cc --- tests/trait/image/images.cc (revision 2171) +++ tests/trait/image/images.cc (working copy) @@ -30,10 +30,10 @@ * \brief Tests on mln::trait::images. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> Index: tests/trait/ch_value.cc --- tests/trait/ch_value.cc (revision 2171) +++ tests/trait/ch_value.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/trait/ch_value.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/stack.hh> Index: tests/debug/iota.cc --- tests/debug/iota.cc (revision 2171) +++ tests/debug/iota.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::debug::iota. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> Index: tests/debug/println_with_border.cc --- tests/debug/println_with_border.cc (revision 2171) +++ tests/debug/println_with_border.cc (working copy) @@ -30,8 +30,8 @@ * \brief Test on mln::debug::println_with_border. */ -#include <mln/core/image2d.hh> -#include <mln/core/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image1d.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> #include <mln/debug/println_with_border.hh> Index: tests/debug/println.cc --- tests/debug/println.cc (revision 2171) +++ tests/debug/println.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::debug::println. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> Index: tests/histo/compute.cc --- tests/histo/compute.cc (revision 2171) +++ tests/histo/compute.cc (working copy) @@ -33,7 +33,7 @@ #include <iterator> #include <sstream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_s.hh> Index: tests/histo/to_image1d.cc --- tests/histo/to_image1d.cc (revision 2171) +++ tests/histo/to_image1d.cc (working copy) @@ -32,8 +32,8 @@ #include <iterator> -#include <mln/core/image2d.hh> -#include <mln/core/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image1d.hh> #include <mln/value/int_u8.hh> Index: tests/core/graph_elt_neighborhood.cc --- tests/core/graph_elt_neighborhood.cc (revision 2171) +++ tests/core/graph_elt_neighborhood.cc (working copy) @@ -33,7 +33,7 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/image_if_value.cc --- tests/core/image_if_value.cc (revision 2171) +++ tests/core/image_if_value.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image_if_value. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/image_if_value.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/window1d.cc --- tests/core/window1d.cc (revision 2171) +++ tests/core/window1d.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/window1d.hh> -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> Index: tests/core/window2d.cc --- tests/core/window2d.cc (revision 2171) +++ tests/core/window2d.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/window2d.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> #include <mln/logical/not.hh> Index: tests/core/clock_neighb2d.cc --- tests/core/clock_neighb2d.cc (revision 2171) +++ tests/core/clock_neighb2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/clock_neighb2d.hh> #include <mln/debug/println.hh> Index: tests/core/window3d.cc --- tests/core/window3d.cc (revision 2171) +++ tests/core/window3d.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/window3d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> Index: tests/core/graph_image_wst.cc --- tests/core/graph_image_wst.cc (revision 2171) +++ tests/core/graph_image_wst.cc (working copy) @@ -31,9 +31,9 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_window.hh> -#include <mln/core/graph_window_piter.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_window.hh> +#include <mln/core/image/graph_window_piter.hh> #include <mln/morpho/dilation.hh> Index: tests/core/image_if_interval.cc --- tests/core/image_if_interval.cc (revision 2171) +++ tests/core/image_if_interval.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image_if_interval. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/image_if_interval.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/bgraph_image.cc --- tests/core/bgraph_image.cc (revision 2171) +++ tests/core/bgraph_image.cc (working copy) @@ -31,8 +31,8 @@ #include <vector> #include <mln/value/int_u8.hh> -#include <mln/core/image2d.hh> -#include <mln/core/bgraph_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/bgraph_image.hh> #include <mln/level/fill.hh> #include <mln/level/paste.hh> #include <mln/debug/println.hh> Index: tests/core/mono_rle_image.cc --- tests/core/mono_rle_image.cc (revision 2171) +++ tests/core/mono_rle_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::blobs. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/mono_rle_encode.hh> +#include <mln/core/image/mono_rle_encode.hh> #include "tests/data.hh" Index: tests/core/pixter2d_more.cc --- tests/core/pixter2d_more.cc (revision 2171) +++ tests/core/pixter2d_more.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::fwd_pixter2d. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> const unsigned size = 20; Index: tests/core/cast_image.cc --- tests/core/cast_image.cc (revision 2171) +++ tests/core/cast_image.cc (working copy) @@ -30,11 +30,11 @@ * \brief Tests on mln::cast_image. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/fun/p2b/chess.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> int main() Index: tests/core/point_set_compatibility.cc --- tests/core/point_set_compatibility.cc (revision 2171) +++ tests/core/point_set_compatibility.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/graph_psite.hh> +#include <mln/core/image/graph_psite.hh> #include <mln/core/site_set/p_graph_piter.hh> Index: tests/core/pixter1d.cc --- tests/core/pixter1d.cc (revision 2171) +++ tests/core/pixter1d.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/pixter1d.cc /// \brief Tests on 1-D image pixters. -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/debug/iota.hh> Index: tests/core/pixter2d.cc --- tests/core/pixter2d.cc (revision 2171) +++ tests/core/pixter2d.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/pixter2d.cc /// \brief Tests on 2-D image pixters. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> Index: tests/core/obased_rle_image.cc --- tests/core/obased_rle_image.cc (revision 2171) +++ tests/core/obased_rle_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::obased_rle_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/obased_rle_encode.hh> +#include <mln/core/image/obased_rle_encode.hh> #include "tests/data.hh" Index: tests/core/pixter3d.cc --- tests/core/pixter3d.cc (revision 2171) +++ tests/core/pixter3d.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/pixter3d.cc /// \brief Tests on 3-D image pixters. -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/debug/iota.hh> Index: tests/core/graph_image.cc --- tests/core/graph_image.cc (revision 2171) +++ tests/core/graph_image.cc (working copy) @@ -31,9 +31,9 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_window.hh> -#include <mln/core/graph_window_piter.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_window.hh> +#include <mln/core/image/graph_window_piter.hh> #include <mln/morpho/dilation.hh> Index: tests/core/pixel.cc --- tests/core/pixel.cc (revision 2171) +++ tests/core/pixel.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::pixel. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/pixel.hh> #include <mln/metal/equal.hh> Index: tests/core/pixter3d_more.cc --- tests/core/pixter3d_more.cc (revision 2171) +++ tests/core/pixter3d_more.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::fwd_pixter3d. */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> const unsigned size = 5; Index: tests/core/pset_if.cc --- tests/core/pset_if.cc (revision 2171) +++ tests/core/pset_if.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::pset_if. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> Index: tests/core/mono_obased_rle_image.cc --- tests/core/mono_obased_rle_image.cc (revision 2171) +++ tests/core/mono_obased_rle_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::mono_obased_rle_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/mono_obased_rle_encode.hh> +#include <mln/core/image/mono_obased_rle_encode.hh> #include "tests/data.hh" Index: tests/core/sub_image.cc --- tests/core/sub_image.cc (revision 2171) +++ tests/core/sub_image.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::sub_image. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> Index: tests/core/graph_elt_window.cc --- tests/core/graph_elt_window.cc (revision 2171) +++ tests/core/graph_elt_window.cc (working copy) @@ -33,7 +33,7 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/graph_elt_window.hh> +#include <mln/core/image/graph_elt_window.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/sparse_image.cc --- tests/core/sparse_image.cc (revision 2171) +++ tests/core/sparse_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::sparse_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/sparse_encode.hh> +#include <mln/core/image/sparse_encode.hh> #include "tests/data.hh" Index: tests/core/clone.cc --- tests/core/clone.cc (revision 2171) +++ tests/core/clone.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::clone. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/plain.cc --- tests/core/plain.cc (revision 2171) +++ tests/core/plain.cc (working copy) @@ -30,8 +30,8 @@ * \brief Test on mln::plain. */ -#include <mln/core/image2d.hh> -#include <mln/core/plain.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/plain.hh> #include <mln/value/int_u8.hh> #include <mln/level/compare.hh> Index: tests/core/t_image.cc --- tests/core/t_image.cc (revision 2171) +++ tests/core/t_image.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::t_image. */ -#include <mln/core/image2d.hh> -#include <mln/core/t_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/t_image.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/p_runs.cc --- tests/core/p_runs.cc (revision 2171) +++ tests/core/p_runs.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::p_runs_ and related tools. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/p_runs.hh> Index: tests/core/image1d.cc --- tests/core/image1d.cc (revision 2171) +++ tests/core/image1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image1d. */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/geom/size1d.hh> Index: tests/core/fi_adaptor.cc --- tests/core/fi_adaptor.cc (revision 2171) +++ tests/core/fi_adaptor.cc (working copy) @@ -28,8 +28,8 @@ /// \file tests/core/fi_adaptor.cc /// \brief Test on mln::fi_adaptor. -#include <mln/core/fi_adaptor.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/fi_adaptor.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/value/int_u8.hh> Index: tests/core/image2d.cc --- tests/core/image2d.cc (revision 2171) +++ tests/core/image2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image2d. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/size2d.hh> #include <mln/core/init.hh> Index: tests/core/image3d.cc --- tests/core/image3d.cc (revision 2171) +++ tests/core/image3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image3d. */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/size3d.hh> Index: tests/core/image2d_h.cc --- tests/core/image2d_h.cc (revision 2171) +++ tests/core/image2d_h.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::image2d_h */ -#include <mln/core/image2d_h.hh> +#include <mln/core/image/image2d_h.hh> #include <mln/value/int_u16.hh> #include <mln/trait/image/print.hh> Index: tests/core/clock_test.cc --- tests/core/clock_test.cc (revision 2171) +++ tests/core/clock_test.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/clock_neighb2d.hh> #include <mln/debug/println.hh> #include <mln/level/fill.hh> Index: tests/core/decorated_image.cc --- tests/core/decorated_image.cc (revision 2171) +++ tests/core/decorated_image.cc (working copy) @@ -28,8 +28,8 @@ /// \file tests/core/decorated_image.cc /// \brief Tests on mln::decorated_image. -#include <mln/core/image2d.hh> -#include <mln/core/decorated_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/decorated_image.hh> unsigned count_read = 0, count_write = 0; Index: tests/core/translate_image.cc --- tests/core/translate_image.cc (revision 2171) +++ tests/core/translate_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::core::translate_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> #include <mln/level/fill.hh> @@ -38,7 +38,7 @@ #include <mln/border/fill.hh> #include <mln/debug/println_with_border.hh> #include <mln/debug/println.hh> -#include <mln/core/translate_image.hh> +#include <mln/core/image/translate_image.hh> int main () Index: tests/core/image_if.cc --- tests/core/image_if.cc (revision 2171) +++ tests/core/image_if.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::image_if. */ -#include <mln/core/image2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/debug/println.hh> Index: tests/core/initialize.cc --- tests/core/initialize.cc (revision 2171) +++ tests/core/initialize.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::initialize. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/debug/println.hh> Index: tests/core/line_graph_elt_window.cc --- tests/core/line_graph_elt_window.cc (revision 2171) +++ tests/core/line_graph_elt_window.cc (working copy) @@ -31,7 +31,7 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/line_graph_elt_window.hh> +#include <mln/core/image/line_graph_elt_window.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/value_enc_image.cc --- tests/core/value_enc_image.cc (revision 2171) +++ tests/core/value_enc_image.cc (working copy) @@ -30,8 +30,8 @@ * \brief Test on mln::core::value_enc_image.hh. */ -#include <mln/core/image2d.hh> -#include <mln/core/value_enc_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/value_enc_image.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> @@ -46,7 +46,7 @@ #include "tests/data.hh" -#include <mln/core/value_encode.hh> +#include <mln/core/image/value_encode.hh> struct fold_t : public mln::Function_v2v< fold_t > { Index: tests/core/line_graph_elt_neighborhood.cc --- tests/core/line_graph_elt_neighborhood.cc (revision 2171) +++ tests/core/line_graph_elt_neighborhood.cc (working copy) @@ -31,7 +31,7 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/pset_array.cc --- tests/core/pset_array.cc (revision 2171) +++ tests/core/pset_array.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/pset_array.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/p_runs.hh> #include <iostream> Index: tests/core/line_graph_image.cc --- tests/core/line_graph_image.cc (revision 2171) +++ tests/core/line_graph_image.cc (working copy) @@ -31,9 +31,9 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_window.hh> -#include <mln/core/line_graph_window_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_window.hh> +#include <mln/core/image/line_graph_window_piter.hh> #include <mln/morpho/dilation.hh> Index: tests/core/dpoints_pixter.cc --- tests/core/dpoints_pixter.cc (revision 2171) +++ tests/core/dpoints_pixter.cc (working copy) @@ -28,9 +28,9 @@ /// \file tests/dpoints_pixter.cc /// \brief Test on mln::dpoints_fwd_pixter and mln::dpoints_bkd_pixter. -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/win/segment1d.hh> #include <mln/win/rectangle2d.hh> Index: tests/core/safe_image.cc --- tests/core/safe_image.cc (revision 2171) +++ tests/core/safe_image.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::safe_image. */ -#include <mln/core/image2d.hh> -#include <mln/core/safe.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/safe.hh> int main() Index: tests/core/pixter1d_more.cc --- tests/core/pixter1d_more.cc (revision 2171) +++ tests/core/pixter1d_more.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::fwd_pixter1d. */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> const unsigned size = 20; Index: tests/core/rle_image.cc --- tests/core/rle_image.cc (revision 2171) +++ tests/core/rle_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::rle_image.hh. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> @@ -42,7 +42,7 @@ #include <mln/level/compare.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/rle_encode.hh> +#include <mln/core/image/rle_encode.hh> #include "tests/data.hh" Index: tests/core/hexa.cc --- tests/core/hexa.cc (revision 2171) +++ tests/core/hexa.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::hexa */ -#include <mln/core/image2d.hh> -#include <mln/core/hexa.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/hexa.hh> #include <mln/value/int_u8.hh> #include <mln/trait/image/print.hh> Index: tests/core/tr_image.cc --- tests/core/tr_image.cc (revision 2171) +++ tests/core/tr_image.cc (working copy) @@ -33,9 +33,9 @@ #include <iostream> #include <mln/fun/x2x/rotation.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/tr_image.hh> +#include <mln/core/image/tr_image.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/core/interpolated.cc --- tests/core/interpolated.cc (revision 2171) +++ tests/core/interpolated.cc (working copy) @@ -32,8 +32,8 @@ #include <iostream> -#include <mln/core/image2d.hh> -#include <mln/core/interpolated.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/interpolated.hh> #include <mln/algebra/vec.hh> Index: tests/core/line_piter.cc --- tests/core/line_piter.cc (revision 2171) +++ tests/core/line_piter.cc (working copy) @@ -31,9 +31,9 @@ */ //FIXME: replace by the necessary include -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/core/line_piter.hh> int main() Index: tests/neighb/image.cc --- tests/neighb/image.cc (revision 2171) +++ tests/neighb/image.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/neighb/image.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/metal/has_neighborhood.hh> Index: tests/draw/label.cc --- tests/draw/label.cc (revision 2171) +++ tests/draw/label.cc (working copy) @@ -31,14 +31,14 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/value/rgb8.hh> #include <mln/io/ppm/save.hh> #include <mln/draw/label.hh> #include <mln/literal/all.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> #include <mln/labeling/blobs.hh> Index: tests/draw/graph.cc --- tests/draw/graph.cc (revision 2171) +++ tests/draw/graph.cc (working copy) @@ -36,14 +36,14 @@ #include <vector> #include <utility> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/debug/println.hh> #include <mln/util/graph.hh> #include <mln/core/site_set/p_graph.hh> -#include <mln/core/graph_psite.hh> +#include <mln/core/image/graph_psite.hh> #include <mln/draw/graph.hh> -#include <mln/core/graph_image.hh> +#include <mln/core/image/graph_image.hh> #include <mln/level/compare.hh> Index: tests/draw/line.cc --- tests/draw/line.cc (revision 2171) +++ tests/draw/line.cc (working copy) @@ -32,9 +32,9 @@ #include <iterator> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> #include <mln/level/compare.hh> Index: tests/level/transform_full.cc --- tests/level/transform_full.cc (revision 2171) +++ tests/level/transform_full.cc (working copy) @@ -32,12 +32,12 @@ #include <cmath> -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/median.cc --- tests/level/median.cc (revision 2171) +++ tests/level/median.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/level/compute_full.cc --- tests/level/compute_full.cc (revision 2171) +++ tests/level/compute_full.cc (working copy) @@ -30,17 +30,17 @@ * \brief Tests on mln::level::compute. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> #include <mln/value/int_s8.hh> #include <mln/value/int_s16.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/accu/min.hh> Index: tests/level/sort_psites_full.cc --- tests/level/sort_psites_full.cc (revision 2171) +++ tests/level/sort_psites_full.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::level::sort_points. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/median_hline2d.cc --- tests/level/median_hline2d.cc (revision 2171) +++ tests/level/median_hline2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on the hline2d version of mln::level::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/level/abs.cc --- tests/level/abs.cc (revision 2171) +++ tests/level/abs.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::abs. */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/level/abs.hh> int main() Index: tests/level/assign_full.cc --- tests/level/assign_full.cc (revision 2171) +++ tests/level/assign_full.cc (working copy) @@ -31,9 +31,9 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> @@ -41,9 +41,9 @@ #include <mln/value/int_s16.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> Index: tests/level/apply_full.cc --- tests/level/apply_full.cc (revision 2171) +++ tests/level/apply_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::level::apply. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/level/fill_full.cc --- tests/level/fill_full.cc (revision 2171) +++ tests/level/fill_full.cc (working copy) @@ -32,12 +32,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/median_fast.cc --- tests/level/median_fast.cc (revision 2171) +++ tests/level/median_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::fast_median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/level/compute.cc --- tests/level/compute.cc (revision 2171) +++ tests/level/compute.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::compute. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/compute.hh> #include <mln/debug/iota.hh> #include <mln/accu/min.hh> Index: tests/level/sort_psites.cc --- tests/level/sort_psites.cc (revision 2171) +++ tests/level/sort_psites.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::sort_psites. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/level/sort_psites.hh> #include <mln/core/site_set/p_array.hh> Index: tests/level/assign.cc --- tests/level/assign.cc (revision 2171) +++ tests/level/assign.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::assign. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/assign.hh> #include <mln/level/compare.hh> #include <mln/debug/iota.hh> Index: tests/level/approx/median.cc --- tests/level/approx/median.cc (revision 2171) +++ tests/level/approx/median.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::approx::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/win/octagon2d.hh> Index: tests/level/fill.cc --- tests/level/fill.cc (revision 2171) +++ tests/level/fill.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::fill */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> int main() Index: tests/level/abs_full.cc --- tests/level/abs_full.cc (revision 2171) +++ tests/level/abs_full.cc (working copy) @@ -31,12 +31,12 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/memcpy_.cc --- tests/level/memcpy_.cc (revision 2171) +++ tests/level/memcpy_.cc (working copy) @@ -32,8 +32,8 @@ * \todo Make this test not dummy! */ -#include <mln/core/image2d.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/inplace.hh> #include <mln/debug/iota.hh> #include <mln/level/memcpy_.hh> Index: tests/level/median_dir.cc --- tests/level/median_dir.cc (revision 2171) +++ tests/level/median_dir.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/level/stretch_full.cc --- tests/level/stretch_full.cc (revision 2171) +++ tests/level/stretch_full.cc (working copy) @@ -31,9 +31,9 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/level/paste_full.cc --- tests/level/paste_full.cc (revision 2171) +++ tests/level/paste_full.cc (working copy) @@ -32,12 +32,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/level/compare_full.cc --- tests/level/compare_full.cc (revision 2171) +++ tests/level/compare_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::level::compare. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/level/saturate_full.cc --- tests/level/saturate_full.cc (revision 2171) +++ tests/level/saturate_full.cc (working copy) @@ -31,9 +31,9 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/level/transform.cc --- tests/level/transform.cc (revision 2171) +++ tests/level/transform.cc (working copy) @@ -32,7 +32,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/transform.hh> #include <mln/debug/iota.hh> Index: tests/level/replace.cc --- tests/level/replace.cc (revision 2171) +++ tests/level/replace.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::replace. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/replace.hh> #include <mln/level/compare.hh> Index: tests/level/stretch.cc --- tests/level/stretch.cc (revision 2171) +++ tests/level/stretch.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/stretch.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> Index: tests/level/paste.cc --- tests/level/paste.cc (revision 2171) +++ tests/level/paste.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::level::paste. */ -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/level/fill.hh> #include <mln/level/paste.hh> Index: tests/level/fill_with_value.cc --- tests/level/fill_with_value.cc (revision 2171) +++ tests/level/fill_with_value.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::fill_with_value */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill_with_value.hh> Index: tests/level/naive/median.cc --- tests/level/naive/median.cc (revision 2171) +++ tests/level/naive/median.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::level::naive::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/level/take.cc --- tests/level/take.cc (revision 2171) +++ tests/level/take.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::take. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/take.hh> #include <mln/level/compare.hh> #include <mln/debug/iota.hh> Index: tests/level/apply.cc --- tests/level/apply.cc (revision 2171) +++ tests/level/apply.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::apply. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/apply.hh> #include <mln/debug/iota.hh> #include <mln/fun/v2v/saturate.hh> Index: tests/level/compare.cc --- tests/level/compare.cc (revision 2171) +++ tests/level/compare.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::compare. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/compare.hh> #include <mln/debug/iota.hh> Index: tests/level/saturate.cc --- tests/level/saturate.cc (revision 2171) +++ tests/level/saturate.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/saturate.hh> #include <mln/debug/iota.hh> Index: tests/level/memset_.cc --- tests/level/memset_.cc (revision 2171) +++ tests/level/memset_.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::level::memset_. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/ncols.hh> #include <mln/level/fill.hh> #include <mln/level/memset_.hh> Index: tests/arith/minus.cc --- tests/arith/minus.cc (revision 2171) +++ tests/arith/minus.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::arith::minus. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/arith/minus.hh> #include <mln/level/compare.hh> Index: tests/arith/minus_full.cc --- tests/arith/minus_full.cc (revision 2171) +++ tests/arith/minus_full.cc (working copy) @@ -31,12 +31,12 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/arith/times.cc --- tests/arith/times.cc (revision 2171) +++ tests/arith/times.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::arith::times. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/arith/times.hh> #include <mln/level/compare.hh> Index: tests/arith/times_full.cc --- tests/arith/times_full.cc (revision 2171) +++ tests/arith/times_full.cc (working copy) @@ -33,12 +33,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/arith/plus.cc --- tests/arith/plus.cc (revision 2171) +++ tests/arith/plus.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::arith::plus. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/arith/plus.hh> #include <mln/level/compare.hh> @@ -61,7 +61,7 @@ -// #include <mln/core/image2d.hh> +// #include <mln/core/image/image2d.hh> // #include <mln/core/clone.hh> // #include <mln/value/int_u8.hh> Index: tests/arith/plus_full.cc --- tests/arith/plus_full.cc (revision 2171) +++ tests/arith/plus_full.cc (working copy) @@ -34,12 +34,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/arith/revert.cc --- tests/arith/revert.cc (revision 2171) +++ tests/arith/revert.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::arith::revert. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/arith/revert.hh> #include <mln/level/compare.hh> Index: tests/arith/revert_full.cc --- tests/arith/revert_full.cc (revision 2171) +++ tests/arith/revert_full.cc (working copy) @@ -34,12 +34,12 @@ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/literal/origin.hh> Index: tests/linear/convolve.cc --- tests/linear/convolve.cc (revision 2171) +++ tests/linear/convolve.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::convolve. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/linear/lap.cc --- tests/linear/lap.cc (revision 2171) +++ tests/linear/lap.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::lap_4. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/linear/log.cc --- tests/linear/log.cc (revision 2171) +++ tests/linear/log.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/linear/line_convolve.cc --- tests/linear/line_convolve.cc (revision 2171) +++ tests/linear/line_convolve.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::line_convolve. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/linear/sobel.cc --- tests/linear/sobel.cc (revision 2171) +++ tests/linear/sobel.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::sobel. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/level/saturate.hh> #include <mln/level/stretch.hh> Index: tests/linear/local/convolve.cc --- tests/linear/local/convolve.cc (revision 2171) +++ tests/linear/local/convolve.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::linear::local::convolve. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/w_window2d_int.hh> Index: tests/linear/gaussian.cc --- tests/linear/gaussian.cc (revision 2171) +++ tests/linear/gaussian.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::linear::gaussian. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u_sat.hh> Index: tests/accu/pair.cc --- tests/accu/pair.cc (revision 2171) +++ tests/accu/pair.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::mean. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/pair.hh> Index: tests/accu/median.cc --- tests/accu/median.cc (revision 2171) +++ tests/accu/median.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::median. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/median.hh> Index: tests/accu/compute.cc --- tests/accu/compute.cc (revision 2171) +++ tests/accu/compute.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::compute. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/compute.hh> Index: tests/accu/mean.cc --- tests/accu/mean.cc (revision 2171) +++ tests/accu/mean.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::mean. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/mean.hh> Index: tests/accu/nil.cc --- tests/accu/nil.cc (revision 2171) +++ tests/accu/nil.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::nil. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/accu/nil.hh> Index: tests/accu/min.cc --- tests/accu/min.cc (revision 2171) +++ tests/accu/min.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::min. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/accu/nil.hh> Index: tests/accu/max.cc --- tests/accu/max.cc (revision 2171) +++ tests/accu/max.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::accu::max. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/accu/nil.hh> Index: tests/value/stack.cc --- tests/value/stack.cc (revision 2171) +++ tests/value/stack.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::value::stack. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/stack.hh> Index: tests/value/float01.cc --- tests/value/float01.cc (revision 2171) +++ tests/value/float01.cc (working copy) @@ -32,7 +32,7 @@ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/border/duplicate_full.cc --- tests/border/duplicate_full.cc (revision 2171) +++ tests/border/duplicate_full.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::border::duplicate. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/duplicate.hh> #include <mln/value/int_u8.hh> Index: tests/border/mirror_full.cc --- tests/border/mirror_full.cc (revision 2171) +++ tests/border/mirror_full.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::border::mirror. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/mirror.hh> #include <mln/value/int_u8.hh> Index: tests/border/equalize_full.cc --- tests/border/equalize_full.cc (revision 2171) +++ tests/border/equalize_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::equalize. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/border/get.hh> #include <mln/border/equalize.hh> Index: tests/border/get_full.cc --- tests/border/get_full.cc (revision 2171) +++ tests/border/get_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::get. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/get.hh> Index: tests/border/resize.cc --- tests/border/resize.cc (revision 2171) +++ tests/border/resize.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> #include <mln/border/get.hh> Index: tests/border/find_full.cc --- tests/border/find_full.cc (revision 2171) +++ tests/border/find_full.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::border::find. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/find.hh> #include <mln/literal/origin.hh> Index: tests/border/resize_image1d_1.cc --- tests/border/resize_image1d_1.cc (revision 2171) +++ tests/border/resize_image1d_1.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/fill_full.cc --- tests/border/fill_full.cc (revision 2171) +++ tests/border/fill_full.cc (working copy) @@ -32,9 +32,9 @@ #include <mln/border/fill.hh> #include <mln/level/fill.hh> -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> #include <mln/value/int_s8.hh> Index: tests/border/resize_image2d_1.cc --- tests/border/resize_image2d_1.cc (revision 2171) +++ tests/border/resize_image2d_1.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_image1d_2.cc --- tests/border/resize_image1d_2.cc (revision 2171) +++ tests/border/resize_image1d_2.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/duplicate.cc --- tests/border/duplicate.cc (revision 2171) +++ tests/border/duplicate.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::border::duplicate. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/duplicate.hh> Index: tests/border/resize_image1d_3.cc --- tests/border/resize_image1d_3.cc (revision 2171) +++ tests/border/resize_image1d_3.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/mirror.cc --- tests/border/mirror.cc (revision 2171) +++ tests/border/mirror.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::border::mirror. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/mirror.hh> Index: tests/border/resize_image3d_1.cc --- tests/border/resize_image3d_1.cc (revision 2171) +++ tests/border/resize_image3d_1.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_image2d_2.cc --- tests/border/resize_image2d_2.cc (revision 2171) +++ tests/border/resize_image2d_2.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_image2d_3.cc --- tests/border/resize_image2d_3.cc (revision 2171) +++ tests/border/resize_image2d_3.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_image3d_2.cc --- tests/border/resize_image3d_2.cc (revision 2171) +++ tests/border/resize_image3d_2.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/adjust_full.cc --- tests/border/adjust_full.cc (revision 2171) +++ tests/border/adjust_full.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::border::adjust. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/border/get.hh> #include <mln/border/adjust.hh> Index: tests/border/resize_image3d_3.cc --- tests/border/resize_image3d_3.cc (revision 2171) +++ tests/border/resize_image3d_3.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/debug/iota.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> Index: tests/border/resize_sub_image.cc --- tests/border/resize_sub_image.cc (revision 2171) +++ tests/border/resize_sub_image.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::resize. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/get.hh> Index: tests/border/equalize.cc --- tests/border/equalize.cc (revision 2171) +++ tests/border/equalize.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::border::equalize. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/border/get.hh> #include <mln/border/equalize.hh> Index: tests/border/get.cc --- tests/border/get.cc (revision 2171) +++ tests/border/get.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::get. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/get.hh> Index: tests/border/find.cc --- tests/border/find.cc (revision 2171) +++ tests/border/find.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::border::find. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/debug/iota.hh> #include <mln/border/find.hh> Index: tests/border/resize_image_if.cc --- tests/border/resize_image_if.cc (revision 2171) +++ tests/border/resize_image_if.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::border::resize. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/border/get.hh> Index: tests/border/resize_full.cc --- tests/border/resize_full.cc (revision 2171) +++ tests/border/resize_full.cc (working copy) @@ -31,9 +31,9 @@ */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/border/resize.hh> #include <mln/border/get.hh> Index: tests/border/fill.cc --- tests/border/fill.cc (revision 2171) +++ tests/border/fill.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/border/fill.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/println_with_border.hh> Index: tests/border/adjust.cc --- tests/border/adjust.cc (revision 2171) +++ tests/border/adjust.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::border::adjust. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/border/get.hh> #include <mln/border/adjust.hh> Index: tests/test/positive.cc --- tests/test/positive.cc (revision 2171) +++ tests/test/positive.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::test::positive. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/test/positive.hh> Index: tests/convert/to_p_set.cc --- tests/convert/to_p_set.cc (revision 2171) +++ tests/convert/to_p_set.cc (working copy) @@ -31,12 +31,12 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/window2d.hh> #include <mln/core/box2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> Index: tests/convert/to_tiles.cc --- tests/convert/to_tiles.cc (revision 2171) +++ tests/convert/to_tiles.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::convert::to_tiles. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> #include <mln/level/fill.hh> @@ -38,7 +38,7 @@ #include <mln/border/fill.hh> #include <mln/debug/println_with_border.hh> #include <mln/debug/println.hh> -#include <mln/core/translate_image.hh> +#include <mln/core/image/translate_image.hh> #include <mln/convert/to_tiles.hh> int main () Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2171) +++ tests/convert/to_image.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::convert::to_image. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> Index: tests/convert/to_window.cc --- tests/convert/to_window.cc (revision 2171) +++ tests/convert/to_window.cc (working copy) @@ -31,12 +31,12 @@ */ #include <mln/core/dpoint2d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/window2d.hh> #include <mln/core/box2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> Index: tests/estim/mean.cc --- tests/estim/mean.cc (revision 2171) +++ tests/estim/mean.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::estim::mean. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> Index: tests/pw/value.cc --- tests/pw/value.cc (revision 2171) +++ tests/pw/value.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::pw::value_. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/pw/all.hh> Index: tests/geom/max_sli.cc --- tests/geom/max_sli.cc (revision 2171) +++ tests/geom/max_sli.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/max_sli.hh> Index: tests/geom/resize.cc --- tests/geom/resize.cc (revision 2171) +++ tests/geom/resize.cc (working copy) @@ -32,9 +32,9 @@ * \brief Tests on mln::geom::resize. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/resize.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> Index: tests/geom/nrows.cc --- tests/geom/nrows.cc (revision 2171) +++ tests/geom/nrows.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/nrows.hh> Index: tests/geom/seed2tiling_roundness.cc --- tests/geom/seed2tiling_roundness.cc (revision 2171) +++ tests/geom/seed2tiling_roundness.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::geom::seed2tiling_roundness. */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/core/w_window2d_int.hh> # include <mln/make/win_chamfer.hh> Index: tests/geom/seed2tiling.cc --- tests/geom/seed2tiling.cc (revision 2171) +++ tests/geom/seed2tiling.cc (working copy) @@ -31,7 +31,7 @@ */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/geom/seeds2tiling.hh> # include <mln/level/compare.hh> Index: tests/geom/min_row.cc --- tests/geom/min_row.cc (revision 2171) +++ tests/geom/min_row.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/min_row.hh> Index: tests/geom/ninds.cc --- tests/geom/ninds.cc (revision 2171) +++ tests/geom/ninds.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/geom/ninds.hh> Index: tests/geom/max_row.cc --- tests/geom/max_row.cc (revision 2171) +++ tests/geom/max_row.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/max_row.hh> Index: tests/geom/min_ind.cc --- tests/geom/min_ind.cc (revision 2171) +++ tests/geom/min_ind.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/geom/min_ind.hh> Index: tests/geom/ncols.cc --- tests/geom/ncols.cc (revision 2171) +++ tests/geom/ncols.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/ncols.hh> Index: tests/geom/max_ind.cc --- tests/geom/max_ind.cc (revision 2171) +++ tests/geom/max_ind.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image1d.hh> +#include <mln/core/image/image1d.hh> #include <mln/geom/max_ind.hh> Index: tests/geom/min_col.cc --- tests/geom/min_col.cc (revision 2171) +++ tests/geom/min_col.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/min_col.hh> Index: tests/geom/max_col.cc --- tests/geom/max_col.cc (revision 2171) +++ tests/geom/max_col.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/geom/max_col.hh> Index: tests/geom/nslis.cc --- tests/geom/nslis.cc (revision 2171) +++ tests/geom/nslis.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/nslis.hh> Index: tests/geom/min_sli.cc --- tests/geom/min_sli.cc (revision 2171) +++ tests/geom/min_sli.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/geom/min_sli.hh> Index: tests/fun/x2x/rotation.cc --- tests/fun/x2x/rotation.cc (revision 2171) +++ tests/fun/x2x/rotation.cc (working copy) @@ -32,11 +32,11 @@ #include <iostream> #include <mln/fun/x2x/rotation.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/core/interpolated.hh> +#include <mln/core/image/interpolated.hh> #include <mln/make/vec.hh> #include "tests/data.hh" Index: tests/fun/v2v/rgb_hsi_conversion.cc --- tests/fun/v2v/rgb_hsi_conversion.cc (revision 2171) +++ tests/fun/v2v/rgb_hsi_conversion.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/value/hsi.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <mln/io/ppm/load.hh> Index: tests/binarization/threshold.cc --- tests/binarization/threshold.cc (revision 2171) +++ tests/binarization/threshold.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/binarization/thresholding.cc /// \brief Test on mln::binarization::threshold. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/binarization/threshold.hh> #include <mln/level/all.hh> Index: tests/morpho/contrast.cc --- tests/morpho/contrast.cc (revision 2171) +++ tests/morpho/contrast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::contrast. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/morpho/meyer_wst_long.cc --- tests/morpho/meyer_wst_long.cc (revision 2171) +++ tests/morpho/meyer_wst_long.cc (working copy) @@ -30,8 +30,8 @@ #include <iostream> -#include <mln/core/image_if.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/gradient.cc --- tests/morpho/gradient.cc (revision 2171) +++ tests/morpho/gradient.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::gradient. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: tests/morpho/artificial_line_graph_image_wst.cc --- tests/morpho/artificial_line_graph_image_wst.cc (revision 2171) +++ tests/morpho/artificial_line_graph_image_wst.cc (working copy) @@ -49,14 +49,14 @@ #include <vector> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing_area_on_vertices.hh> Index: tests/morpho/rank_filter.cc --- tests/morpho/rank_filter.cc (revision 2171) +++ tests/morpho/rank_filter.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::rank_filter. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> Index: tests/morpho/dilation.cc --- tests/morpho/dilation.cc (revision 2171) +++ tests/morpho/dilation.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::dilation. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> Index: tests/morpho/line_graph_image_wst.cc --- tests/morpho/line_graph_image_wst.cc (revision 2171) +++ tests/morpho/line_graph_image_wst.cc (working copy) @@ -31,9 +31,9 @@ #include <vector> #include <mln/core/point2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/meyer_wst.hh> Index: tests/morpho/meyer_wst.cc --- tests/morpho/meyer_wst.cc (revision 2171) +++ tests/morpho/meyer_wst.cc (working copy) @@ -30,7 +30,7 @@ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/thinning.cc --- tests/morpho/thinning.cc (revision 2171) +++ tests/morpho/thinning.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::thinning. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/win/rectangle2d.hh> Index: tests/morpho/erosion.cc --- tests/morpho/erosion.cc (revision 2171) +++ tests/morpho/erosion.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::erosion. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> Index: tests/morpho/dilation_max_h.cc --- tests/morpho/dilation_max_h.cc (revision 2171) +++ tests/morpho/dilation_max_h.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::dilatation_fast. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/core/window2d.hh> Index: tests/morpho/hit_or_miss.cc --- tests/morpho/hit_or_miss.cc (revision 2171) +++ tests/morpho/hit_or_miss.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::hit_or_miss. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/win/rectangle2d.hh> Index: tests/morpho/combined.cc --- tests/morpho/combined.cc (revision 2171) +++ tests/morpho/combined.cc (working copy) @@ -30,7 +30,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> Index: tests/morpho/gradient_elementary.cc --- tests/morpho/gradient_elementary.cc (revision 2171) +++ tests/morpho/gradient_elementary.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::gradient_elementary. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/io/pbm/load.hh> Index: tests/morpho/laplacian.cc --- tests/morpho/laplacian.cc (revision 2171) +++ tests/morpho/laplacian.cc (working copy) @@ -30,14 +30,14 @@ * \brief Test on mln::morpho::laplacian. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> #include <mln/value/int_u_sat.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/pw/image.hh> #include <mln/arith/plus.hh> Index: tests/morpho/closing_volume.cc --- tests/morpho/closing_volume.cc (revision 2171) +++ tests/morpho/closing_volume.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/morpho/closing_volume.cc /// \brief Test on mln::morpho::closing_volume. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/closing_area.cc --- tests/morpho/closing_area.cc (revision 2171) +++ tests/morpho/closing_area.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::closing_area. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/closing_height.cc --- tests/morpho/closing_height.cc (revision 2171) +++ tests/morpho/closing_height.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/morpho/closing_height.cc /// \brief Test on mln::morpho::closing_height. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/opening_volume.cc --- tests/morpho/opening_volume.cc (revision 2171) +++ tests/morpho/opening_volume.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/morpho/opening_volume.cc /// \brief Test on mln::morpho::opening_volume. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/opening_area.cc --- tests/morpho/opening_area.cc (revision 2171) +++ tests/morpho/opening_area.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::opening_area. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/lena_line_graph_image_wst1.cc --- tests/morpho/lena_line_graph_image_wst1.cc (revision 2171) +++ tests/morpho/lena_line_graph_image_wst1.cc (working copy) @@ -48,14 +48,14 @@ #include <vector> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/gradient.hh> #include <mln/morpho/closing_area.hh> Index: tests/morpho/opening_height.cc --- tests/morpho/opening_height.cc (revision 2171) +++ tests/morpho/opening_height.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/morpho/opening_height.cc /// \brief Test on mln::morpho::opening_height. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> Index: tests/morpho/erosion_min_h.cc --- tests/morpho/erosion_min_h.cc (revision 2171) +++ tests/morpho/erosion_min_h.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::morpho::erosion_fast */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/core/window2d.hh> Index: tests/morpho/lena_line_graph_image_wst2.cc --- tests/morpho/lena_line_graph_image_wst2.cc (revision 2171) +++ tests/morpho/lena_line_graph_image_wst2.cc (working copy) @@ -51,14 +51,14 @@ #include <vector> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> -#include <mln/core/line_graph_neighborhood_piter.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_neighborhood_piter.hh> #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing_area_on_vertices.hh> Index: tests/display/show.cc --- tests/display/show.cc (revision 2171) +++ tests/display/show.cc (working copy) @@ -30,14 +30,14 @@ * \brief Tests on mln::display::show. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/make/win_chamfer.hh> #include <mln/geom/chamfer.hh> #include <mln/value/rgb8.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/display/save.hh> Index: tests/display/save_and_show.cc --- tests/display/save_and_show.cc (revision 2171) +++ tests/display/save_and_show.cc (working copy) @@ -30,14 +30,14 @@ * \brief Tests on mln::display::save_and_show. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/make/win_chamfer.hh> #include <mln/geom/chamfer.hh> #include <mln/value/rgb8.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: tests/display/color_pretty.cc --- tests/display/color_pretty.cc (revision 2171) +++ tests/display/color_pretty.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::display::color::pretty. */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/inplace.hh> # include <mln/value/rgb8.hh> # include <mln/display/color_pretty.hh> # include <mln/level/compare.hh> Index: tests/io/pgm/pgm27.cc --- tests/io/pgm/pgm27.cc (revision 2171) +++ tests/io/pgm/pgm27.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> Index: tests/io/pgm/pgm19.cc --- tests/io/pgm/pgm19.cc (revision 2171) +++ tests/io/pgm/pgm19.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> Index: tests/io/pgm/pgm.cc --- tests/io/pgm/pgm.cc (revision 2171) +++ tests/io/pgm/pgm.cc (working copy) @@ -31,7 +31,7 @@ */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> Index: tests/io/pgm/pgm16.cc --- tests/io/pgm/pgm16.cc (revision 2171) +++ tests/io/pgm/pgm16.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/value/int_u8.hh> Index: tests/io/fits/fits.cc --- tests/io/fits/fits.cc (revision 2171) +++ tests/io/fits/fits.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::fits::load. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/compare.hh> #include <mln/debug/println.hh> Index: tests/io/ppm/ppm.cc --- tests/io/ppm/ppm.cc (revision 2171) +++ tests/io/ppm/ppm.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <mln/io/ppm/load.hh> Index: tests/io/ppm/ppm23.cc --- tests/io/ppm/ppm23.cc (revision 2171) +++ tests/io/ppm/ppm23.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/value/rgb8.hh> Index: tests/io/ppm/ppm16.cc --- tests/io/ppm/ppm16.cc (revision 2171) +++ tests/io/ppm/ppm16.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/value/rgb8.hh> Index: tests/io/pbm/pbm.cc --- tests/io/pbm/pbm.cc (revision 2171) +++ tests/io/pbm/pbm.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::io::pbm::. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: tests/logical/or.cc --- tests/logical/or.cc (revision 2171) +++ tests/logical/or.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::logical::or. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/logical/or.hh> #include <mln/level/compare.hh> Index: tests/logical/not.cc --- tests/logical/not.cc (revision 2171) +++ tests/logical/not.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::logical::not. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/logical/not.hh> #include <mln/level/compare.hh> Index: tests/logical/or_full.cc --- tests/logical/or_full.cc (revision 2171) +++ tests/logical/or_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::logical::or. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/logical/or.hh> #include <mln/level/compare.hh> #include <mln/level/apply.hh> Index: tests/logical/and_not.cc --- tests/logical/and_not.cc (revision 2171) +++ tests/logical/and_not.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::logical::and_not. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/logical/and_not.hh> #include <mln/level/compare.hh> Index: tests/logical/and.cc --- tests/logical/and.cc (revision 2171) +++ tests/logical/and.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::logical::and. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/logical/and.hh> #include <mln/level/compare.hh> Index: tests/logical/not_full.cc --- tests/logical/not_full.cc (revision 2171) +++ tests/logical/not_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::logical::not. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/logical/not.hh> #include <mln/level/compare.hh> #include <mln/level/apply.hh> Index: tests/logical/and_not_full.cc --- tests/logical/and_not_full.cc (revision 2171) +++ tests/logical/and_not_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::logical::and_not. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/logical/and_not.hh> #include <mln/level/compare.hh> #include <mln/level/apply.hh> Index: tests/logical/and_full.cc --- tests/logical/and_full.cc (revision 2171) +++ tests/logical/and_full.cc (working copy) @@ -30,9 +30,9 @@ * \brief Tests on mln::logical::and. */ -#include <mln/core/image1d.hh> -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/logical/and.hh> #include <mln/level/compare.hh> #include <mln/level/apply.hh> Index: tests/canvas/chamfer.cc --- tests/canvas/chamfer.cc (revision 2171) +++ tests/canvas/chamfer.cc (working copy) @@ -30,10 +30,10 @@ * \brief Tests on mln::geom::chamfer. */ -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> Index: tests/canvas/browsing/directional.cc --- tests/canvas/browsing/directional.cc (revision 2171) +++ tests/canvas/browsing/directional.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::canvas::browsing::directional. */ -#include <mln/core/image2d.hh> -#include <mln/core/image3d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #include <mln/canvas/browsing/directional.hh> #include <mln/fun/p2v/iota.hh> #include <mln/debug/println.hh> Index: tests/canvas/browsing/fwd.cc --- tests/canvas/browsing/fwd.cc (revision 2171) +++ tests/canvas/browsing/fwd.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::canvas::browsing::fwd.hh */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/canvas/browsing/fwd.hh> #include <mln/fun/p2v/iota.hh> #include <mln/debug/println.hh> Index: tests/canvas/browsing/snake_fwd.cc --- tests/canvas/browsing/snake_fwd.cc (revision 2171) +++ tests/canvas/browsing/snake_fwd.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::canvas::browsing::snake_fwd. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/canvas/browsing/snake_fwd.hh> #include <mln/fun/p2v/iota.hh> #include <mln/debug/println.hh> Index: tests/util/tree_to_image.cc --- tests/util/tree_to_image.cc (revision 2171) +++ tests/util/tree_to_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/util/tree.hh> #include <mln/core/contract.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> Index: tests/util/branch_iter_ind.cc --- tests/util/branch_iter_ind.cc (revision 2171) +++ tests/util/branch_iter_ind.cc (working copy) @@ -32,7 +32,7 @@ * */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/util/tree.hh> #include <mln/util/branch_iter_ind.hh> Index: tests/util/lemmings.cc --- tests/util/lemmings.cc (revision 2171) +++ tests/util/lemmings.cc (working copy) @@ -33,7 +33,7 @@ */ #include <mln/util/lemmings.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> int main () { Index: tests/util/tree_fast_to_image.cc --- tests/util/tree_fast_to_image.cc (revision 2171) +++ tests/util/tree_fast_to_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/util/tree_fast.hh> #include <mln/core/contract.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> Index: tests/util/branch_iter.cc --- tests/util/branch_iter.cc (revision 2171) +++ tests/util/branch_iter.cc (working copy) @@ -32,7 +32,7 @@ * */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/util/tree.hh> #include <mln/util/branch_iter.hh> Index: tests/labeling/regional_maxima.cc --- tests/labeling/regional_maxima.cc (revision 2171) +++ tests/labeling/regional_maxima.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::regional_maxima. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> #include <mln/io/pgm/load.hh> Index: tests/labeling/background.cc --- tests/labeling/background.cc (revision 2171) +++ tests/labeling/background.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::background. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> #include <mln/labeling/background.hh> Index: tests/labeling/blobs.cc --- tests/labeling/blobs.cc (revision 2171) +++ tests/labeling/blobs.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::blobs. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> #include <mln/labeling/blobs.hh> Index: tests/labeling/flat_zones.cc --- tests/labeling/flat_zones.cc (revision 2171) +++ tests/labeling/flat_zones.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::flat_zones. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/core/neighb2d.hh> Index: tests/labeling/level.cc --- tests/labeling/level.cc (revision 2171) +++ tests/labeling/level.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::level. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> @@ -40,7 +40,7 @@ #include <mln/labeling/level.hh> #include <mln/level/paste.hh> #include <mln/pw/all.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/debug/println.hh> Index: tests/labeling/foreground.cc --- tests/labeling/foreground.cc (revision 2171) +++ tests/labeling/foreground.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::foreground. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> #include <mln/labeling/foreground.hh> Index: tests/labeling/regional_minima.cc --- tests/labeling/regional_minima.cc (revision 2171) +++ tests/labeling/regional_minima.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::labeling::regional_minima. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/core/neighb2d.hh> #include <mln/io/pgm/load.hh> Index: apps/statues/mesh-segm.cc --- apps/statues/mesh-segm.cc (revision 2171) +++ apps/statues/mesh-segm.cc (working copy) @@ -45,8 +45,8 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/morpho/closing_area.hh> #include <mln/morpho/meyer_wst.hh> Index: apps/statues/mesh-skel.cc --- apps/statues/mesh-skel.cc (revision 2171) +++ apps/statues/mesh-skel.cc (working copy) @@ -45,8 +45,8 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/morpho/closing_area.hh> #include <mln/labeling/regional_minima.hh> Index: doc/tutorial/examples/sub_image.cc --- doc/tutorial/examples/sub_image.cc (revision 2171) +++ doc/tutorial/examples/sub_image.cc (working copy) @@ -1,6 +1,6 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_line2d.cc --- doc/tutorial/examples/p_line2d.cc (revision 2171) +++ doc/tutorial/examples/p_line2d.cc (working copy) @@ -1,10 +1,10 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/pw/all.hh> # include <mln/core/site_set/line2d.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/level/fill.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_array.cc --- doc/tutorial/examples/p_array.cc (revision 2171) +++ doc/tutorial/examples/p_array.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_array.2.cc --- doc/tutorial/examples/p_array.2.cc (revision 2171) +++ doc/tutorial/examples/p_array.2.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/core/window.hh> Index: doc/tutorial/examples/image_if.cc --- doc/tutorial/examples/image_if.cc (revision 2171) +++ doc/tutorial/examples/image_if.cc (working copy) @@ -1,6 +1,6 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image_if.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_image.cc --- doc/tutorial/examples/p_image.cc (revision 2171) +++ doc/tutorial/examples/p_image.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/core/site_set/p_image.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_queue.cc --- doc/tutorial/examples/p_queue.cc (revision 2171) +++ doc/tutorial/examples/p_queue.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_queue.hh> # include <mln/core/site_set/p_queue_fast.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/image_plain.cc --- doc/tutorial/examples/image_plain.cc (revision 2171) +++ doc/tutorial/examples/image_plain.cc (working copy) @@ -1,5 +1,5 @@ -# include <mln/core/image2d.hh> -# include <mln/core/plain.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/plain.hh> # include <mln/debug/println.hh> # include <mln/debug/iota.hh> # include <mln/level/fill_with_value.hh> Index: doc/tutorial/examples/p_vaccess.cc --- doc/tutorial/examples/p_vaccess.cc (revision 2171) +++ doc/tutorial/examples/p_vaccess.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> @@ -10,7 +10,7 @@ # include <mln/core/alias/p_runs2d.hh> # include <mln/core/site_set/p_vaccess.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image_if.hh> # include <mln/pw/all.hh> # include <mln/convert/from_to.hh> Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2171) +++ doc/tutorial/examples/window.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/window2d.hh> # include <mln/core/site_set/p_array.hh> Index: doc/tutorial/examples/p_key.cc --- doc/tutorial/examples/p_key.cc (revision 2171) +++ doc/tutorial/examples/p_key.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_key.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_key.2.cc --- doc/tutorial/examples/p_key.2.cc (revision 2171) +++ doc/tutorial/examples/p_key.2.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_key.hh> # include <mln/value/int_u8.hh> # include <mln/io/pgm/load.hh> Index: doc/tutorial/examples/image2d.cc --- doc/tutorial/examples/image2d.cc (revision 2171) +++ doc/tutorial/examples/image2d.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/window2d.hh> # include <mln/core/site_set/p_array.hh> Index: doc/tutorial/examples/image_safe.cc --- doc/tutorial/examples/image_safe.cc (revision 2171) +++ doc/tutorial/examples/image_safe.cc (working copy) @@ -1,6 +1,6 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/line2d.hh> -# include <mln/core/safe.hh> +# include <mln/core/image/safe.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> Index: doc/tutorial/examples/proxy.cc --- doc/tutorial/examples/proxy.cc (revision 2171) +++ doc/tutorial/examples/proxy.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_run.cc --- doc/tutorial/examples/p_run.cc (revision 2171) +++ doc/tutorial/examples/p_run.cc (working copy) @@ -1,10 +1,10 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/alias/p_run2d.hh> # include <mln/core/site_set/p_set_of.hh> # include <mln/convert/from_to.hh> # include <mln/debug/println.hh> -// # include <mln/core/sparse_image.hh> +// # include <mln/core/image/sparse_image.hh> template <typename I> Index: doc/tutorial/examples/box.cc --- doc/tutorial/examples/box.cc (revision 2171) +++ doc/tutorial/examples/box.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/image_flat.cc --- doc/tutorial/examples/image_flat.cc (revision 2171) +++ doc/tutorial/examples/image_flat.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/image/flat_image.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_mutable_array_of.cc --- doc/tutorial/examples/p_mutable_array_of.cc (revision 2171) +++ doc/tutorial/examples/p_mutable_array_of.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_mutable_array_of.hh> # include <mln/core/site_set/p_run.hh> # include <mln/convert/from_to.hh> @@ -6,7 +6,7 @@ // Used by display. # include <mln/geom/bbox.hh> # include <mln/debug/println.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> template <typename S> Index: doc/benchmark/p_runs.cc --- doc/benchmark/p_runs.cc (revision 2171) +++ doc/benchmark/p_runs.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/io/pbm/load.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/alias/p_run2d.hh> # include <mln/core/p_set_of.hh> # include <mln/convert/from_to.hh> Index: doc/benchmark/image2d.cc --- doc/benchmark/image2d.cc (revision 2171) +++ doc/benchmark/image2d.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/util/timer.hh> # include <mln/core/pixter2d.hh> Index: doc/examples/labeling_algo.cc --- doc/examples/labeling_algo.cc (revision 2171) +++ doc/examples/labeling_algo.cc (working copy) @@ -30,8 +30,8 @@ * \brief Test on mln::geom::seeds2tiling. */ -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> Index: mln/debug/put_word.hh --- mln/debug/put_word.hh (revision 2171) +++ mln/debug/put_word.hh (working copy) @@ -34,7 +34,7 @@ */ # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> namespace mln Index: mln/debug/println.spe.hh --- mln/debug/println.spe.hh (revision 2171) +++ mln/debug/println.spe.hh (working copy) @@ -114,7 +114,7 @@ # endif // MLN_CORE_SITE_SET_BOX2D_HH -# ifdef MLN_CORE_IMAGE2D_H_HH +# ifdef MLN_CORE_IMAGE_IMAGE2D_H_HH // Hexa version. template <typename I> @@ -147,7 +147,7 @@ std::cout << std::endl; } -# endif // MLN_CORE_IMAGE2D_H_HH +# endif // MLN_CORE_IMAGE_IMAGE2D_H_HH # ifdef MLN_CORE_SITE_SET_BOX3D_HH Index: mln/core/internal/graph_vicinity_piter.hh --- mln/core/internal/graph_vicinity_piter.hh (revision 2171) +++ mln/core/internal/graph_vicinity_piter.hh (working copy) @@ -39,7 +39,7 @@ # include <mln/core/concept/site_iterator.hh> # include <mln/core/site_set/p_graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> /* FIXME: Due to the poor interface of mln::p_graph and mln::util::graph, we show to much implementation details here. Index: mln/core/internal/line_graph_vicinity_piter.hh --- mln/core/internal/line_graph_vicinity_piter.hh (revision 2171) +++ mln/core/internal/line_graph_vicinity_piter.hh (working copy) @@ -41,7 +41,7 @@ # include <mln/core/concept/site_iterator.hh> # include <mln/core/site_set/p_line_graph.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> namespace mln { Index: mln/core/image/mono_rle_encode.hh --- mln/core/image/mono_rle_encode.hh (revision 2171) +++ mln/core/image/mono_rle_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_MONO_RLE_ENCODE_HH -# define MLN_CORE_MONO_RLE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_MONO_RLE_ENCODE_HH +# define MLN_CORE_IMAGE_MONO_RLE_ENCODE_HH -/*! \file mln/core/mono_rle_encode.hh +/*! \file mln/core/image/mono_rle_encode.hh * * \brief Definintion of function which encodes an image in mono_rle_image. */ -# include <mln/core/mono_rle_image.hh> +# include <mln/core/image/mono_rle_image.hh> namespace mln { @@ -107,4 +107,4 @@ } -#endif // ! MLN_CORE_MONO_RLE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_MONO_RLE_ENCODE_HH Index: mln/core/image/value_encode.hh --- mln/core/image/value_encode.hh (revision 2171) +++ mln/core/image/value_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_VALUE_ENCODE_HH_ -# define MLN_CORE_VALUE_ENCODE_HH_ +#ifndef MLN_CORE_IMAGE_VALUE_ENCODE_HH_ +# define MLN_CORE_IMAGE_VALUE_ENCODE_HH_ -/*! \file mln/core/value_encode.hh +/*! \file mln/core/image/value_encode.hh * * \brief Definition of function which encodes an image in value_enc_image. */ -# include <mln/core/value_enc_image.hh> +# include <mln/core/image/value_enc_image.hh> namespace mln { @@ -112,4 +112,4 @@ } -#endif // ! MLN_CORE_VALUE_ENCODE_HH_ +#endif // ! MLN_CORE_IMAGE_VALUE_ENCODE_HH_ Index: mln/core/image/decorated_image.hh --- mln/core/image/decorated_image.hh (revision 2171) +++ mln/core/image/decorated_image.hh (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DECORATED_IMAGE_HH -# define MLN_CORE_DECORATED_IMAGE_HH +#ifndef MLN_CORE_IMAGE_DECORATED_IMAGE_HH +# define MLN_CORE_IMAGE_DECORATED_IMAGE_HH # include <mln/core/internal/image_identity.hh> # include <mln/value/proxy.hh> -/*! \file mln/core/decorated_image.hh +/*! \file mln/core/image/decorated_image.hh * * \brief Definition of an image that can have additional features. */ @@ -278,4 +278,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DECORATED_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_DECORATED_IMAGE_HH Index: mln/core/image/cast_image.hh --- mln/core/image/cast_image.hh (revision 2171) +++ mln/core/image/cast_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_CAST_IMAGE_HH -# define MLN_CORE_CAST_IMAGE_HH +#ifndef MLN_CORE_IMAGE_CAST_IMAGE_HH +# define MLN_CORE_IMAGE_CAST_IMAGE_HH -/*! \file mln/core/cast_image.hh +/*! \file mln/core/image/cast_image.hh * * \brief Definition of an image morpher that make the user see the * same image but with another data type. @@ -184,4 +184,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_CAST_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_CAST_IMAGE_HH Index: mln/core/image/translate_image.hh --- mln/core/image/translate_image.hh (revision 2171) +++ mln/core/image/translate_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TRANSLATE_IMAGE_HH -# define MLN_CORE_TRANSLATE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH +# define MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH -/*! \file mln/core/translate_image.hh +/*! \file mln/core/image/translate_image.hh * * \brief Definition of an image which be translated by a delta point. */ @@ -213,4 +213,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TRANSLATE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH Index: mln/core/image/image_if.hh --- mln/core/image/image_if.hh (revision 2171) +++ mln/core/image/image_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE_IF_HH -# define MLN_CORE_IMAGE_IF_HH +#ifndef MLN_CORE_IMAGE_IMAGE_IF_HH +# define MLN_CORE_IMAGE_IMAGE_IF_HH -/*! \file mln/core/image_if.hh +/*! \file mln/core/image/image_if.hh * * \brief Definition of a image which domain is restricted by a * function. @@ -239,4 +239,4 @@ # undef Super -#endif // ! MLN_CORE_IMAGE_IF_HH +#endif // ! MLN_CORE_IMAGE_IMAGE_IF_HH Index: mln/core/image/obased_rle_image.hh --- mln/core/image/obased_rle_image.hh (revision 2171) +++ mln/core/image/obased_rle_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_OBASED_RLE_IMAGE_HH -# define MLN_CORE_OBASED_RLE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_OBASED_RLE_IMAGE_HH +# define MLN_CORE_IMAGE_OBASED_RLE_IMAGE_HH -/*! \file mln/core/obased_rle_image.hh +/*! \file mln/core/image/obased_rle_image.hh * * \brief Definition of an image with rle encoding. */ @@ -287,4 +287,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_OBASED_RLE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_OBASED_RLE_IMAGE_HH Index: mln/core/image/line_graph_neighborhood_piter.hh --- mln/core/image/line_graph_neighborhood_piter.hh (revision 2171) +++ mln/core/image/line_graph_neighborhood_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH -# define MLN_CORE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH -/// \file mln/core/line_graph_neighborhood_piter.hh +/// \file mln/core/image/line_graph_neighborhood_piter.hh /// \brief Definition of a point iterator on a line graph neighborhood. # include <mln/core/internal/line_graph_vicinity_piter.hh> @@ -295,4 +295,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_NEIGHBORHOOD_PITER_HH Index: mln/core/image/line_graph_window_piter.hh --- mln/core/image/line_graph_window_piter.hh (revision 2171) +++ mln/core/image/line_graph_window_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_WINDOW_PITER_HH -# define MLN_CORE_LINE_GRAPH_WINDOW_PITER_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_WINDOW_PITER_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_WINDOW_PITER_HH -/// \file mln/core/line_graph_window_piter.hh +/// \file mln/core/image/line_graph_window_piter.hh /// \brief Definition of a point iterator on a line_graph window. # include <mln/core/internal/line_graph_vicinity_piter.hh> @@ -292,4 +292,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_WINDOW_PITER_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_WINDOW_PITER_HH Index: mln/core/image/value_enc_image.hh --- mln/core/image/value_enc_image.hh (revision 2171) +++ mln/core/image/value_enc_image.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_VALUE_ENC_IMAGE_CC_ # define MLN_CORE_VALUE_ENC_IMAGE_CC_ -/*! \file mln/core/value_enc_image.hh +/*! \file mln/core/image/value_enc_image.hh * * \brief Define the class value_enc_image. */ Index: mln/core/image/graph_image.hh --- mln/core/image/graph_image.hh (revision 2171) +++ mln/core/image/graph_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_IMAGE_HH -# define MLN_CORE_GRAPH_IMAGE_HH +#ifndef MLN_CORE_IMAGE_GRAPH_IMAGE_HH +# define MLN_CORE_IMAGE_GRAPH_IMAGE_HH -/// \file mln/core/graph_image.hh +/// \file mln/core/image/graph_image.hh /// \brief Definition of a graph-based image. # include <mln/trait/images.hh> @@ -36,7 +36,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> # include <mln/core/site_set/p_graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> # include <mln/value/set.hh> # include <vector> @@ -297,4 +297,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_IMAGE_HH Index: mln/core/image/line_graph_elt_neighborhood.hh --- mln/core/image/line_graph_elt_neighborhood.hh (revision 2171) +++ mln/core/image/line_graph_elt_neighborhood.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH -# define MLN_CORE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH -/// \file mln/core/line_graph_elt_neighborhood.hh +/// \file mln/core/image/line_graph_elt_neighborhood.hh /// \brief Definition of the elementary ``neighborhood'' on a line graph. /* FIXME: Have a consistent naming: we have window (without '_') but @@ -47,8 +47,8 @@ # include <set> # include <mln/core/concept/neighborhood.hh> -# include <mln/core/line_graph_psite.hh> -# include <mln/core/line_graph_neighborhood_piter.hh> +# include <mln/core/image/line_graph_psite.hh> +# include <mln/core/image/line_graph_neighborhood_piter.hh> namespace mln @@ -140,4 +140,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_ELT_NEIGHBORHOOD_HH Index: mln/core/image/line_graph_elt_window.hh --- mln/core/image/line_graph_elt_window.hh (revision 2171) +++ mln/core/image/line_graph_elt_window.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_ELT_WINDOW_HH -# define MLN_CORE_LINE_GRAPH_ELT_WINDOW_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_ELT_WINDOW_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_ELT_WINDOW_HH -/// \file mln/core/line_graph_elt_window.hh +/// \file mln/core/image/line_graph_elt_window.hh /// \brief Definition of the elementary ``window'' on a line graph. /* FIXME: Have a consistent naming: we have window (without '_') but @@ -45,8 +45,8 @@ Enrich their interfaces to avoid that. */ # include <mln/core/concept/window.hh> -# include <mln/core/line_graph_psite.hh> -# include <mln/core/line_graph_window_piter.hh> +# include <mln/core/image/line_graph_psite.hh> +# include <mln/core/image/line_graph_window_piter.hh> namespace mln @@ -201,4 +201,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_ELT_WINDOW_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_ELT_WINDOW_HH Index: mln/core/image/mono_obased_rle_encode.hh --- mln/core/image/mono_obased_rle_encode.hh (revision 2171) +++ mln/core/image/mono_obased_rle_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_MONO_OBASED_RLE_ENCODE_HH -# define MLN_CORE_MONO_OBASED_RLE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_MONO_OBASED_RLE_ENCODE_HH +# define MLN_CORE_IMAGE_MONO_OBASED_RLE_ENCODE_HH -/*! \file mln/core/mono_obased_rle_encode.hh +/*! \file mln/core/image/mono_obased_rle_encode.hh * * \brief Definintion of function which encodes an image in mono_obased_rle_image. */ -# include <mln/core/mono_obased_rle_image.hh> +# include <mln/core/image/mono_obased_rle_image.hh> namespace mln { @@ -119,4 +119,4 @@ } -#endif // ! MLN_CORE_MONO_OBASED_RLE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_MONO_OBASED_RLE_ENCODE_HH Index: mln/core/image/graph_psite.hh --- mln/core/image/graph_psite.hh (revision 2171) +++ mln/core/image/graph_psite.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_PSITE_HH -# define MLN_CORE_GRAPH_PSITE_HH +#ifndef MLN_CORE_IMAGE_GRAPH_PSITE_HH +# define MLN_CORE_IMAGE_GRAPH_PSITE_HH -/// \file mln/core/graph_psite.hh +/// \file mln/core/image/graph_psite.hh /// \brief Definition of a graph-based point site. # include <mln/core/concept/point_site.hh> @@ -235,4 +235,4 @@ } // end of mln -#endif // MLN_CORE_GRAPH_PSITE_HH +#endif // MLN_CORE_IMAGE_GRAPH_PSITE_HH Index: mln/core/image/sparse_encode.hh --- mln/core/image/sparse_encode.hh (revision 2171) +++ mln/core/image/sparse_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SPARSE_ENCODE_HH -# define MLN_CORE_SPARSE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_SPARSE_ENCODE_HH +# define MLN_CORE_IMAGE_SPARSE_ENCODE_HH -/*! \file mln/core/sparse_encode.hh +/*! \file mln/core/image/sparse_encode.hh * * \brief Definintion of function which encodes an image in sparse_image. */ -# include <mln/core/sparse_image.hh> +# include <mln/core/image/sparse_image.hh> namespace mln { @@ -117,4 +117,4 @@ } -#endif // ! MLN_CORE_SPARSE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_SPARSE_ENCODE_HH Index: mln/core/image/line_graph_image.hh --- mln/core/image/line_graph_image.hh (revision 2171) +++ mln/core/image/line_graph_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_IMAGE_HH -# define MLN_CORE_LINE_GRAPH_IMAGE_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_IMAGE_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_IMAGE_HH -/// \file mln/core/line_graph_image.hh +/// \file mln/core/image/line_graph_image.hh /// \brief Definition of a line graph-based image. # include <mln/trait/images.hh> @@ -36,7 +36,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> # include <mln/core/site_set/p_line_graph.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> # include <mln/value/set.hh> # include <vector> @@ -345,4 +345,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE_GRAPH_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_LINE_GRAPH_IMAGE_HH Index: mln/core/image/line_graph_psite.hh --- mln/core/image/line_graph_psite.hh (revision 2171) +++ mln/core/image/line_graph_psite.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE_GRAPH_PSITE_HH -# define MLN_CORE_LINE_GRAPH_PSITE_HH +#ifndef MLN_CORE_IMAGE_LINE_GRAPH_PSITE_HH +# define MLN_CORE_IMAGE_LINE_GRAPH_PSITE_HH -/// \file mln/core/line_graph_psite.hh +/// \file mln/core/image/line_graph_psite.hh /// \brief Definition of a line graph-based point site. # include <mln/core/site_set/p_line_graph.hh> @@ -325,4 +325,4 @@ } // end of mln -#endif // MLN_CORE_LINE_GRAPH_PSITE_HH +#endif // MLN_CORE_IMAGE_LINE_GRAPH_PSITE_HH Index: mln/core/image/safe.hh --- mln/core/image/safe.hh (revision 2171) +++ mln/core/image/safe.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SAFE_HH -# define MLN_CORE_SAFE_HH +#ifndef MLN_CORE_IMAGE_SAFE_HH +# define MLN_CORE_IMAGE_SAFE_HH /*! - * \file mln/core/safe.hh + * \file mln/core/image/safe.hh * * \brief Definition of a morpher that makes image become accessible * at undefined location. @@ -210,4 +210,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SAFE_HH +#endif // ! MLN_CORE_IMAGE_SAFE_HH Index: mln/core/image/rle_image.hh --- mln/core/image/rle_image.hh (revision 2171) +++ mln/core/image/rle_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_RLE_IMAGE_HH -# define MLN_CORE_RLE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_RLE_IMAGE_HH +# define MLN_CORE_IMAGE_RLE_IMAGE_HH -/*! \file mln/core/rle_image.hh +/*! \file mln/core/image/rle_image.hh * * \brief Definition of an image with rle encoding. */ @@ -240,4 +240,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_RLE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_RLE_IMAGE_HH Index: mln/core/image/hexa.hh --- mln/core/image/hexa.hh (revision 2171) +++ mln/core/image/hexa.hh (working copy) @@ -26,11 +26,11 @@ // Public License. -#ifndef MLN_CORE_HEXA_HH -# define MLN_CORE_HEXA_HH +#ifndef MLN_CORE_IMAGE_HEXA_HH +# define MLN_CORE_IMAGE_HEXA_HH -/*! \file mln/core/hexa.hh +/*! \file mln/core/image/hexa.hh * * \brief Definition of a morpher that makes hexagonal the mesh of an * image. @@ -39,7 +39,7 @@ # include <mln/core/internal/image_domain_morpher.hh> # include <mln/core/point2d_h.hh> # include <mln/core/box2d_h.hh> -# include <mln/core/hexa_piter.hh> +# include <mln/core/image/hexa_piter.hh> namespace mln @@ -279,4 +279,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_HEXA_HH +#endif // ! MLN_CORE_IMAGE_HEXA_HH Index: mln/core/image/tr_image.hh --- mln/core/image/tr_image.hh (revision 2171) +++ mln/core/image/tr_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TR_IMAGE_HH -# define MLN_CORE_TR_IMAGE_HH +#ifndef MLN_CORE_IMAGE_TR_IMAGE_HH +# define MLN_CORE_IMAGE_TR_IMAGE_HH -/*! \file mln/core/tr_image.hh +/*! \file mln/core/image/tr_image.hh * * \brief Definition of the morpher mln::tr_image presenting an image * through a (bijective) transformation. @@ -219,4 +219,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TR_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_TR_IMAGE_HH Index: mln/core/image/hexa_piter.hh --- mln/core/image/hexa_piter.hh (revision 2171) +++ mln/core/image/hexa_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_HEXA_PITER_HH -# define MLN_CORE_HEXA_PITER_HH +#ifndef MLN_CORE_IMAGE_HEXA_PITER_HH +# define MLN_CORE_IMAGE_HEXA_PITER_HH -/*! \file mln/core/hexa_piter.hh +/*! \file mln/core/image/hexa_piter.hh * * \brief Definition of iterators on hexagonal points. */ @@ -37,7 +37,7 @@ # include <mln/core/box2d.hh> # include <mln/core/box2d_h.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln { @@ -140,4 +140,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_HEXA_PITER_HH +#endif // ! MLN_CORE_IMAGE_HEXA_PITER_HH Index: mln/core/image/mono_obased_rle_image.hh --- mln/core/image/mono_obased_rle_image.hh (revision 2171) +++ mln/core/image/mono_obased_rle_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_MONO_OBASED_RLE_IMAGE_HH -# define MLN_CORE_MONO_OBASED_RLE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_MONO_OBASED_RLE_IMAGE_HH +# define MLN_CORE_IMAGE_MONO_OBASED_RLE_IMAGE_HH -/*! \file mln/core/mono_obased_rle_image.hh +/*! \file mln/core/image/mono_obased_rle_image.hh * * \brief Definition of an image with rle encoding. */ @@ -38,7 +38,7 @@ # include <mln/core/runs_psite.hh> # include <mln/core/site_set/box.hh> # include <mln/value/set.hh> -# include <mln/core/mono_rle_image.hh> +# include <mln/core/image/mono_rle_image.hh> # include <vector> namespace mln @@ -264,4 +264,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_MONO_OBASED_RLE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_MONO_OBASED_RLE_IMAGE_HH Index: mln/core/image/interpolated.hh --- mln/core/image/interpolated.hh (revision 2171) +++ mln/core/image/interpolated.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERPOLATED_HH -# define MLN_CORE_INTERPOLATED_HH +#ifndef MLN_CORE_IMAGE_INTERPOLATED_HH +# define MLN_CORE_IMAGE_INTERPOLATED_HH -/*! \file mln/core/interpolated.hh +/*! \file mln/core/image/interpolated.hh * * \brief Definition of a morpher that makes an image become readable * with floating coordinates. @@ -191,4 +191,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERPOLATED_HH +#endif // ! MLN_CORE_IMAGE_INTERPOLATED_HH Index: mln/core/image/graph_neighborhood_piter.hh --- mln/core/image/graph_neighborhood_piter.hh (revision 2171) +++ mln/core/image/graph_neighborhood_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_NEIGHBORHOOD_PITER_HH -# define MLN_CORE_GRAPH_NEIGHBORHOOD_PITER_HH +#ifndef MLN_CORE_IMAGE_GRAPH_NEIGHBORHOOD_PITER_HH +# define MLN_CORE_IMAGE_GRAPH_NEIGHBORHOOD_PITER_HH -/// \file mln/core/graph_neighborhood_piter.hh +/// \file mln/core/image/graph_neighborhood_piter.hh /// \brief Definition of a point iterator on a graph neighborhood. # include <mln/core/internal/graph_vicinity_piter.hh> @@ -294,4 +294,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_NEIGHBORHOOD_PITER_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_NEIGHBORHOOD_PITER_HH Index: mln/core/image/graph_window_piter.hh --- mln/core/image/graph_window_piter.hh (revision 2171) +++ mln/core/image/graph_window_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_WINDOW_PITER_HH -# define MLN_CORE_GRAPH_WINDOW_PITER_HH +#ifndef MLN_CORE_IMAGE_GRAPH_WINDOW_PITER_HH +# define MLN_CORE_IMAGE_GRAPH_WINDOW_PITER_HH -/// \file mln/core/graph_window_piter.hh +/// \file mln/core/image/graph_window_piter.hh /// \brief Definition of a point iterator on a graph window. # include <mln/core/internal/graph_vicinity_piter.hh> @@ -290,4 +290,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_WINDOW_PITER_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_WINDOW_PITER_HH Index: mln/core/image/sub_image.hh --- mln/core/image/sub_image.hh (revision 2171) +++ mln/core/image/sub_image.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SUB_IMAGE_HH -# define MLN_CORE_SUB_IMAGE_HH +#ifndef MLN_CORE_IMAGE_SUB_IMAGE_HH +# define MLN_CORE_IMAGE_SUB_IMAGE_HH /*! - * \file mln/core/sub_image.hh + * \file mln/core/image/sub_image.hh * * \brief Definition of morpher that makes an image become restricted * given by a point set. @@ -264,4 +264,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SUB_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_SUB_IMAGE_HH Index: mln/core/image/graph_elt_window.hh --- mln/core/image/graph_elt_window.hh (revision 2171) +++ mln/core/image/graph_elt_window.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_ELT_WINDOW_HH -# define MLN_CORE_GRAPH_ELT_WINDOW_HH +#ifndef MLN_CORE_IMAGE_GRAPH_ELT_WINDOW_HH +# define MLN_CORE_IMAGE_GRAPH_ELT_WINDOW_HH -/// \file mln/core/graph_elt_window.hh +/// \file mln/core/image/graph_elt_window.hh /// \brief Definition of the elementary ``window'' on a graph. /* FIXME: Have a consistent naming: we have window (without '_') but @@ -45,8 +45,8 @@ Enrich their interfaces to avoid that. */ # include <mln/core/concept/window.hh> -# include <mln/core/graph_psite.hh> -# include <mln/core/graph_window_piter.hh> +# include <mln/core/image/graph_psite.hh> +# include <mln/core/image/graph_window_piter.hh> namespace mln @@ -202,4 +202,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_ELT_WINDOW_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_ELT_WINDOW_HH Index: mln/core/image/graph_elt_neighborhood.hh --- mln/core/image/graph_elt_neighborhood.hh (revision 2171) +++ mln/core/image/graph_elt_neighborhood.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_GRAPH_ELT_NEIGHBORHOOD_HH -# define MLN_CORE_GRAPH_ELT_NEIGHBORHOOD_HH +#ifndef MLN_CORE_IMAGE_GRAPH_ELT_NEIGHBORHOOD_HH +# define MLN_CORE_IMAGE_GRAPH_ELT_NEIGHBORHOOD_HH -/// \file mln/core/graph_elt_neighborhood.hh +/// \file mln/core/image/graph_elt_neighborhood.hh /// \brief Definition of the elementary ``neighborhood'' on a graph. /* FIXME: Have a consistent naming: we have neighborhood (without '_') @@ -45,8 +45,8 @@ Enrich their interfaces to avoid that. */ # include <mln/core/concept/neighborhood.hh> -# include <mln/core/graph_psite.hh> -# include <mln/core/graph_neighborhood_piter.hh> +# include <mln/core/image/graph_psite.hh> +# include <mln/core/image/graph_neighborhood_piter.hh> namespace mln @@ -136,4 +136,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_GRAPH_ELT_NEIGHBORHOOD_HH +#endif // ! MLN_CORE_IMAGE_GRAPH_ELT_NEIGHBORHOOD_HH Index: mln/core/image/sparse_image.hh --- mln/core/image/sparse_image.hh (revision 2171) +++ mln/core/image/sparse_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SPARSE_IMAGE_HH -# define MLN_CORE_SPARSE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_SPARSE_IMAGE_HH +# define MLN_CORE_IMAGE_SPARSE_IMAGE_HH -/*! \file mln/core/sparse_image.hh +/*! \file mln/core/image/sparse_image.hh * * \brief Definition of an image with sparse encoding. */ @@ -260,4 +260,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SPARSE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_SPARSE_IMAGE_HH Index: mln/core/image/rle_encode.hh --- mln/core/image/rle_encode.hh (revision 2171) +++ mln/core/image/rle_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_RLE_ENCODE_HH -# define MLN_CORE_RLE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_RLE_ENCODE_HH +# define MLN_CORE_IMAGE_RLE_ENCODE_HH -/*! \file mln/core/rle_encode.hh +/*! \file mln/core/image/rle_encode.hh * * \brief Definintion of function which encodes an image in rle_image. */ -# include <mln/core/rle_image.hh> +# include <mln/core/image/rle_image.hh> namespace mln { @@ -112,4 +112,4 @@ } -#endif // ! MLN_CORE_RLE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_RLE_ENCODE_HH Index: mln/core/image/tr_mesh.hh --- mln/core/image/tr_mesh.hh (revision 2171) +++ mln/core/image/tr_mesh.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TR_MESH_HH -# define MLN_CORE_TR_MESH_HH +#ifndef MLN_CORE_IMAGE_TR_MESH_HH +# define MLN_CORE_IMAGE_TR_MESH_HH -/*! \file mln/core/tr_mesh.hh +/*! \file mln/core/image/tr_mesh.hh * * \brief Definition of a mesh that is transformed by a given * transformation. @@ -65,4 +65,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TR_MESH_HH +#endif // ! MLN_CORE_IMAGE_TR_MESH_HH Index: mln/core/image/plain.hh --- mln/core/image/plain.hh (revision 2171) +++ mln/core/image/plain.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_PLAIN_HH -# define MLN_CORE_PLAIN_HH +#ifndef MLN_CORE_IMAGE_PLAIN_HH +# define MLN_CORE_IMAGE_PLAIN_HH -/*! \file mln/core/plain.hh +/*! \file mln/core/image/plain.hh * * \brief Definition of a morpher that prevents an image from sharing * his data. @@ -204,4 +204,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_PLAIN_HH +#endif // ! MLN_CORE_IMAGE_PLAIN_HH Index: mln/core/image/bgraph_image.hh --- mln/core/image/bgraph_image.hh (revision 2171) +++ mln/core/image/bgraph_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BGRAPH_IMAGE_HH -# define MLN_CORE_BGRAPH_IMAGE_HH +#ifndef MLN_CORE_IMAGE_BGRAPH_IMAGE_HH +# define MLN_CORE_IMAGE_BGRAPH_IMAGE_HH -/// \file mln/core/bgraph_image.hh +/// \file mln/core/image/bgraph_image.hh /// \brief Definition of a boost-graph-based image. # include <mln/trait/images.hh> @@ -36,7 +36,7 @@ # include <mln/algebra/vec.hh> # include <mln/core/site_set/p_bgraph.hh> -# include <mln/core/bgraph_psite.hh> +# include <mln/core/image/bgraph_psite.hh> # include <mln/value/set.hh> # include <vector> @@ -297,4 +297,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_BGRAPH_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_BGRAPH_IMAGE_HH Index: mln/core/image/t_image.hh --- mln/core/image/t_image.hh (revision 2171) +++ mln/core/image/t_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_T_IMAGE_HH -# define MLN_CORE_T_IMAGE_HH +#ifndef MLN_CORE_IMAGE_T_IMAGE_HH +# define MLN_CORE_IMAGE_T_IMAGE_HH -/*! \file mln/core/t_image.hh +/*! \file mln/core/image/t_image.hh * * \brief Definition of the "transposed" image class mln::t_image. */ @@ -303,4 +303,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_T_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_T_IMAGE_HH Index: mln/core/image/image1d.hh --- mln/core/image/image1d.hh (revision 2171) +++ mln/core/image/image1d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE1D_HH -# define MLN_CORE_IMAGE1D_HH +#ifndef MLN_CORE_IMAGE_IMAGE1D_HH +# define MLN_CORE_IMAGE_IMAGE1D_HH -/// \file mln/core/image1d.hh +/// \file mln/core/image/image1d.hh /// \brief Definition of the basic mln::image1d class. # include <mln/core/internal/fixme.hh> @@ -592,4 +592,4 @@ # include <mln/make/image1d.hh> -#endif // ! MLN_CORE_IMAGE1D_HH +#endif // ! MLN_CORE_IMAGE_IMAGE1D_HH Index: mln/core/image/bgraph_psite.hh --- mln/core/image/bgraph_psite.hh (revision 2171) +++ mln/core/image/bgraph_psite.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BGRAPH_PSITE_HH -# define MLN_CORE_BGRAPH_PSITE_HH +#ifndef MLN_CORE_IMAGE_BGRAPH_PSITE_HH +# define MLN_CORE_IMAGE_BGRAPH_PSITE_HH -/// \file mln/core/bgraph_psite.hh +/// \file mln/core/image/bgraph_psite.hh /// \brief Definition of a boost-graph-based point site. # include <mln/core/site_set/p_graph.hh> @@ -173,4 +173,4 @@ } // end of mln -#endif // MLN_CORE_BGRAPH_PSITE_HH +#endif // MLN_CORE_IMAGE_BGRAPH_PSITE_HH Index: mln/core/image/fi_adaptor.hh --- mln/core/image/fi_adaptor.hh (revision 2171) +++ mln/core/image/fi_adaptor.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_FI_ADAPTOR_HH -# define MLN_CORE_FI_ADAPTOR_HH +#ifndef MLN_CORE_IMAGE_FI_ADAPTOR_HH +# define MLN_CORE_IMAGE_FI_ADAPTOR_HH -/*! \file mln/core/fi_adaptor.hh +/*! \file mln/core/image/fi_adaptor.hh * * \brief Definition of the fi_adaptor image class. This class aims * to use the fipImage class (Main FreeImagePlus class) through one of @@ -487,4 +487,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_FI_ADAPTOR_HH +#endif // ! MLN_CORE_IMAGE_FI_ADAPTOR_HH Index: mln/core/image/image2d.hh --- mln/core/image/image2d.hh (revision 2171) +++ mln/core/image/image2d.hh (working copy) @@ -26,10 +26,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE2D_HH -# define MLN_CORE_IMAGE2D_HH +#ifndef MLN_CORE_IMAGE_IMAGE2D_HH +# define MLN_CORE_IMAGE_IMAGE2D_HH -/// \file mln/core/image2d.hh +/// \file mln/core/image/image2d.hh /// \brief Definition of the basic mln::image2d class. # include <mln/core/internal/image_primary.hh> @@ -700,4 +700,4 @@ # include <mln/make/image2d.hh> -#endif // ! MLN_CORE_IMAGE2D_HH +#endif // ! MLN_CORE_IMAGE_IMAGE2D_HH Index: mln/core/image/image3d.hh --- mln/core/image/image3d.hh (revision 2171) +++ mln/core/image/image3d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE3D_HH -# define MLN_CORE_IMAGE3D_HH +#ifndef MLN_CORE_IMAGE_IMAGE3D_HH +# define MLN_CORE_IMAGE_IMAGE3D_HH -/// \file mln/core/image3d.hh +/// \file mln/core/image/image3d.hh /// \brief Definition of the basic mln::image3d class. # include <mln/core/internal/fixme.hh> @@ -631,4 +631,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_IMAGE3D_HH +#endif // ! MLN_CORE_IMAGE_IMAGE3D_HH Index: mln/core/image/inplace.hh --- mln/core/image/inplace.hh (revision 2171) +++ mln/core/image/inplace.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INPLACE_HH -# define MLN_CORE_INPLACE_HH +#ifndef MLN_CORE_IMAGE_INPLACE_HH +# define MLN_CORE_IMAGE_INPLACE_HH -/*! \file mln/core/inplace.hh +/*! \file mln/core/image/inplace.hh * * \brief Definition of routine that make temporary objects become * mutable. @@ -63,4 +63,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INPLACE_HH +#endif // ! MLN_CORE_IMAGE_INPLACE_HH Index: mln/core/image/obased_rle_encode.hh --- mln/core/image/obased_rle_encode.hh (revision 2171) +++ mln/core/image/obased_rle_encode.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_OBASED_RLE_ENCODE_HH -# define MLN_CORE_OBASED_RLE_ENCODE_HH +#ifndef MLN_CORE_IMAGE_OBASED_RLE_ENCODE_HH +# define MLN_CORE_IMAGE_OBASED_RLE_ENCODE_HH -/*! \file mln/core/obased_rle_encode.hh +/*! \file mln/core/image/obased_rle_encode.hh * * \brief Definintion of function which encodes an image in obased_rle_image. */ -# include <mln/core/obased_rle_image.hh> +# include <mln/core/image/obased_rle_image.hh> namespace mln { @@ -119,4 +119,4 @@ } -#endif // ! MLN_CORE_OBASED_RLE_ENCODE_HH +#endif // ! MLN_CORE_IMAGE_OBASED_RLE_ENCODE_HH Index: mln/core/image/mono_rle_image.hh --- mln/core/image/mono_rle_image.hh (revision 2171) +++ mln/core/image/mono_rle_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_MONO_RLE_IMAGE_HH -# define MLN_CORE_MONO_RLE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_MONO_RLE_IMAGE_HH +# define MLN_CORE_IMAGE_MONO_RLE_IMAGE_HH -/*! \file mln/core/mono_rle_image.hh +/*! \file mln/core/image/mono_rle_image.hh * * \brief Definition of an image with rle encoding. */ @@ -249,4 +249,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_MONO_RLE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_MONO_RLE_IMAGE_HH Index: mln/core/image/image2d_h.hh --- mln/core/image/image2d_h.hh (revision 2171) +++ mln/core/image/image2d_h.hh (working copy) @@ -25,17 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_IMAGE2D_H_HH -# define MLN_CORE_IMAGE2D_H_HH +#ifndef MLN_CORE_IMAGE_IMAGE2D_H_HH +# define MLN_CORE_IMAGE_IMAGE2D_H_HH -/*! \file mln/core/image2d_h.hh +/*! \file mln/core/image/image2d_h.hh * * \brief Definition of an alias for a 2d image based on an hexagonal * mesh. */ -# include <mln/core/image2d.hh> -# include <mln/core/hexa.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/hexa.hh> # include <mln/border/thickness.hh> @@ -94,4 +94,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_IMAGE2D_H_HH +#endif // ! MLN_CORE_IMAGE_IMAGE2D_H_HH Index: mln/core/p_image2d.hh --- mln/core/p_image2d.hh (revision 2171) +++ mln/core/p_image2d.hh (working copy) @@ -36,8 +36,8 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/core/box2d.hh> -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> # include <mln/accu/bbox.hh> # include <mln/geom/ncols.hh> Index: mln/core/site_set/p_bgraph.hh --- mln/core/site_set/p_bgraph.hh (revision 2171) +++ mln/core/site_set/p_bgraph.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> -# include <mln/core/bgraph_psite.hh> +# include <mln/core/image/bgraph_psite.hh> # include <mln/core/site_set/p_bgraph_piter.hh> Index: mln/core/site_set/p_graph_piter.hh --- mln/core/site_set/p_graph_piter.hh (revision 2171) +++ mln/core/site_set/p_graph_piter.hh (working copy) @@ -30,7 +30,7 @@ # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/site_set/p_graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> /// \file mln/core/site_set/p_graph_piter.hh /// \brief Definition of point iterator on graph-based point set. Index: mln/core/site_set/p_bgraph_piter.hh --- mln/core/site_set/p_bgraph_piter.hh (revision 2171) +++ mln/core/site_set/p_bgraph_piter.hh (working copy) @@ -32,7 +32,7 @@ # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/site_set/p_bgraph.hh> -# include <mln/core/bgraph_psite.hh> +# include <mln/core/image/bgraph_psite.hh> /*! \file mln/core/site_set/p_bgraph_piter.hh * Index: mln/core/site_set/p_line_graph.hh --- mln/core/site_set/p_line_graph.hh (revision 2171) +++ mln/core/site_set/p_line_graph.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> # include <mln/util/tracked_ptr.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> # include <mln/core/site_set/p_line_graph_piter.hh> /* FIXME: This class shares a lot with p_graph. Factor as much as Index: mln/core/site_set/p_line_graph_piter.hh --- mln/core/site_set/p_line_graph_piter.hh (revision 2171) +++ mln/core/site_set/p_line_graph_piter.hh (working copy) @@ -30,7 +30,7 @@ # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/site_set/p_line_graph.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> /// \file mln/core/site_set/p_line_graph_piter.hh /// \brief Definition of point iterator on line graph-based point set. Index: mln/core/site_set/p_graph.hh --- mln/core/site_set/p_graph.hh (revision 2171) +++ mln/core/site_set/p_graph.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/util/tracked_ptr.hh> # include <mln/util/graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> # include <mln/core/site_set/p_graph_piter.hh> Index: mln/draw/graph.hh --- mln/draw/graph.hh (revision 2171) +++ mln/draw/graph.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/level/fill.hh> # include <mln/draw/line.hh> # include <mln/core/site_set/p_graph.hh> -# include <mln/core/graph_image.hh> +# include <mln/core/image/graph_image.hh> namespace mln { @@ -98,7 +98,7 @@ for (size_t l = 0; l < pg.nedges(); ++l) line (exact(ima), // FIXME: Too low-level. See similar remarks - // in mln/core/graph_image.hh + // in mln/core/image/graph_image.hh pg.gr_->vertex_data(pg.gr_->edge(l).v1()), pg.gr_->vertex_data(pg.gr_->edge(l).v2()), edge_v); Index: mln/level/fill_with_image.hh --- mln/level/fill_with_image.hh (revision 2171) +++ mln/level/fill_with_image.hh (working copy) @@ -36,7 +36,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln Index: mln/level/replace.hh --- mln/level/replace.hh (revision 2171) +++ mln/level/replace.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image_if.hh> # include <mln/level/fill.hh> # include <mln/pw/value.hh> Index: mln/level/paste.hh --- mln/level/paste.hh (revision 2171) +++ mln/level/paste.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> // Specializations are in: Index: mln/level/fill.spe.hh --- mln/level/fill.spe.hh (revision 2171) +++ mln/level/fill.spe.hh (working copy) @@ -42,7 +42,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # ifndef MLN_INCLUDE_ONLY Index: mln/level/fill_with_value.hh --- mln/level/fill_with_value.hh (revision 2171) +++ mln/level/fill_with_value.hh (working copy) @@ -41,7 +41,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/image/instant.hh> Index: mln/linear/line_x2_convolve.hh --- mln/linear/line_x2_convolve.hh (revision 2171) +++ mln/linear/line_x2_convolve.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/linear/line_convolve.hh> -# include <mln/core/t_image.hh> +# include <mln/core/image/t_image.hh> Index: mln/accu/count_adjacent_vertices.hh --- mln/accu/count_adjacent_vertices.hh (revision 2171) +++ mln/accu/count_adjacent_vertices.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/accu/internal/base.hh> # include <mln/core/concept/meta_accumulator.hh> -# include <mln/core/line_graph_image.hh> +# include <mln/core/image/line_graph_image.hh> # include <mln/util/pix.hh> namespace mln Index: mln/accu/rank.hh --- mln/accu/rank.hh (revision 2171) +++ mln/accu/rank.hh (working copy) @@ -39,7 +39,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/trait/value_.hh> # include <mln/util/pix.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln { Index: mln/accu/rank_high_quant.hh --- mln/accu/rank_high_quant.hh (revision 2171) +++ mln/accu/rank_high_quant.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/trait/value_.hh> # include <mln/util/pix.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln { Index: mln/accu/rank_bool.hh --- mln/accu/rank_bool.hh (revision 2171) +++ mln/accu/rank_bool.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/trait/value_.hh> # include <mln/util/pix.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> namespace mln { Index: mln/border/mirror.hh --- mln/border/mirror.hh (revision 2171) +++ mln/border/mirror.hh (working copy) @@ -34,9 +34,9 @@ * mirroring effect. */ -# include <mln/core/image1d.hh> -# include <mln/core/image2d.hh> -# include <mln/core/image3d.hh> +# include <mln/core/image/image1d.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/image3d.hh> # include <mln/core/concept/image.hh> # include <mln/core/internal/fixme.hh> Index: mln/make/image1d.hh --- mln/make/image1d.hh (revision 2171) +++ mln/make/image1d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create an mln::image1d. */ -# include <mln/core/image1d.hh> +# include <mln/core/image/image1d.hh> namespace mln Index: mln/make/image2d.hh --- mln/make/image2d.hh (revision 2171) +++ mln/make/image2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create an mln::image2d in the 2D case. */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> namespace mln Index: mln/convert/to_tiles.hh --- mln/convert/to_tiles.hh (revision 2171) +++ mln/convert/to_tiles.hh (working copy) @@ -33,7 +33,7 @@ * \brief Conversion of a vector of image2d into a tiled image with ratio. */ -# include <mln/core/translate_image.hh> +# include <mln/core/image/translate_image.hh> # include <mln/level/paste.hh> # include <mln/geom/nrows.hh> # include <mln/geom/ncols.hh> Index: mln/convert/to_image.hh --- mln/convert/to_image.hh (revision 2171) +++ mln/convert/to_image.hh (working copy) @@ -33,9 +33,9 @@ * \brief Conversions to mln::Image. */ -# include <mln/core/image1d.hh> -# include <mln/core/image2d.hh> -# include <mln/core/image3d.hh> +# include <mln/core/image/image1d.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/image3d.hh> # include <mln/core/concept/site_set.hh> # include <mln/core/concept/window.hh> Index: mln/convert/to_window.hh --- mln/convert/to_window.hh (revision 2171) +++ mln/convert/to_window.hh (working copy) @@ -42,8 +42,8 @@ # include <mln/pw/cst.hh> # include <mln/metal/is_a.hh> -# include <mln/core/line_graph_elt_neighborhood.hh> -# include <mln/core/line_graph_elt_window.hh> +# include <mln/core/image/line_graph_elt_neighborhood.hh> +# include <mln/core/image/line_graph_elt_window.hh> namespace mln Index: mln/geom/chamfer.hh --- mln/geom/chamfer.hh (revision 2171) +++ mln/geom/chamfer.hh (working copy) @@ -36,9 +36,9 @@ # include <mln/level/fill.hh> # include <mln/core/w_window2d_int.hh> # include <mln/core/w_window2d_float.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/canvas/chamfer.hh> namespace mln Index: mln/morpho/opening_area_on_vertices.hh --- mln/morpho/opening_area_on_vertices.hh (revision 2171) +++ mln/morpho/opening_area_on_vertices.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Morphological area opening on a line graph image computing /// the area in terms of adjacent vertices. -# include <mln/core/line_graph_image.hh> +# include <mln/core/image/line_graph_image.hh> # include <mln/morpho/opening_attribute.hh> # include <mln/accu/count_adjacent_vertices.hh> Index: mln/morpho/line_gradient.hh --- mln/morpho/line_gradient.hh (revision 2171) +++ mln/morpho/line_gradient.hh (working copy) @@ -36,9 +36,9 @@ # include <mln/math/abs.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/window2d.hh> -# include <mln/core/line_graph_image.hh> +# include <mln/core/image/line_graph_image.hh> // FIXME: Generalize to other (input) images as well (image1d, // image3d, etc.). Index: mln/morpho/closing_area_on_vertices.hh --- mln/morpho/closing_area_on_vertices.hh (revision 2171) +++ mln/morpho/closing_area_on_vertices.hh (working copy) @@ -33,7 +33,7 @@ /// \brief Morphological area closing on a line graph image computing /// the area in terms of adjacent vertices. -# include <mln/core/line_graph_image.hh> +# include <mln/core/image/line_graph_image.hh> # include <mln/morpho/closing_attribute.hh> # include <mln/accu/count_adjacent_vertices.hh> Index: mln/display/color_pretty.hh --- mln/display/color_pretty.hh (revision 2171) +++ mln/display/color_pretty.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> Index: mln/display/remove.hh --- mln/display/remove.hh (revision 2171) +++ mln/display/remove.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/display/save.hh> # include <map> Index: mln/display/save.hh --- mln/display/save.hh (revision 2171) +++ mln/display/save.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> Index: mln/display/show.hh --- mln/display/show.hh (revision 2171) +++ mln/display/show.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/display/save.hh> # include <map> Index: mln/io/pfm/load.hh --- mln/io/pfm/load.hh (revision 2171) +++ mln/io/pfm/load.hh (working copy) @@ -40,7 +40,7 @@ # include <iostream> # include <fstream> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> Index: mln/io/pgm/load.hh --- mln/io/pgm/load.hh (revision 2171) +++ mln/io/pgm/load.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> Index: mln/io/fits/load.hh --- mln/io/fits/load.hh (revision 2171) +++ mln/io/fits/load.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> # include <fitsio.h> Index: mln/io/pnm/load.hh --- mln/io/pnm/load.hh (revision 2171) +++ mln/io/pnm/load.hh (working copy) @@ -40,7 +40,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> # include <mln/value/rgb.hh> Index: mln/io/ppm/load.hh --- mln/io/ppm/load.hh (revision 2171) +++ mln/io/ppm/load.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/io/pnm/load.hh> Index: mln/io/pbm/load.hh --- mln/io/pbm/load.hh (revision 2171) +++ mln/io/pbm/load.hh (working copy) @@ -42,7 +42,7 @@ # include <fstream> # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/io/pnm/load_header.hh> namespace mln Index: sandbox/duhamel/main_mesh_image.cc --- sandbox/duhamel/main_mesh_image.cc (revision 2171) +++ sandbox/duhamel/main_mesh_image.cc (working copy) @@ -6,7 +6,7 @@ #include <mln/core/mesh_psite.hh> #include <mln/draw/mesh.hh> #include <mln/core/mesh_image.hh> -#include <mln/core/interpolated.hh> +#include <mln/core/image/interpolated.hh> using namespace mln; Index: sandbox/duhamel/queue_p_priority.cc --- sandbox/duhamel/queue_p_priority.cc (revision 2171) +++ sandbox/duhamel/queue_p_priority.cc (working copy) @@ -1,5 +1,5 @@ #include "queue_p_priority.hh" -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> int main () { Index: sandbox/duhamel/graph_labeling.hh --- sandbox/duhamel/graph_labeling.hh (revision 2171) +++ sandbox/duhamel/graph_labeling.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: sandbox/duhamel/translate_image.hh --- sandbox/duhamel/translate_image.hh (revision 2171) +++ sandbox/duhamel/translate_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TRANSLATE_IMAGE_HH -# define MLN_CORE_TRANSLATE_IMAGE_HH +#ifndef MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH +# define MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH -/*! \file mln/core/translate_image.hh +/*! \file mln/core/image/translate_image.hh * * \brief Definition of an image class FIXME */ @@ -193,4 +193,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TRANSLATE_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_TRANSLATE_IMAGE_HH Index: sandbox/duhamel/slow_seed2tiling.cc --- sandbox/duhamel/slow_seed2tiling.cc (revision 2171) +++ sandbox/duhamel/slow_seed2tiling.cc (working copy) @@ -31,8 +31,8 @@ */ -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> @@ -47,10 +47,10 @@ # include <mln/geom/seeds2tiling_with_chamfer.hh> # include <mln/make/voronoi.hh> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/make/win_chamfer.hh> Index: sandbox/duhamel/labeling_algo.cc --- sandbox/duhamel/labeling_algo.cc (revision 2171) +++ sandbox/duhamel/labeling_algo.cc (working copy) @@ -31,7 +31,7 @@ */ # include <mln/core/image2d_b.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> Index: sandbox/duhamel/main.cc --- sandbox/duhamel/main.cc (revision 2171) +++ sandbox/duhamel/main.cc (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/level/fill.hh> Index: sandbox/duhamel/paste.hh --- sandbox/duhamel/paste.hh (revision 2171) +++ sandbox/duhamel/paste.hh (working copy) @@ -2,10 +2,10 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/fast_image.hh> -# include <mln/core/sparse_image.hh> -# include <mln/core/sparse_encode.hh> -# include <mln/core/rle_image.hh> -# include <mln/core/rle_encode.hh> +# include <mln/core/image/sparse_image.hh> +# include <mln/core/image/sparse_encode.hh> +# include <mln/core/image/rle_image.hh> +# include <mln/core/image/rle_encode.hh> namespace mln { Index: sandbox/duhamel/color_sub.cc --- sandbox/duhamel/color_sub.cc (revision 2171) +++ sandbox/duhamel/color_sub.cc (working copy) @@ -31,8 +31,8 @@ */ # include <mln/core/image2d_b.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/inplace.hh> # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> @@ -41,9 +41,9 @@ # include <mln/debug/println.hh> # include <mln/io/ppm/save.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/debug/println.hh> # include <mln/core/w_window2d_int.hh> Index: sandbox/duhamel/chamfer.cc --- sandbox/duhamel/chamfer.cc (revision 2171) +++ sandbox/duhamel/chamfer.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> # include <mln/debug/println.hh> Index: sandbox/duhamel/mem.hh --- sandbox/duhamel/mem.hh (revision 2171) +++ sandbox/duhamel/mem.hh (working copy) @@ -10,11 +10,11 @@ #include <mln/debug/println_with_border.hh> -# include <mln/core/sparse_image.hh> -# include <mln/core/sparse_encode.hh> +# include <mln/core/image/sparse_image.hh> +# include <mln/core/image/sparse_encode.hh> -# include <mln/core/rle_image.hh> -# include <mln/core/rle_encode.hh> +# include <mln/core/image/rle_image.hh> +# include <mln/core/image/rle_encode.hh> namespace mln { Index: sandbox/duhamel/labeling_algo.hh --- sandbox/duhamel/labeling_algo.hh (revision 2171) +++ sandbox/duhamel/labeling_algo.hh (working copy) @@ -5,7 +5,7 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: sandbox/duhamel/extract_array.cc --- sandbox/duhamel/extract_array.cc (revision 2171) +++ sandbox/duhamel/extract_array.cc (working copy) @@ -26,7 +26,7 @@ // Public License. # include <string> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/io/pbm/load.hh> # include <mln/debug/println.hh> # include <mln/logical/not.hh> Index: sandbox/duhamel/abr_to_image.cc --- sandbox/duhamel/abr_to_image.cc (revision 2171) +++ sandbox/duhamel/abr_to_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/util/abr.hh> #include <mln/core/contract.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/set_p.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> Index: sandbox/duhamel/translate_image.cc --- sandbox/duhamel/translate_image.cc (revision 2171) +++ sandbox/duhamel/translate_image.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/debug/iota.hh> #include <mln/level/fill.hh> @@ -6,7 +6,7 @@ #include <mln/border/fill.hh> #include <mln/debug/println_with_border.hh> #include <mln/debug/println.hh> -#include <mln/core/translate_image.hh> +#include <mln/core/image/translate_image.hh> int main () { Index: sandbox/pellegrin/first_test.cc --- sandbox/pellegrin/first_test.cc (revision 2171) +++ sandbox/pellegrin/first_test.cc (working copy) @@ -30,7 +30,7 @@ * \brief My first test. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> int main () Index: sandbox/pellegrin/set/test/p_runs.cc --- sandbox/pellegrin/set/test/p_runs.cc (revision 2171) +++ sandbox/pellegrin/set/test/p_runs.cc (working copy) @@ -30,7 +30,7 @@ * \brief Test on mln::p_runs_ and related tools. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/p_runs.hh> Index: sandbox/pellegrin/set/test/pset_if.cc --- sandbox/pellegrin/set/test/pset_if.cc (revision 2171) +++ sandbox/pellegrin/set/test/pset_if.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::pset_if. */ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> Index: sandbox/pellegrin/set/core/p_bgraph.hh --- sandbox/pellegrin/set/core/p_bgraph.hh (revision 2171) +++ sandbox/pellegrin/set/core/p_bgraph.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> -# include <mln/core/bgraph_psite.hh> +# include <mln/core/image/bgraph_psite.hh> # include <mln/core/site_set/p_bgraph_piter.hh> # include <trait/point_set.hh> Index: sandbox/pellegrin/set/core/p_line_graph.hh --- sandbox/pellegrin/set/core/p_line_graph.hh (revision 2171) +++ sandbox/pellegrin/set/core/p_line_graph.hh (working copy) @@ -32,7 +32,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> -# include <mln/core/line_graph_psite.hh> +# include <mln/core/image/line_graph_psite.hh> # include <mln/core/site_set/p_line_graph_piter.hh> # include <mln/core/point_pair.hh> # include <trait/point_set.hh> Index: sandbox/pellegrin/set/core/p_graph.hh --- sandbox/pellegrin/set/core/p_graph.hh (revision 2171) +++ sandbox/pellegrin/set/core/p_graph.hh (working copy) @@ -32,7 +32,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> -# include <mln/core/graph_psite.hh> +# include <mln/core/image/graph_psite.hh> # include <mln/core/site_set/p_graph_piter.hh> # include <trait/point_set.hh> Index: sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc --- sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc (revision 2171) +++ sandbox/pellegrin/cond_inheritance/test_cond_inherit.cc (working copy) @@ -32,7 +32,7 @@ #include <iostream> #include <string> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include "p_set.hh" Index: sandbox/aroumougame/skeleton/mesh-skel_region.cc --- sandbox/aroumougame/skeleton/mesh-skel_region.cc (revision 2171) +++ sandbox/aroumougame/skeleton/mesh-skel_region.cc (working copy) @@ -45,8 +45,8 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/morpho/closing_area.hh> #include <mln/labeling/regional_minima.hh> Index: sandbox/aroumougame/skeleton/miscellenous.hh --- sandbox/aroumougame/skeleton/miscellenous.hh (revision 2171) +++ sandbox/aroumougame/skeleton/miscellenous.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/site_set/p_set.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u.hh> #include <vector> Index: sandbox/aroumougame/skeleton/test.cc --- sandbox/aroumougame/skeleton/test.cc (revision 2171) +++ sandbox/aroumougame/skeleton/test.cc (working copy) @@ -3,7 +3,7 @@ #include "thinning.hh" #include <mln/level/paste.hh> #include <mln/level/fill.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> Index: sandbox/aroumougame/skeleton/test_image2d.cc --- sandbox/aroumougame/skeleton/test_image2d.cc (revision 2171) +++ sandbox/aroumougame/skeleton/test_image2d.cc (working copy) @@ -1,6 +1,6 @@ #include "thinning.hh" -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> #include <mln/level/paste.hh> Index: sandbox/aroumougame/skeleton/mesh-skel.cc --- sandbox/aroumougame/skeleton/mesh-skel.cc (revision 2171) +++ sandbox/aroumougame/skeleton/mesh-skel.cc (working copy) @@ -45,8 +45,8 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/morpho/closing_area.hh> #include <mln/labeling/regional_minima.hh> Index: sandbox/aroumougame/skeleton/test_image3d.cc --- sandbox/aroumougame/skeleton/test_image3d.cc (revision 2171) +++ sandbox/aroumougame/skeleton/test_image3d.cc (working copy) @@ -6,9 +6,9 @@ #include <mln/make/point3d.hh> #include <mln/util/graph.hh> -#include <mln/core/line_graph_image.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/line_graph_elt_neighborhood.hh> +#include <mln/core/image/line_graph_image.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> int main() Index: sandbox/aroumougame/skeleton/thinning.hh --- sandbox/aroumougame/skeleton/thinning.hh (revision 2171) +++ sandbox/aroumougame/skeleton/thinning.hh (working copy) @@ -1,7 +1,7 @@ #include "neighborhood1.hh" #include <mln/core/site_set/p_set.hh> -#include <mln/core/graph_image.hh> -#include <mln/core/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/math/min.hh> #include <mln/math/sqrt.hh> #include <mln/make/dpoint2d.hh> Index: sandbox/aroumougame/skeleton/sedt.hh --- sandbox/aroumougame/skeleton/sedt.hh (revision 2171) +++ sandbox/aroumougame/skeleton/sedt.hh (working copy) @@ -1,11 +1,11 @@ #include <string> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/clone.hh> #include <mln/math/max.hh> #include <mln/math/min.hh> #include <mln/math/sqr.hh> # include <mln/value/int_u.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> Index: sandbox/nivault/rotation.cc --- sandbox/nivault/rotation.cc (revision 2171) +++ sandbox/nivault/rotation.cc (working copy) @@ -37,7 +37,7 @@ #include <mln/io/pgm/load.hh> #include <mln/core/image2d_b.hh> #include <mln/value/int_u8.hh> -#include <mln/core/interpolated.hh> +#include <mln/core/image/interpolated.hh> int main() Index: sandbox/nivault/plugin-gimp/src/build-image.hh --- sandbox/nivault/plugin-gimp/src/build-image.hh (revision 2171) +++ sandbox/nivault/plugin-gimp/src/build-image.hh (working copy) @@ -34,7 +34,7 @@ # include <src/gimp-image.hh> # include <mln/core/point2d.hh> # include <mln/level/fill.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/literal/all.hh> # include <mln/core/concept/function.hh> Index: sandbox/nivault/extract_score.cc --- sandbox/nivault/extract_score.cc (revision 2171) +++ sandbox/nivault/extract_score.cc (working copy) @@ -27,7 +27,7 @@ # include <vector> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/io/pgm/save.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/save.hh> @@ -67,7 +67,7 @@ # include <mln/linear/gaussian.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/level/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> Index: sandbox/nivault/extract_character.cc --- sandbox/nivault/extract_character.cc (revision 2171) +++ sandbox/nivault/extract_character.cc (working copy) @@ -27,7 +27,7 @@ # include <vector> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/io/pbm/load.hh> # include <mln/io/pgm/save.hh> # include <mln/io/ppm/save.hh> @@ -64,7 +64,7 @@ # include <mln/level/stretch.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/sub_image.hh> +# include <mln/core/image/sub_image.hh> # include <mln/level/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> Index: sandbox/nivault/median.hh --- sandbox/nivault/median.hh (revision 2171) +++ sandbox/nivault/median.hh (working copy) @@ -39,7 +39,7 @@ # include <mln/core/window2d.hh> # include <mln/win/hline2d.hh> # include <mln/win/vline2d.hh> -# include <mln/core/t_image.hh> +# include <mln/core/image/t_image.hh> # include <mln/core/dpoint.hh> # include <mln/accu/median.hh> Index: sandbox/jardonnet/test/reduce.cc --- sandbox/jardonnet/test/reduce.cc (revision 2171) +++ sandbox/jardonnet/test/reduce.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: sandbox/jardonnet/test/icp_ref.cc --- sandbox/jardonnet/test/icp_ref.cc (revision 2171) +++ sandbox/jardonnet/test/icp_ref.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: sandbox/jardonnet/test/gaussian.cc --- sandbox/jardonnet/test/gaussian.cc (revision 2171) +++ sandbox/jardonnet/test/gaussian.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> Index: sandbox/jardonnet/test/icp.cc --- sandbox/jardonnet/test/icp.cc (revision 2171) +++ sandbox/jardonnet/test/icp.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image3d.hh> +#include <mln/core/image/image3d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: sandbox/jardonnet/test/gaussian_subsampling.cc --- sandbox/jardonnet/test/gaussian_subsampling.cc (revision 2171) +++ sandbox/jardonnet/test/gaussian_subsampling.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/jardonnet/test/test.cc --- sandbox/jardonnet/test/test.cc (revision 2171) +++ sandbox/jardonnet/test/test.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> Index: sandbox/jardonnet/test/type.cc --- sandbox/jardonnet/test/type.cc (revision 2171) +++ sandbox/jardonnet/test/type.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/sub_sampled_image.hh> Index: sandbox/jardonnet/test/subsampling.cc --- sandbox/jardonnet/test/subsampling.cc (revision 2171) +++ sandbox/jardonnet/test/subsampling.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/jardonnet/registration/chamfer.hh --- sandbox/jardonnet/registration/chamfer.hh (revision 2171) +++ sandbox/jardonnet/registration/chamfer.hh (working copy) @@ -157,7 +157,7 @@ // #include <iostream> // #include <mln/debug/println.hh> -// #include <mln/core/image2d.hh> +// #include <mln/core/image/image2d.hh> // #include <mln/make/win_chamfer.hh> // #include <mln/level/fill.hh> Index: sandbox/geraud/fllt/fllt.hh --- sandbox/geraud/fllt/fllt.hh (revision 2171) +++ sandbox/geraud/fllt/fllt.hh (working copy) @@ -28,14 +28,14 @@ #include <iomanip> #include <set> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.1.cc --- sandbox/geraud/fllt/fllt.svg.1.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.1.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/geraud/fllt/fllt.svg.7.hh --- sandbox/geraud/fllt/fllt.svg.7.hh (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.7.hh (working copy) @@ -31,14 +31,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -25,12 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -25,12 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -25,12 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt.svg.6.cc --- sandbox/geraud/fllt/fllt.svg.6.cc (revision 2171) +++ sandbox/geraud/fllt/fllt.svg.6.cc (working copy) @@ -27,14 +27,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt/fllt_test.hh --- sandbox/geraud/fllt/fllt_test.hh (revision 2171) +++ sandbox/geraud/fllt/fllt_test.hh (working copy) @@ -27,14 +27,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/fllt.svg.7.hh --- sandbox/geraud/fllt.svg.7.hh (revision 2171) +++ sandbox/geraud/fllt.svg.7.hh (working copy) @@ -31,14 +31,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/dmap.cc --- sandbox/geraud/dmap.cc (revision 2171) +++ sandbox/geraud/dmap.cc (working copy) @@ -1,6 +1,6 @@ #include <vector> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/w_window2d_int.hh> #include <mln/debug/println.hh> #include <mln/level/fill.hh> Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 2171) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -27,14 +27,14 @@ #include <iomanip> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: sandbox/geraud/win_fun.cc --- sandbox/geraud/win_fun.cc (revision 2171) +++ sandbox/geraud/win_fun.cc (working copy) @@ -1,4 +1,4 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/window2d.hh> # include <mln/win/rectangle2d.hh> # include <mln/win/fun.hh> Index: sandbox/geraud/irm.cc --- sandbox/geraud/irm.cc (revision 2171) +++ sandbox/geraud/irm.cc (working copy) @@ -3,11 +3,11 @@ #include <iostream> #include <algorithm> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: sandbox/geraud/cs2d/tuto.cc --- sandbox/geraud/cs2d/tuto.cc (revision 2171) +++ sandbox/geraud/cs2d/tuto.cc (working copy) @@ -1,5 +1,5 @@ -# include <mln/core/image2d.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/neighb2d.hh> # include <mln/core/window2d.hh> Index: sandbox/geraud/cs2d/kruskal.cc --- sandbox/geraud/cs2d/kruskal.cc (revision 2171) +++ sandbox/geraud/cs2d/kruskal.cc (working copy) @@ -1,8 +1,8 @@ # include <vector> -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/image_if_value.hh> # include <mln/core/neighb2d.hh> Index: sandbox/geraud/cs2d/dbl_neighb.cc --- sandbox/geraud/cs2d/dbl_neighb.cc (revision 2171) +++ sandbox/geraud/cs2d/dbl_neighb.cc (working copy) @@ -3,7 +3,7 @@ # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/core/window2d.hh> Index: sandbox/geraud/cs2d/cs2d.hh --- sandbox/geraud/cs2d/cs2d.hh (revision 2171) +++ sandbox/geraud/cs2d/cs2d.hh (working copy) @@ -1,9 +1,9 @@ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/core/window2d.hh> # include <mln/convert/to_window.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image_if.hh> # include <mln/debug/println.hh> Index: sandbox/geraud/cs2d/tuto_bis.cc --- sandbox/geraud/cs2d/tuto_bis.cc (revision 2171) +++ sandbox/geraud/cs2d/tuto_bis.cc (working copy) @@ -1,8 +1,8 @@ # include <vector> -# include <mln/core/image2d.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/image_if_value.hh> # include <mln/core/neighb2d.hh> Index: sandbox/geraud/max_tree_nnodes.cc --- sandbox/geraud/max_tree_nnodes.cc (revision 2171) +++ sandbox/geraud/max_tree_nnodes.cc (working copy) @@ -6,7 +6,7 @@ # include <mln/morpho/includes.hh> # include <mln/level/sort_psites.hh> -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/io/pgm/load.hh> Index: sandbox/vigouroux/yuv/test.cc --- sandbox/vigouroux/yuv/test.cc (revision 2171) +++ sandbox/vigouroux/yuv/test.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/yuv/get_blue.hh --- sandbox/vigouroux/yuv/get_blue.hh (revision 2171) +++ sandbox/vigouroux/yuv/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yuv/get_red.hh --- sandbox/vigouroux/yuv/get_red.hh (revision 2171) +++ sandbox/vigouroux/yuv/get_red.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yuv/testfun.cc --- sandbox/vigouroux/yuv/testfun.cc (revision 2171) +++ sandbox/vigouroux/yuv/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/yuv/rgb_to_yuv.hh --- sandbox/vigouroux/yuv/rgb_to_yuv.hh (revision 2171) +++ sandbox/vigouroux/yuv/rgb_to_yuv.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yuv/get_green.hh --- sandbox/vigouroux/yuv/get_green.hh (revision 2171) +++ sandbox/vigouroux/yuv/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/hsi/get_blue.hh --- sandbox/vigouroux/hsi/get_blue.hh (revision 2171) +++ sandbox/vigouroux/hsi/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/hsi/get_red.hh --- sandbox/vigouroux/hsi/get_red.hh (revision 2171) +++ sandbox/vigouroux/hsi/get_red.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/hsi/rgb_to_hsi.hh --- sandbox/vigouroux/hsi/rgb_to_hsi.hh (revision 2171) +++ sandbox/vigouroux/hsi/rgb_to_hsi.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/hsi/get_green.hh --- sandbox/vigouroux/hsi/get_green.hh (revision 2171) +++ sandbox/vigouroux/hsi/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/function.hh --- sandbox/vigouroux/function.hh (revision 2171) +++ sandbox/vigouroux/function.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/tests.cc --- sandbox/vigouroux/tests.cc (revision 2171) +++ sandbox/vigouroux/tests.cc (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/cmy/rgb_to_cmy.hh --- sandbox/vigouroux/cmy/rgb_to_cmy.hh (revision 2171) +++ sandbox/vigouroux/cmy/rgb_to_cmy.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/cmy/test.cc --- sandbox/vigouroux/cmy/test.cc (revision 2171) +++ sandbox/vigouroux/cmy/test.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/cmy/get_blue.hh --- sandbox/vigouroux/cmy/get_blue.hh (revision 2171) +++ sandbox/vigouroux/cmy/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/cmy/fun.hh --- sandbox/vigouroux/cmy/fun.hh (revision 2171) +++ sandbox/vigouroux/cmy/fun.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/cmy/testfun.cc --- sandbox/vigouroux/cmy/testfun.cc (revision 2171) +++ sandbox/vigouroux/cmy/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/cmy/get_green.hh --- sandbox/vigouroux/cmy/get_green.hh (revision 2171) +++ sandbox/vigouroux/cmy/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/xyz/test.cc --- sandbox/vigouroux/xyz/test.cc (revision 2171) +++ sandbox/vigouroux/xyz/test.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/xyz/rgb_to_xyz.hh --- sandbox/vigouroux/xyz/rgb_to_xyz.hh (revision 2171) +++ sandbox/vigouroux/xyz/rgb_to_xyz.hh (working copy) @@ -2,7 +2,7 @@ # define OLENA_CONVERT_RGBXYZ_HH # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/xyz/get_blue.hh --- sandbox/vigouroux/xyz/get_blue.hh (revision 2171) +++ sandbox/vigouroux/xyz/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/xyz/get_red.hh --- sandbox/vigouroux/xyz/get_red.hh (revision 2171) +++ sandbox/vigouroux/xyz/get_red.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/xyz/testfun.cc --- sandbox/vigouroux/xyz/testfun.cc (revision 2171) +++ sandbox/vigouroux/xyz/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/xyz/get_green.hh --- sandbox/vigouroux/xyz/get_green.hh (revision 2171) +++ sandbox/vigouroux/xyz/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/moyenne.cc --- sandbox/vigouroux/moyenne.cc (revision 2171) +++ sandbox/vigouroux/moyenne.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include "rgb.hh" #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/lap.cc --- sandbox/vigouroux/lap.cc (revision 2171) +++ sandbox/vigouroux/lap.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: sandbox/vigouroux/yiq/test.cc --- sandbox/vigouroux/yiq/test.cc (revision 2171) +++ sandbox/vigouroux/yiq/test.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/yiq/get_blue.hh --- sandbox/vigouroux/yiq/get_blue.hh (revision 2171) +++ sandbox/vigouroux/yiq/get_blue.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yiq/get_red.hh --- sandbox/vigouroux/yiq/get_red.hh (revision 2171) +++ sandbox/vigouroux/yiq/get_red.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yiq/rgb_to_yiq.hh --- sandbox/vigouroux/yiq/rgb_to_yiq.hh (revision 2171) +++ sandbox/vigouroux/yiq/rgb_to_yiq.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/yiq/testfun.cc --- sandbox/vigouroux/yiq/testfun.cc (revision 2171) +++ sandbox/vigouroux/yiq/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/yiq/get_green.hh --- sandbox/vigouroux/yiq/get_green.hh (revision 2171) +++ sandbox/vigouroux/yiq/get_green.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color.cc --- sandbox/vigouroux/color.cc (revision 2171) +++ sandbox/vigouroux/color.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/value/hsi.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <iostream> Index: sandbox/vigouroux/load.cc --- sandbox/vigouroux/load.cc (revision 2171) +++ sandbox/vigouroux/load.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include "color/my_hsi.hh" #include "color/rgb_to_hsi.hh" @@ -18,7 +18,7 @@ # include <mln/display/save.hh> # include <mln/display/show.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> #include <mln/make/pixel.hh> Index: sandbox/vigouroux/conv/test.cc --- sandbox/vigouroux/conv/test.cc (revision 2171) +++ sandbox/vigouroux/conv/test.cc (working copy) @@ -5,7 +5,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/conv/getred.hh --- sandbox/vigouroux/conv/getred.hh (revision 2171) +++ sandbox/vigouroux/conv/getred.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/conv/tored.hh --- sandbox/vigouroux/conv/tored.hh (revision 2171) +++ sandbox/vigouroux/conv/tored.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/conv/torgb.hh --- sandbox/vigouroux/conv/torgb.hh (revision 2171) +++ sandbox/vigouroux/conv/torgb.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/conv/rgbto.hh --- sandbox/vigouroux/conv/rgbto.hh (revision 2171) +++ sandbox/vigouroux/conv/rgbto.hh (working copy) @@ -1,7 +1,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/gradation.hh --- sandbox/vigouroux/gradation.hh (revision 2171) +++ sandbox/vigouroux/gradation.hh (working copy) @@ -1,7 +1,7 @@ #ifndef GRADATION_HH # define GRADATION_HH -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/debug/println.hh> Index: sandbox/vigouroux/testfun.cc --- sandbox/vigouroux/testfun.cc (revision 2171) +++ sandbox/vigouroux/testfun.cc (working copy) @@ -3,7 +3,7 @@ #include <cmath> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/io/ppm/load.hh> Index: sandbox/vigouroux/color/rgb_to_hsl.hh --- sandbox/vigouroux/color/rgb_to_hsl.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_hsl.hh (working copy) @@ -2,7 +2,7 @@ # define OLENA_CONVERT_NRGBHSL_HH # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_cmy.hh --- sandbox/vigouroux/color/rgb_to_cmy.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_cmy.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_xyz.hh --- sandbox/vigouroux/color/rgb_to_xyz.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_xyz.hh (working copy) @@ -2,7 +2,7 @@ # define OLENA_CONVERT_RGBXYZ_HH # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/tests.cc --- sandbox/vigouroux/color/tests.cc (revision 2171) +++ sandbox/vigouroux/color/tests.cc (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_hsv.hh --- sandbox/vigouroux/color/rgb_to_hsv.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_hsv.hh (working copy) @@ -2,7 +2,7 @@ # define OLENA_CONVERT_NRGBHSV_HH # include <mln/core/image_if_value.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_yiq.hh --- sandbox/vigouroux/color/rgb_to_yiq.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_yiq.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_hsi.hh --- sandbox/vigouroux/color/rgb_to_hsi.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_hsi.hh (working copy) @@ -2,7 +2,7 @@ #include <cmath> #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/vigouroux/color/rgb_to_yuv.hh --- sandbox/vigouroux/color/rgb_to_yuv.hh (revision 2171) +++ sandbox/vigouroux/color/rgb_to_yuv.hh (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image_if_value.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/core/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2171) +++ sandbox/garrigues/level_set.hh (working copy) @@ -39,17 +39,17 @@ # include "lower.hh" # include "upper.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/point2d.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/core/pset_if_piter.hh> # include <mln/core/site_set/pset_if.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/clone.hh> # include <mln/core/a_point_of.hh> Index: sandbox/garrigues/fllt/test_fllt_lena_tiles.cc --- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt_optimized.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt10.cc --- sandbox/garrigues/fllt/test_fllt10.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt10.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt_tiny.cc --- sandbox/garrigues/fllt/test_fllt_tiny.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt_tiny.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> Index: sandbox/garrigues/fllt/test_fllt12.cc --- sandbox/garrigues/fllt/test_fllt12.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt12.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/essai.cc --- sandbox/garrigues/fllt/essai.cc (revision 2171) +++ sandbox/garrigues/fllt/essai.cc (working copy) @@ -1,6 +1,6 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.1.cc --- sandbox/garrigues/fllt/fllt_simple.svg.1.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_simple.svg.1.cc (working copy) @@ -29,8 +29,8 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> @@ -47,7 +47,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> namespace mln { Index: sandbox/garrigues/fllt/fllt_simple.svg.3.cc --- sandbox/garrigues/fllt/fllt_simple.svg.3.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -29,8 +29,8 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> @@ -51,7 +51,7 @@ #include <mln/util/tree_to_image.hh> #include <mln/util/branch_iter_ind.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> namespace mln Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -29,13 +29,13 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/dp_array.hh> Index: sandbox/garrigues/fllt/test_fllt10_inv.cc --- sandbox/garrigues/fllt/test_fllt10_inv.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt10_inv.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/fllt_theo.cc --- sandbox/garrigues/fllt/fllt_theo.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_theo.cc (working copy) @@ -29,7 +29,7 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> @@ -46,7 +46,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> namespace mln { Index: sandbox/garrigues/fllt/test_fllt3.cc --- sandbox/garrigues/fllt/test_fllt3.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt3.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt5.cc --- sandbox/garrigues/fllt/test_fllt5.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt5.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt7.cc --- sandbox/garrigues/fllt/test_fllt7.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt7.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt9.cc --- sandbox/garrigues/fllt/test_fllt9.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt9.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/fllt_merge.hh --- sandbox/garrigues/fllt/fllt_merge.hh (revision 2171) +++ sandbox/garrigues/fllt/fllt_merge.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/set/is_subset_of.hh> Index: sandbox/garrigues/fllt/test_fllt3_inv.cc --- sandbox/garrigues/fllt/test_fllt3_inv.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt3_inv.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt_lena.cc --- sandbox/garrigues/fllt/test_fllt_lena.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt_lena.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt.cc --- sandbox/garrigues/fllt/test_fllt.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_flltb.cc --- sandbox/garrigues/fllt/test_flltb.cc (revision 2171) +++ sandbox/garrigues/fllt/test_flltb.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt7_inv.cc --- sandbox/garrigues/fllt/test_fllt7_inv.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt7_inv.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt13.cc --- sandbox/garrigues/fllt/test_fllt13.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt13.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt15.cc --- sandbox/garrigues/fllt/test_fllt15.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt15.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.2.cc --- sandbox/garrigues/fllt/fllt_simple.svg.2.cc (revision 2171) +++ sandbox/garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -29,8 +29,8 @@ #include <iostream> #include <sstream> -#include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> @@ -47,7 +47,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> namespace mln { Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2171) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -35,14 +35,14 @@ * */ -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/pset_if_piter.hh> # include <mln/core/site_set/pset_if.hh> -# include <mln/core/sub_image.hh> -# include <mln/core/image_if.hh> +# include <mln/core/image/sub_image.hh> +# include <mln/core/image/image_if.hh> # include <mln/core/clone.hh> # include <mln/core/a_point_of.hh> Index: sandbox/garrigues/fllt/test.cc --- sandbox/garrigues/fllt/test.cc (revision 2171) +++ sandbox/garrigues/fllt/test.cc (working copy) @@ -3,8 +3,8 @@ # include "compute_level_set_fast2.hh" -# include <mln/core/image2d.hh> -# include <mln/core/cast_image.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/image/cast_image.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/give_confs.cc --- sandbox/garrigues/fllt/give_confs.cc (revision 2171) +++ sandbox/garrigues/fllt/give_confs.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/point2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/core/clock_neighb2d.hh> Index: sandbox/garrigues/fllt/test_fllt2.cc --- sandbox/garrigues/fllt/test_fllt2.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt2.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt4.cc --- sandbox/garrigues/fllt/test_fllt4.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt4.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt6.cc --- sandbox/garrigues/fllt/test_fllt6.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt6.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/fllt/test_fllt8.cc --- sandbox/garrigues/fllt/test_fllt8.cc (revision 2171) +++ sandbox/garrigues/fllt/test_fllt8.cc (working copy) @@ -1,5 +1,5 @@ # include "fllt2.hh" -# include <mln/core/image2d.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/clone.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> Index: sandbox/garrigues/tiled_image2d/tiled_image2d.hh --- sandbox/garrigues/tiled_image2d/tiled_image2d.hh (revision 2171) +++ sandbox/garrigues/tiled_image2d/tiled_image2d.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> # include <mln/core/box2d.hh> -# include <mln/core/inplace.hh> +# include <mln/core/image/inplace.hh> # include <mln/core/init.hh> # include <mln/core/line_piter.hh> Index: sandbox/garrigues/tiled_image2d/tiled_image2d.cc --- sandbox/garrigues/tiled_image2d/tiled_image2d.cc (revision 2171) +++ sandbox/garrigues/tiled_image2d/tiled_image2d.cc (working copy) @@ -32,7 +32,7 @@ #include "tiled_image2d.hh" -#include <mln/core/cast_image.hh> +#include <mln/core/image/cast_image.hh> #include <mln/level/fill.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/image_identity/interpolated.hh --- sandbox/garrigues/image_identity/interpolated.hh (revision 2171) +++ sandbox/garrigues/image_identity/interpolated.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERPOLATED_HH -# define MLN_CORE_INTERPOLATED_HH +#ifndef MLN_CORE_IMAGE_INTERPOLATED_HH +# define MLN_CORE_IMAGE_INTERPOLATED_HH -/*! \file mln/core/interpolated.hh +/*! \file mln/core/image/interpolated.hh * * \brief Definition of an image class FIXME */ @@ -182,4 +182,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERPOLATED_HH +#endif // ! MLN_CORE_IMAGE_INTERPOLATED_HH Index: sandbox/garrigues/factures/extract_array_highlight.cc --- sandbox/garrigues/factures/extract_array_highlight.cc (revision 2171) +++ sandbox/garrigues/factures/extract_array_highlight.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/all.hh> #include <mln/io/pbm/all.hh> #include <mln/geom/resize.hh> @@ -37,7 +37,7 @@ #include <mln/win/disk2d.hh> #include <mln/pw/all.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/stretch.hh> #include <mln/level/median.hh> #include <mln/morpho/gradient.hh> Index: sandbox/garrigues/factures/extract_array.cc --- sandbox/garrigues/factures/extract_array.cc (revision 2171) +++ sandbox/garrigues/factures/extract_array.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/io/pgm/all.hh> #include <mln/io/pbm/all.hh> #include <mln/geom/resize.hh> @@ -35,7 +35,7 @@ #include <mln/win/rectangle2d.hh> #include <mln/pw/all.hh> -#include <mln/core/inplace.hh> +#include <mln/core/image/inplace.hh> #include <mln/level/stretch.hh> #include <mln/labeling/level.hh> #include <mln/literal/all.hh> Index: sandbox/folio/test/psn.cc --- sandbox/folio/test/psn.cc (revision 2171) +++ sandbox/folio/test/psn.cc (working copy) @@ -150,7 +150,7 @@ #endif // ! MLN_DT_CHAMFER_HH #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -161,8 +161,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> int main() Index: sandbox/folio/test/psn_log.cc --- sandbox/folio/test/psn_log.cc (revision 2171) +++ sandbox/folio/test/psn_log.cc (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/literal/zero.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> # include <mln/debug/println.hh> namespace mln @@ -248,8 +248,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> int main() Index: sandbox/folio/test/naive.cc --- sandbox/folio/test/naive.cc (revision 2171) +++ sandbox/folio/test/naive.cc (working copy) @@ -114,7 +114,7 @@ #include <iostream> #include <mln/debug/println.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/fun/v2v/norm.hh> Index: sandbox/folio/test/dt_maze.cc --- sandbox/folio/test/dt_maze.cc (revision 2171) +++ sandbox/folio/test/dt_maze.cc (working copy) @@ -4,7 +4,7 @@ */ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -18,8 +18,8 @@ #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/all.hh> #include "../dt/path.hh" Index: sandbox/folio/test/chamfer.cc --- sandbox/folio/test/chamfer.cc (revision 2171) +++ sandbox/folio/test/chamfer.cc (working copy) @@ -1,6 +1,6 @@ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> Index: sandbox/folio/test/dt_bench.cc --- sandbox/folio/test/dt_bench.cc (revision 2171) +++ sandbox/folio/test/dt_bench.cc (working copy) @@ -4,7 +4,7 @@ */ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -16,8 +16,8 @@ #include <mln/level/paste.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> // #include "../dt/dmap.hh" Index: sandbox/folio/test/dt.cc --- sandbox/folio/test/dt.cc (revision 2171) +++ sandbox/folio/test/dt.cc (working copy) @@ -4,7 +4,7 @@ */ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -16,8 +16,8 @@ #include <mln/level/paste.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> #include "../dt/dmap.hh" Index: sandbox/folio/psn.cc --- sandbox/folio/psn.cc (revision 2171) +++ sandbox/folio/psn.cc (working copy) @@ -150,7 +150,7 @@ #endif // ! MLN_DT_CHAMFER_HH #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -161,8 +161,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> int main() Index: sandbox/folio/psn_log.cc --- sandbox/folio/psn_log.cc (revision 2171) +++ sandbox/folio/psn_log.cc (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/literal/zero.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> # include <mln/debug/println.hh> namespace mln @@ -248,8 +248,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> int main() Index: sandbox/folio/naive.cc --- sandbox/folio/naive.cc (revision 2171) +++ sandbox/folio/naive.cc (working copy) @@ -114,7 +114,7 @@ #include <iostream> #include <mln/debug/println.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/fun/v2v/norm.hh> Index: sandbox/folio/chamfer.cc --- sandbox/folio/chamfer.cc (revision 2171) +++ sandbox/folio/chamfer.cc (working copy) @@ -156,7 +156,7 @@ #endif // ! MLN_DT_CHAMFER_HH #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> Index: sandbox/folio/dt.cc --- sandbox/folio/dt.cc (revision 2171) +++ sandbox/folio/dt.cc (working copy) @@ -4,7 +4,7 @@ */ #include <iostream> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> @@ -15,8 +15,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/sub_image.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> #include "dt.hh" Index: sandbox/beguin/irm_g.cc --- sandbox/beguin/irm_g.cc (revision 2171) +++ sandbox/beguin/irm_g.cc (working copy) @@ -3,11 +3,11 @@ #include <iostream> #include <algorithm> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: sandbox/beguin/fusion_graph.hh --- sandbox/beguin/fusion_graph.hh (revision 2171) +++ sandbox/beguin/fusion_graph.hh (working copy) @@ -7,11 +7,11 @@ #include <mln/value/int_u8.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> //#include "map.hh" Index: sandbox/beguin/irm.cc --- sandbox/beguin/irm.cc (revision 2171) +++ sandbox/beguin/irm.cc (working copy) @@ -8,11 +8,11 @@ #include <set> #include <map> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/image_if.hh> +#include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> Index: sandbox/abraham/tests/morpho/test_component_tree.cc --- sandbox/abraham/tests/morpho/test_component_tree.cc (revision 2171) +++ sandbox/abraham/tests/morpho/test_component_tree.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_set.hh> Index: sandbox/abraham/tests/morpho/test_watershed.cc --- sandbox/abraham/tests/morpho/test_watershed.cc (revision 2171) +++ sandbox/abraham/tests/morpho/test_watershed.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_set.hh> Index: sandbox/abraham/tests/morpho/test_watershed_topo.cc --- sandbox/abraham/tests/morpho/test_watershed_topo.cc (revision 2171) +++ sandbox/abraham/tests/morpho/test_watershed_topo.cc (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/site_set/p_set.hh> Index: sandbox/abraham/tests/io/tikz/tikz.cc --- sandbox/abraham/tests/io/tikz/tikz.cc (revision 2171) +++ sandbox/abraham/tests/io/tikz/tikz.cc (working copy) @@ -1,6 +1,6 @@ #include <string> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/value/rgb.hh> #include <mln/value/int_u.hh> #include <mln/io/ppm/load.hh> Index: sandbox/abraham/mln/morpho/basic_najman.hh --- sandbox/abraham/mln/morpho/basic_najman.hh (revision 2171) +++ sandbox/abraham/mln/morpho/basic_najman.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/level/sort_psites.hh> #include <mln/level/fill.hh> -#include <mln/core/image2d.hh> +#include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/util/greater_psite.hh> #include <mln/estim/min_max.hh>