https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Move alias files from mln/core/ to mln/core/alias/. * mln/core/neighb1d.hh, * mln/core/dpoint1d.hh, * mln/core/neighb2d.hh, * mln/core/neighb3d.hh, * mln/core/dpoint2d.hh, * mln/core/dpoint3d.hh, * mln/core/point1d.hh, * mln/core/point2d.hh, * mln/core/point3d.hh, * mln/core/w_window1d_int.hh, * mln/core/window1d.hh, * mln/core/w_window2d_int.hh, * mln/core/window2d.hh, * mln/core/w_window3d_int.hh, * mln/core/window3d.hh, * mln/core/w_window2d_float.hh, * mln/core/dpoint2d_h.hh, * mln/core/box1d.hh, * mln/core/box2d.hh, * mln/core/box3d.hh, * mln/core/box2d_h.hh, * mln/core/point2d_h.hh, * mln/core/w_window1d_float.hh, * mln/core/w_window3d_float.hh: Rename as... * mln/core/alias/neighb1d.hh, * mln/core/alias/neighb2d.hh, * mln/core/alias/dpoint1d.hh, * mln/core/alias/neighb3d.hh, * mln/core/alias/dpoint2d.hh, * mln/core/alias/dpoint3d.hh, * mln/core/alias/box2d_h.hh, * mln/core/alias/point2d_h.hh, * mln/core/alias/dpoint2d_h.hh, * mln/core/alias/w_window1d_int.hh, * mln/core/alias/window1d.hh, * mln/core/alias/w_window2d_int.hh, * mln/core/alias/window2d.hh, * mln/core/alias/window3d.hh, * mln/core/alias/w_window3d_int.hh, * mln/core/alias/w_window1d_float.hh, * mln/core/alias/w_window2d_float.hh, * mln/core/alias/w_window3d_float.hh, * mln/core/alias/box1d.hh, * mln/core/alias/point1d.hh, * mln/core/alias/box2d.hh, * mln/core/alias/box3d.hh, * mln/core/alias/point2d.hh, * mln/core/alias/point3d.hh: ...these. Update guards and includes. * tools/seed2tiling.cc, * tools/area_flooding.cc, * tests/core/w_window1d_int.cc, * tests/core/graph_elt_neighborhood.cc, * tests/core/neighb.cc, * tests/core/window1d.cc, * tests/core/window2d.cc, * tests/core/w_window2d_int.cc, * tests/core/w_window3d_int.cc, * tests/core/window3d.cc, * tests/core/graph_image_wst.cc, * tests/core/p_priority_queue.cc, * tests/core/complex_image.cc, * tests/core/p_priority_queue_fast_with_array.cc, * tests/core/p_set.cc, * tests/core/mono_rle_image.cc, * tests/core/point_set_compatibility.cc, * tests/core/obased_rle_image.cc, * tests/core/graph_image.cc, * tests/core/box1d.cc, * tests/core/box2d.cc, * tests/core/box3d.cc, * tests/core/p_queue_fast.cc, * tests/core/p_bgraph.cc, * tests/core/mono_obased_rle_image.cc, * tests/core/graph_elt_window.cc, * tests/core/p_array.cc, * tests/core/sparse_image.cc, * tests/core/dpoint1d.cc, * tests/core/dpoint2d.cc, * tests/core/dpoint3d.cc, * tests/core/clock_test.cc, * tests/core/line_graph_elt_window.cc, * tests/core/value_enc_image.cc, * tests/core/line_graph_elt_neighborhood.cc, * tests/core/p_queue.cc, * tests/core/line_graph_image.cc, * tests/core/point1d.cc, * tests/core/point2d.cc, * tests/core/point3d.cc, * tests/core/p_priority_queue_fast.cc, * tests/core/rle_image.cc, * tests/core/h_vec.cc, * tests/neighb/image.cc, * tests/draw/label.cc, * tests/draw/graph.cc, * tests/linear/convolve.cc, * tests/linear/line_convolve.cc, * tests/linear/local/convolve.cc, * tests/accu/all_accus.cc, * tests/accu/bbox.cc, * tests/convert/to_p_set.cc, * tests/convert/to_p_array.cc, * tests/convert/to_image.cc, * tests/convert/to_window.cc, * tests/pw/image.cc, * tests/geom/sym.cc, * tests/geom/seed2tiling_roundness.cc, * tests/geom/seed2tiling.cc, * tests/geom/shift.cc, * tests/geom/pmin_pmax.cc, * tests/geom/bbox.cc, * tests/set/uni.cc, * tests/set/sym_diff.cc, * tests/set/inter.cc, * tests/set/is_subset_of.cc, * tests/set/diff.cc, * tests/morpho/meyer_wst_long.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/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/canvas/chamfer.cc, * tests/util/ordpair.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/image_if.cc, * doc/tutorial/examples/p_vaccess.cc, * doc/tutorial/examples/window.cc, * doc/tutorial/examples/image2d.cc, * doc/examples/labeling_algo.cc, * mln/debug/println_with_border.hh, * mln/core/p_image2d_pixter.hh, * mln/core/image/translate_image.hh, * mln/core/image/hexa.hh, * mln/core/image/hexa_piter.hh, * mln/core/image/image1d.hh, * mln/core/image/fi_adaptor.hh, * mln/core/image/image2d.hh, * mln/core/image/image3d.hh, * mln/core/p_image2d.hh, * mln/core/clock_neighb2d.hh, * mln/core/lazy_image.hh, * mln/core/site_set/line2d.hh, * mln/core/pixter1d.hh, * mln/core/pixter2d.hh, * mln/core/pixter3d.hh, * mln/core/alias/p_run2d.hh, * mln/draw/box.hh, * mln/level/was.median.hh, * mln/level/median.hh, * mln/level/naive/median.hh, * mln/level/fast_median.hh, * mln/linear/gaussian.hh, * mln/make/dpoint1d.hh, * mln/make/dpoint2d.hh, * mln/make/dpoint3d.hh, * mln/make/dpoint2d_h.hh, * mln/make/box1d.hh, * mln/make/box2d.hh, * mln/make/point1d.hh, * mln/make/point2d.hh, * mln/make/box3d.hh, * mln/make/point3d.hh, * mln/make/win_chamfer.hh, * mln/make/w_window1d.hh, * mln/make/w_window2d.hh, * mln/make/w_window3d.hh, * mln/make/box2d_h.hh, * mln/make/point2d_h.hh, * mln/make/window1d.hh, * mln/make/w_window1d_int.hh, * mln/make/w_window2d_int.hh, * mln/make/window2d.hh, * mln/make/window3d.hh, * mln/make/w_window3d_int.hh, * mln/geom/chamfer.hh, * mln/fun/p2b/chess.hh, * mln/win/cube3d.hh, * mln/win/diag2d.hh, * mln/win/backdiag2d.hh, * mln/win/cuboid3d.hh, * mln/win/octagon2d.hh, * mln/win/disk2d.hh, * mln/morpho/erosion_fast.hh, * mln/morpho/line_gradient.hh, * mln/morpho/dilation_fast.hh, * mln/io/pfm/save.hh, * mln/io/pnm/save.hh, * sandbox/duhamel/main_mesh_image.cc, * sandbox/duhamel/graph_labeling.hh, * sandbox/duhamel/translate_image.hh, * sandbox/duhamel/labeling_level_generic_10000x1000.cc, * sandbox/duhamel/slow_seed2tiling.cc, * sandbox/duhamel/labeling_algo.cc, * sandbox/duhamel/main.cc, * sandbox/duhamel/color_sub.cc, * sandbox/duhamel/labeling_level_fast_10000x1000.cc, * sandbox/duhamel/chamfer.cc, * sandbox/duhamel/labeling_level_fast.cc, * sandbox/duhamel/labeling_algo.hh, * sandbox/duhamel/mesh_image.hh, * sandbox/duhamel/chamfer.hh, * sandbox/duhamel/draw_mesh.hh, * sandbox/duhamel/labeling_level.hh, * sandbox/pellegrin/set/test/p_queue_fast.cc, * sandbox/pellegrin/set/test/p_priority_queue_fast.cc, * sandbox/pellegrin/set/test/p_bgraph.cc, * sandbox/pellegrin/set/test/p_queue.cc, * sandbox/pellegrin/set/test/p_priority_queue.cc, * sandbox/pellegrin/set/test/p_set.cc, * sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc, * sandbox/pellegrin/set/core/line2d.hh, * sandbox/aroumougame/skeleton/mesh-skel_region.cc, * sandbox/aroumougame/skeleton/test.cc, * sandbox/aroumougame/skeleton/neighborhood1.hh, * sandbox/aroumougame/skeleton/mesh-skel.cc, * sandbox/aroumougame/skeleton/test_image3d.cc, * sandbox/nivault/plugin-gimp/src/gimp-image.hh, * sandbox/nivault/plugin-gimp/src/build-image.hh, * sandbox/nivault/extract_score.cc, * sandbox/nivault/extract_character.cc, * sandbox/nivault/median.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/convert/value_to_point.hh, * sandbox/vigouroux/yuv/get_blue.hh, * sandbox/vigouroux/yuv/get_red.hh, * 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/get_blue.hh, * sandbox/vigouroux/cmy/fun.hh, * sandbox/vigouroux/cmy/get_green.hh, * sandbox/vigouroux/xyz/rgb_to_xyz.hh, * sandbox/vigouroux/xyz/get_blue.hh, * sandbox/vigouroux/xyz/get_red.hh, * sandbox/vigouroux/xyz/get_green.hh, * sandbox/vigouroux/yiq/get_blue.hh, * sandbox/vigouroux/yiq/get_red.hh, * sandbox/vigouroux/yiq/rgb_to_yiq.hh, * sandbox/vigouroux/yiq/get_green.hh, * sandbox/vigouroux/load.cc, * sandbox/vigouroux/conv/getred.hh, * sandbox/vigouroux/conv/tored.hh, * sandbox/vigouroux/conv/torgb.hh, * sandbox/vigouroux/conv/rgbto.hh, * 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/lower.hh, * sandbox/garrigues/fllt/test_fllt12.cc, * sandbox/garrigues/fllt/upper.hh, * sandbox/garrigues/fllt/fllt_simple.svg.1.cc, * sandbox/garrigues/fllt/fllt_simple.svg.3.cc, * sandbox/garrigues/fllt/fllt_simple.cc, * sandbox/garrigues/fllt/test_fllt10_inv.cc, * sandbox/garrigues/fllt/fllt_theo.cc, * sandbox/garrigues/fllt/test_fllt3.cc, * sandbox/garrigues/fllt/test_fllt5.cc, * sandbox/garrigues/fllt/test_fllt7.cc, * sandbox/garrigues/fllt/test_fllt9.cc, * sandbox/garrigues/fllt/test_fllt3_inv.cc, * sandbox/garrigues/fllt/test_fllt_lena.cc, * sandbox/garrigues/fllt/test_fllt.cc, * sandbox/garrigues/fllt/test_flltb.cc, * sandbox/garrigues/fllt/test_fllt7_inv.cc, * sandbox/garrigues/fllt/test_fllt13.cc, * sandbox/garrigues/fllt/test_fllt15.cc, * sandbox/garrigues/fllt/fllt_simple.svg.2.cc, * sandbox/garrigues/fllt/fllt.hh, * sandbox/garrigues/fllt/test.cc, * sandbox/garrigues/fllt/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/lower.hh, * sandbox/garrigues/tiled_image2d/tiled_image2d.hh, * sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh, * sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh, * sandbox/garrigues/upper.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/dt_maze.cc, * sandbox/folio/test/dt_bench.cc, * sandbox/folio/test/dt.cc, * sandbox/folio/psn.cc, * sandbox/folio/psn_log.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/mln/io/tikz/save.hh: Update. apps/statues/mesh-segm.cc | 2 +- apps/statues/mesh-skel.cc | 2 +- doc/examples/labeling_algo.cc | 2 +- doc/tutorial/examples/image2d.cc | 4 ++-- doc/tutorial/examples/image_if.cc | 2 +- doc/tutorial/examples/p_vaccess.cc | 2 +- doc/tutorial/examples/sub_image.cc | 2 +- doc/tutorial/examples/window.cc | 4 ++-- mln/core/alias/box1d.hh | 4 ++-- mln/core/alias/box2d.hh | 4 ++-- mln/core/alias/box2d_h.hh | 6 +++--- mln/core/alias/box3d.hh | 4 ++-- mln/core/alias/dpoint1d.hh | 10 +++++----- mln/core/alias/dpoint2d.hh | 10 +++++----- mln/core/alias/dpoint2d_h.hh | 10 +++++----- mln/core/alias/dpoint3d.hh | 10 +++++----- mln/core/alias/neighb1d.hh | 10 +++++----- mln/core/alias/neighb2d.hh | 10 +++++----- mln/core/alias/neighb3d.hh | 10 +++++----- mln/core/alias/p_run2d.hh | 2 +- mln/core/alias/point1d.hh | 10 +++++----- mln/core/alias/point2d.hh | 10 +++++----- mln/core/alias/point2d_h.hh | 10 +++++----- mln/core/alias/point3d.hh | 10 +++++----- mln/core/alias/w_window1d_float.hh | 10 +++++----- mln/core/alias/w_window1d_int.hh | 10 +++++----- mln/core/alias/w_window2d_float.hh | 10 +++++----- mln/core/alias/w_window2d_int.hh | 10 +++++----- mln/core/alias/w_window3d_float.hh | 10 +++++----- mln/core/alias/w_window3d_int.hh | 10 +++++----- mln/core/alias/window1d.hh | 10 +++++----- mln/core/alias/window2d.hh | 10 +++++----- mln/core/alias/window3d.hh | 10 +++++----- mln/core/clock_neighb2d.hh | 2 +- mln/core/image/fi_adaptor.hh | 2 +- mln/core/image/hexa.hh | 4 ++-- mln/core/image/hexa_piter.hh | 4 ++-- mln/core/image/image1d.hh | 2 +- mln/core/image/image2d.hh | 2 +- mln/core/image/image3d.hh | 2 +- mln/core/image/translate_image.hh | 2 +- mln/core/lazy_image.hh | 2 +- mln/core/p_image2d.hh | 2 +- mln/core/p_image2d_pixter.hh | 2 +- mln/core/pixter1d.hh | 2 +- mln/core/pixter2d.hh | 2 +- mln/core/pixter3d.hh | 2 +- mln/core/site_set/line2d.hh | 2 +- mln/debug/println_with_border.hh | 4 ++-- mln/draw/box.hh | 2 +- mln/fun/p2b/chess.hh | 2 +- mln/geom/chamfer.hh | 4 ++-- mln/io/pfm/save.hh | 2 +- mln/io/pnm/save.hh | 2 +- mln/level/fast_median.hh | 2 +- mln/level/median.hh | 2 +- mln/level/naive/median.hh | 2 +- mln/level/was.median.hh | 2 +- mln/linear/gaussian.hh | 2 +- mln/make/box1d.hh | 2 +- mln/make/box2d.hh | 2 +- mln/make/box2d_h.hh | 2 +- mln/make/box3d.hh | 2 +- mln/make/dpoint1d.hh | 2 +- mln/make/dpoint2d.hh | 2 +- mln/make/dpoint2d_h.hh | 2 +- mln/make/dpoint3d.hh | 2 +- mln/make/point1d.hh | 2 +- mln/make/point2d.hh | 2 +- mln/make/point2d_h.hh | 2 +- mln/make/point3d.hh | 2 +- mln/make/w_window1d.hh | 2 +- mln/make/w_window1d_int.hh | 2 +- mln/make/w_window2d.hh | 2 +- mln/make/w_window2d_int.hh | 2 +- mln/make/w_window3d.hh | 2 +- mln/make/w_window3d_int.hh | 2 +- mln/make/win_chamfer.hh | 4 ++-- mln/make/window1d.hh | 2 +- mln/make/window2d.hh | 2 +- mln/make/window3d.hh | 2 +- mln/morpho/dilation_fast.hh | 2 +- mln/morpho/erosion_fast.hh | 2 +- mln/morpho/line_gradient.hh | 2 +- mln/win/backdiag2d.hh | 2 +- mln/win/cube3d.hh | 2 +- mln/win/cuboid3d.hh | 2 +- mln/win/diag2d.hh | 2 +- mln/win/disk2d.hh | 2 +- mln/win/octagon2d.hh | 2 +- sandbox/abraham/mln/io/tikz/save.hh | 2 +- sandbox/abraham/tests/morpho/test_component_tree.cc | 4 ++-- sandbox/abraham/tests/morpho/test_watershed.cc | 4 ++-- sandbox/abraham/tests/morpho/test_watershed_topo.cc | 4 ++-- sandbox/aroumougame/skeleton/mesh-skel.cc | 2 +- sandbox/aroumougame/skeleton/mesh-skel_region.cc | 2 +- sandbox/aroumougame/skeleton/neighborhood1.hh | 6 +++--- sandbox/aroumougame/skeleton/test.cc | 4 ++-- sandbox/aroumougame/skeleton/test_image3d.cc | 2 +- sandbox/beguin/fusion_graph.hh | 4 ++-- sandbox/beguin/irm.cc | 4 ++-- sandbox/beguin/irm_g.cc | 4 ++-- sandbox/duhamel/chamfer.cc | 4 ++-- sandbox/duhamel/chamfer.hh | 4 ++-- sandbox/duhamel/color_sub.cc | 4 ++-- sandbox/duhamel/draw_mesh.hh | 2 +- sandbox/duhamel/graph_labeling.hh | 2 +- sandbox/duhamel/labeling_algo.cc | 2 +- sandbox/duhamel/labeling_algo.hh | 2 +- sandbox/duhamel/labeling_level.hh | 2 +- sandbox/duhamel/labeling_level_fast.cc | 2 +- sandbox/duhamel/labeling_level_fast_10000x1000.cc | 2 +- sandbox/duhamel/labeling_level_generic_10000x1000.cc | 2 +- sandbox/duhamel/main.cc | 4 ++-- sandbox/duhamel/main_mesh_image.cc | 2 +- sandbox/duhamel/mesh_image.hh | 2 +- sandbox/duhamel/slow_seed2tiling.cc | 4 ++-- sandbox/duhamel/translate_image.hh | 2 +- sandbox/folio/dt.cc | 2 +- sandbox/folio/psn.cc | 2 +- sandbox/folio/psn_log.cc | 2 +- sandbox/folio/test/dt.cc | 2 +- sandbox/folio/test/dt_bench.cc | 2 +- sandbox/folio/test/dt_maze.cc | 2 +- sandbox/folio/test/psn.cc | 2 +- sandbox/folio/test/psn_log.cc | 2 +- sandbox/garrigues/factures/extract_array.cc | 2 +- sandbox/garrigues/factures/extract_array_highlight.cc | 2 +- sandbox/garrigues/fllt/fllt.hh | 2 +- sandbox/garrigues/fllt/fllt_simple.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 2 +- sandbox/garrigues/fllt/fllt_theo.cc | 2 +- sandbox/garrigues/fllt/give_confs.cc | 4 ++-- sandbox/garrigues/fllt/lower.hh | 2 +- sandbox/garrigues/fllt/test.cc | 2 +- sandbox/garrigues/fllt/test_fllt.cc | 2 +- sandbox/garrigues/fllt/test_fllt10.cc | 2 +- sandbox/garrigues/fllt/test_fllt10_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt12.cc | 2 +- sandbox/garrigues/fllt/test_fllt13.cc | 2 +- sandbox/garrigues/fllt/test_fllt15.cc | 2 +- sandbox/garrigues/fllt/test_fllt2.cc | 2 +- sandbox/garrigues/fllt/test_fllt3.cc | 2 +- sandbox/garrigues/fllt/test_fllt3_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt4.cc | 2 +- sandbox/garrigues/fllt/test_fllt5.cc | 2 +- sandbox/garrigues/fllt/test_fllt6.cc | 2 +- sandbox/garrigues/fllt/test_fllt7.cc | 2 +- sandbox/garrigues/fllt/test_fllt7_inv.cc | 2 +- sandbox/garrigues/fllt/test_fllt8.cc | 2 +- sandbox/garrigues/fllt/test_fllt9.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena.cc | 2 +- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc | 2 +- sandbox/garrigues/fllt/test_flltb.cc | 2 +- sandbox/garrigues/fllt/upper.hh | 2 +- sandbox/garrigues/level_set.hh | 4 ++-- sandbox/garrigues/lower.hh | 2 +- sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh | 2 +- sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh | 2 +- sandbox/garrigues/tiled_image2d/tiled_image2d.hh | 2 +- sandbox/garrigues/upper.hh | 2 +- sandbox/geraud/cs2d/cs2d.hh | 4 ++-- sandbox/geraud/cs2d/dbl_neighb.cc | 4 ++-- sandbox/geraud/cs2d/kruskal.cc | 4 ++-- sandbox/geraud/cs2d/tuto.cc | 4 ++-- sandbox/geraud/cs2d/tuto_bis.cc | 4 ++-- sandbox/geraud/dmap.cc | 2 +- sandbox/geraud/fllt.svg.6.cc | 2 +- sandbox/geraud/fllt.svg.7.hh | 2 +- sandbox/geraud/fllt/fllt.hh | 2 +- sandbox/geraud/fllt/fllt.svg.1.cc | 2 +- sandbox/geraud/fllt/fllt.svg.2.cc | 2 +- sandbox/geraud/fllt/fllt.svg.3.cc | 2 +- sandbox/geraud/fllt/fllt.svg.4.cc | 2 +- sandbox/geraud/fllt/fllt.svg.5.cc | 2 +- sandbox/geraud/fllt/fllt.svg.6.cc | 2 +- sandbox/geraud/fllt/fllt.svg.7.hh | 2 +- sandbox/geraud/fllt/fllt_test.hh | 2 +- sandbox/geraud/irm.cc | 4 ++-- sandbox/geraud/max_tree_nnodes.cc | 2 +- sandbox/geraud/win_fun.cc | 2 +- sandbox/nivault/extract_character.cc | 2 +- sandbox/nivault/extract_score.cc | 2 +- sandbox/nivault/median.hh | 2 +- sandbox/nivault/plugin-gimp/src/build-image.hh | 2 +- sandbox/nivault/plugin-gimp/src/gimp-image.hh | 2 +- sandbox/pellegrin/set/core/line2d.hh | 2 +- sandbox/pellegrin/set/test/p_bgraph.cc | 2 +- sandbox/pellegrin/set/test/p_priority_queue.cc | 2 +- sandbox/pellegrin/set/test/p_priority_queue_fast.cc | 2 +- sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc | 2 +- sandbox/pellegrin/set/test/p_queue.cc | 2 +- sandbox/pellegrin/set/test/p_queue_fast.cc | 2 +- sandbox/pellegrin/set/test/p_set.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/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/tored.hh | 2 +- sandbox/vigouroux/conv/torgb.hh | 2 +- sandbox/vigouroux/convert/value_to_point.hh | 4 ++-- sandbox/vigouroux/function.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/load.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/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/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 +- tests/accu/all_accus.cc | 2 +- tests/accu/bbox.cc | 4 ++-- tests/canvas/chamfer.cc | 4 ++-- tests/convert/to_image.cc | 2 +- tests/convert/to_p_array.cc | 4 ++-- tests/convert/to_p_set.cc | 8 ++++---- tests/convert/to_window.cc | 8 ++++---- tests/core/box1d.cc | 2 +- tests/core/box2d.cc | 2 +- tests/core/box3d.cc | 2 +- tests/core/clock_test.cc | 2 +- tests/core/complex_image.cc | 2 +- tests/core/dpoint1d.cc | 2 +- tests/core/dpoint2d.cc | 2 +- tests/core/dpoint3d.cc | 2 +- tests/core/graph_elt_neighborhood.cc | 2 +- tests/core/graph_elt_window.cc | 2 +- tests/core/graph_image.cc | 2 +- tests/core/graph_image_wst.cc | 2 +- tests/core/h_vec.cc | 2 +- tests/core/line_graph_elt_neighborhood.cc | 2 +- tests/core/line_graph_elt_window.cc | 2 +- tests/core/line_graph_image.cc | 2 +- tests/core/mono_obased_rle_image.cc | 2 +- tests/core/mono_rle_image.cc | 2 +- tests/core/neighb.cc | 6 +++--- tests/core/obased_rle_image.cc | 2 +- tests/core/p_array.cc | 2 +- tests/core/p_bgraph.cc | 2 +- tests/core/p_priority_queue.cc | 2 +- tests/core/p_priority_queue_fast.cc | 2 +- tests/core/p_priority_queue_fast_with_array.cc | 2 +- tests/core/p_queue.cc | 2 +- tests/core/p_queue_fast.cc | 2 +- tests/core/p_set.cc | 2 +- tests/core/point1d.cc | 2 +- tests/core/point2d.cc | 2 +- tests/core/point3d.cc | 2 +- tests/core/point_set_compatibility.cc | 2 +- tests/core/rle_image.cc | 2 +- tests/core/sparse_image.cc | 2 +- tests/core/value_enc_image.cc | 2 +- tests/core/w_window1d_int.cc | 2 +- tests/core/w_window2d_int.cc | 2 +- tests/core/w_window3d_int.cc | 2 +- tests/core/window1d.cc | 2 +- tests/core/window2d.cc | 2 +- tests/core/window3d.cc | 2 +- tests/display/save_and_show.cc | 2 +- tests/display/show.cc | 2 +- tests/draw/graph.cc | 2 +- tests/draw/label.cc | 2 +- tests/geom/bbox.cc | 4 ++-- tests/geom/pmin_pmax.cc | 2 +- tests/geom/seed2tiling.cc | 2 +- tests/geom/seed2tiling_roundness.cc | 4 ++-- tests/geom/shift.cc | 4 ++-- tests/geom/sym.cc | 4 ++-- 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 | 2 +- tests/labeling/regional_maxima.cc | 2 +- tests/labeling/regional_minima.cc | 2 +- tests/linear/convolve.cc | 2 +- tests/linear/line_convolve.cc | 2 +- tests/linear/local/convolve.cc | 2 +- tests/morpho/artificial_line_graph_image_wst.cc | 6 +++--- tests/morpho/closing_area.cc | 2 +- tests/morpho/closing_height.cc | 2 +- tests/morpho/closing_volume.cc | 2 +- tests/morpho/combined.cc | 4 ++-- tests/morpho/dilation.cc | 4 ++-- tests/morpho/dilation_max_h.cc | 2 +- tests/morpho/erosion.cc | 2 +- tests/morpho/erosion_min_h.cc | 2 +- tests/morpho/gradient_elementary.cc | 2 +- tests/morpho/hit_or_miss.cc | 2 +- tests/morpho/lena_line_graph_image_wst1.cc | 6 +++--- tests/morpho/lena_line_graph_image_wst2.cc | 6 +++--- tests/morpho/line_graph_image_wst.cc | 2 +- tests/morpho/meyer_wst.cc | 4 ++-- 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/image.cc | 2 +- tests/set/diff.cc | 2 +- tests/set/inter.cc | 2 +- tests/set/is_subset_of.cc | 2 +- tests/set/sym_diff.cc | 2 +- tests/set/uni.cc | 2 +- tests/util/ordpair.cc | 2 +- tools/area_flooding.cc | 2 +- tools/seed2tiling.cc | 4 ++-- 331 files changed, 472 insertions(+), 472 deletions(-) Index: tools/seed2tiling.cc --- tools/seed2tiling.cc (revision 2172) +++ tools/seed2tiling.cc (working copy) @@ -33,7 +33,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/level/stretch.hh> @@ -51,7 +51,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/make/win_chamfer.hh> int main(int argc, char* argv[]) Index: tools/area_flooding.cc --- tools/area_flooding.cc (revision 2172) +++ tools/area_flooding.cc (working copy) @@ -52,7 +52,7 @@ #include <mln/value/int_u16.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> Index: tests/core/w_window1d_int.cc --- tests/core/w_window1d_int.cc (revision 2172) +++ tests/core/w_window1d_int.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/w_window1d_int.cc /// \brief Tests on mln::w_window1d_int. -#include <mln/core/w_window1d_int.hh> +#include <mln/core/alias/w_window1d_int.hh> #include <mln/win/segment1d.hh> #include <mln/convert/to_image.hh> Index: tests/core/graph_elt_neighborhood.cc --- tests/core/graph_elt_neighborhood.cc (revision 2172) +++ tests/core/graph_elt_neighborhood.cc (working copy) @@ -32,7 +32,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/debug/iota.hh> Index: tests/core/neighb.cc --- tests/core/neighb.cc (revision 2172) +++ tests/core/neighb.cc (working copy) @@ -28,9 +28,9 @@ /// \file tests/core/neighb.cc /// \brief Tests on mln::neighb<D> specializations. -#include <mln/core/neighb1d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/neighb3d.hh> +#include <mln/core/alias/neighb1d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/neighb3d.hh> using namespace mln; Index: tests/core/window1d.cc --- tests/core/window1d.cc (revision 2172) +++ tests/core/window1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::window1d. */ -#include <mln/core/window1d.hh> +#include <mln/core/alias/window1d.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 2172) +++ tests/core/window2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::window2d. */ -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image2d.hh> #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> Index: tests/core/w_window2d_int.cc --- tests/core/w_window2d_int.cc (revision 2172) +++ tests/core/w_window2d_int.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::w_window2d_int. */ -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/win/rectangle2d.hh> #include <mln/convert/to_image.hh> Index: tests/core/w_window3d_int.cc --- tests/core/w_window3d_int.cc (revision 2172) +++ tests/core/w_window3d_int.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::w_window3d_int. */ -#include <mln/core/w_window3d_int.hh> +#include <mln/core/alias/w_window3d_int.hh> #include <mln/win/cube3d.hh> #include <mln/convert/to_image.hh> Index: tests/core/window3d.cc --- tests/core/window3d.cc (revision 2172) +++ tests/core/window3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::window3d. */ -#include <mln/core/window3d.hh> +#include <mln/core/alias/window3d.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 2172) +++ tests/core/graph_image_wst.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_image.hh> #include <mln/core/image/graph_elt_window.hh> #include <mln/core/image/graph_window_piter.hh> Index: tests/core/p_priority_queue.cc --- tests/core/p_priority_queue.cc (revision 2172) +++ tests/core/p_priority_queue.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_priority_queue.hh> int main () Index: tests/core/complex_image.cc --- tests/core/complex_image.cc (revision 2172) +++ tests/core/complex_image.cc (working copy) @@ -31,7 +31,7 @@ #include <iostream> #include <mln/value/int_u8.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_faces.hh> #include <mln/core/complex_image.hh> Index: tests/core/p_priority_queue_fast_with_array.cc --- tests/core/p_priority_queue_fast_with_array.cc (revision 2172) +++ tests/core/p_priority_queue_fast_with_array.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue_fast_with_array. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_priority_queue_fast_with_array.hh> int main () Index: tests/core/p_set.cc --- tests/core/p_set.cc (revision 2172) +++ tests/core/p_set.cc (working copy) @@ -32,7 +32,7 @@ #include <iterator> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_set.hh> Index: tests/core/mono_rle_image.cc --- tests/core/mono_rle_image.cc (revision 2172) +++ tests/core/mono_rle_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/point_set_compatibility.cc --- tests/core/point_set_compatibility.cc (revision 2172) +++ tests/core/point_set_compatibility.cc (working copy) @@ -29,7 +29,7 @@ /// \brief Tests on the compatibility of some point sites with some /// point sets (and their iterators). -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/site_set/p_set.hh> Index: tests/core/obased_rle_image.cc --- tests/core/obased_rle_image.cc (revision 2172) +++ tests/core/obased_rle_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/graph_image.cc --- tests/core/graph_image.cc (revision 2172) +++ tests/core/graph_image.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_image.hh> #include <mln/core/image/graph_elt_window.hh> #include <mln/core/image/graph_window_piter.hh> Index: tests/core/box1d.cc --- tests/core/box1d.cc (revision 2172) +++ tests/core/box1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::box1d. */ -#include <mln/core/box1d.hh> +#include <mln/core/alias/box1d.hh> Index: tests/core/box2d.cc --- tests/core/box2d.cc (revision 2172) +++ tests/core/box2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::box2d. */ -#include <mln/core/box2d.hh> +#include <mln/core/alias/box2d.hh> Index: tests/core/box3d.cc --- tests/core/box3d.cc (revision 2172) +++ tests/core/box3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::box3d. */ -#include <mln/core/box3d.hh> +#include <mln/core/alias/box3d.hh> Index: tests/core/p_queue_fast.cc --- tests/core/p_queue_fast.cc (revision 2172) +++ tests/core/p_queue_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_queue_fast. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: tests/core/p_bgraph.cc --- tests/core/p_bgraph.cc (revision 2172) +++ tests/core/p_bgraph.cc (working copy) @@ -29,7 +29,7 @@ /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). #include <mln/core/site_set/p_bgraph.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/util/internal/boost_graph.hh> #include <boost/typeof/std/utility.hpp> Index: tests/core/mono_obased_rle_image.cc --- tests/core/mono_obased_rle_image.cc (revision 2172) +++ tests/core/mono_obased_rle_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/graph_elt_window.cc --- tests/core/graph_elt_window.cc (revision 2172) +++ tests/core/graph_elt_window.cc (working copy) @@ -32,7 +32,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_elt_window.hh> #include <mln/debug/iota.hh> Index: tests/core/p_array.cc --- tests/core/p_array.cc (revision 2172) +++ tests/core/p_array.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_array. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_array.hh> Index: tests/core/sparse_image.cc --- tests/core/sparse_image.cc (revision 2172) +++ tests/core/sparse_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/dpoint1d.cc --- tests/core/dpoint1d.cc (revision 2172) +++ tests/core/dpoint1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::dpoint1d. */ -#include <mln/core/dpoint1d.hh> +#include <mln/core/alias/dpoint1d.hh> Index: tests/core/dpoint2d.cc --- tests/core/dpoint2d.cc (revision 2172) +++ tests/core/dpoint2d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::dpoint2d. */ -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> Index: tests/core/dpoint3d.cc --- tests/core/dpoint3d.cc (revision 2172) +++ tests/core/dpoint3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::dpoint3d. */ -#include <mln/core/dpoint3d.hh> +#include <mln/core/alias/dpoint3d.hh> Index: tests/core/clock_test.cc --- tests/core/clock_test.cc (revision 2172) +++ tests/core/clock_test.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/debug/println.hh> #include <mln/level/fill.hh> #include <mln/labeling/level.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> namespace mln { Index: tests/core/line_graph_elt_window.cc --- tests/core/line_graph_elt_window.cc (revision 2172) +++ tests/core/line_graph_elt_window.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/line_graph_elt_window.hh> #include <mln/debug/iota.hh> Index: tests/core/value_enc_image.cc --- tests/core/value_enc_image.cc (revision 2172) +++ tests/core/value_enc_image.cc (working copy) @@ -36,7 +36,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/line_graph_elt_neighborhood.cc --- tests/core/line_graph_elt_neighborhood.cc (revision 2172) +++ tests/core/line_graph_elt_neighborhood.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/debug/iota.hh> Index: tests/core/p_queue.cc --- tests/core/p_queue.cc (revision 2172) +++ tests/core/p_queue.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_queue. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_queue.hh> Index: tests/core/line_graph_image.cc --- tests/core/line_graph_image.cc (revision 2172) +++ tests/core/line_graph_image.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.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> Index: tests/core/point1d.cc --- tests/core/point1d.cc (revision 2172) +++ tests/core/point1d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::point1d. */ -#include <mln/core/point1d.hh> +#include <mln/core/alias/point1d.hh> Index: tests/core/point2d.cc --- tests/core/point2d.cc (revision 2172) +++ tests/core/point2d.cc (working copy) @@ -31,7 +31,7 @@ */ #include <iostream> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/literal/all.hh> Index: tests/core/point3d.cc --- tests/core/point3d.cc (revision 2172) +++ tests/core/point3d.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::point3d. */ -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> Index: tests/core/p_priority_queue_fast.cc --- tests/core/p_priority_queue_fast.cc (revision 2172) +++ tests/core/p_priority_queue_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue_fast. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_priority_queue_fast.hh> int main () Index: tests/core/rle_image.cc --- tests/core/rle_image.cc (revision 2172) +++ tests/core/rle_image.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/level/transform.hh> Index: tests/core/h_vec.cc --- tests/core/h_vec.cc (revision 2172) +++ tests/core/h_vec.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/h_vec.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> using namespace mln; Index: tests/neighb/image.cc --- tests/neighb/image.cc (revision 2172) +++ tests/neighb/image.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/neighb/image.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/metal/has_neighborhood.hh> Index: tests/draw/label.cc --- tests/draw/label.cc (revision 2172) +++ tests/draw/label.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include <mln/display/save_and_show.hh> Index: tests/draw/graph.cc --- tests/draw/graph.cc (revision 2172) +++ tests/draw/graph.cc (working copy) @@ -37,7 +37,7 @@ #include <utility> #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/debug/println.hh> #include <mln/util/graph.hh> #include <mln/core/site_set/p_graph.hh> Index: tests/linear/convolve.cc --- tests/linear/convolve.cc (revision 2172) +++ tests/linear/convolve.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/math/round.hh> #include <mln/level/transform.hh> -#include <mln/core/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_float.hh> #include <mln/border/thickness.hh> #include <mln/linear/convolve.hh> Index: tests/linear/line_convolve.cc --- tests/linear/line_convolve.cc (revision 2172) +++ tests/linear/line_convolve.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/math/round.hh> #include <mln/level/transform.hh> -#include <mln/core/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_float.hh> #include <mln/border/thickness.hh> #include <mln/linear/line_convolve.hh> Index: tests/linear/local/convolve.cc --- tests/linear/local/convolve.cc (revision 2172) +++ tests/linear/local/convolve.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/win/rectangle2d.hh> #include <mln/core/pixel.hh> Index: tests/accu/all_accus.cc --- tests/accu/all_accus.cc (revision 2172) +++ tests/accu/all_accus.cc (working copy) @@ -29,7 +29,7 @@ /// \brief Tests on all_accus files in mln/accu. #include <mln/accu/all.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/value/set.hh> Index: tests/accu/bbox.cc --- tests/accu/bbox.cc (revision 2172) +++ tests/accu/bbox.cc (working copy) @@ -31,8 +31,8 @@ */ -#include <mln/core/point2d.hh> -#include <mln/core/box2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/box2d.hh> #include <mln/accu/bbox.hh> Index: tests/convert/to_p_set.cc --- tests/convert/to_p_set.cc (revision 2172) +++ tests/convert/to_p_set.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::convert::to_p_set. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.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/alias/window2d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> Index: tests/convert/to_p_array.cc --- tests/convert/to_p_array.cc (revision 2172) +++ tests/convert/to_p_array.cc (working copy) @@ -30,8 +30,8 @@ * \brief Tests on mln::convert::to_p_array. */ -#include <mln/core/point1d.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point1d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/win/segment1d.hh> Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2172) +++ tests/convert/to_image.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/level/compare.hh> Index: tests/convert/to_window.cc --- tests/convert/to_window.cc (revision 2172) +++ tests/convert/to_window.cc (working copy) @@ -30,12 +30,12 @@ * \brief Tests on mln::convert::to_window. */ -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.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/alias/window2d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> Index: tests/pw/image.cc --- tests/pw/image.cc (revision 2172) +++ tests/pw/image.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/fun/p2b/chess.hh> -#include <mln/core/box2d.hh> +#include <mln/core/alias/box2d.hh> #include <mln/pw/image.hh> #include <mln/debug/println.hh> Index: tests/geom/sym.cc --- tests/geom/sym.cc (revision 2172) +++ tests/geom/sym.cc (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/window2d.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/dpoint2d.hh> #include <mln/geom/sym.hh> Index: tests/geom/seed2tiling_roundness.cc --- tests/geom/seed2tiling_roundness.cc (revision 2172) +++ tests/geom/seed2tiling_roundness.cc (working copy) @@ -31,8 +31,8 @@ */ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/make/win_chamfer.hh> # include <mln/geom/seeds2tiling_roundness.hh> # include <mln/level/compare.hh> Index: tests/geom/seed2tiling.cc --- tests/geom/seed2tiling.cc (revision 2172) +++ tests/geom/seed2tiling.cc (working copy) @@ -32,7 +32,7 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/geom/seeds2tiling.hh> # include <mln/level/compare.hh> Index: tests/geom/shift.cc --- tests/geom/shift.cc (revision 2172) +++ tests/geom/shift.cc (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/window2d.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/dpoint2d.hh> #include <mln/geom/shift.hh> Index: tests/geom/pmin_pmax.cc --- tests/geom/pmin_pmax.cc (revision 2172) +++ tests/geom/pmin_pmax.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/geom/pmin_pmax.hh> Index: tests/geom/bbox.cc --- tests/geom/bbox.cc (revision 2172) +++ tests/geom/bbox.cc (working copy) @@ -26,8 +26,8 @@ // Public License. #include <mln/core/site_set/p_set.hh> -#include <mln/core/point2d.hh> -#include <mln/core/box2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/box2d.hh> #include <mln/geom/bbox.hh> Index: tests/set/uni.cc --- tests/set/uni.cc (revision 2172) +++ tests/set/uni.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/uni.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> int main() { Index: tests/set/sym_diff.cc --- tests/set/sym_diff.cc (revision 2172) +++ tests/set/sym_diff.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/sym_diff.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> int main() { Index: tests/set/inter.cc --- tests/set/inter.cc (revision 2172) +++ tests/set/inter.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/inter.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> int main() Index: tests/set/is_subset_of.cc --- tests/set/is_subset_of.cc (revision 2172) +++ tests/set/is_subset_of.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/set/is_subset_of.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> int main() { Index: tests/set/diff.cc --- tests/set/diff.cc (revision 2172) +++ tests/set/diff.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/diff.hh> -#include <mln/core/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> int main() { Index: tests/morpho/meyer_wst_long.cc --- tests/morpho/meyer_wst_long.cc (revision 2172) +++ tests/morpho/meyer_wst_long.cc (working copy) @@ -32,8 +32,8 @@ #include <mln/core/image/image_if.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: tests/morpho/artificial_line_graph_image_wst.cc --- tests/morpho/artificial_line_graph_image_wst.cc (revision 2172) +++ tests/morpho/artificial_line_graph_image_wst.cc (working copy) @@ -50,9 +50,9 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> Index: tests/morpho/rank_filter.cc --- tests/morpho/rank_filter.cc (revision 2172) +++ tests/morpho/rank_filter.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> #include <mln/win/backdiag2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/dilation.cc --- tests/morpho/dilation.cc (revision 2172) +++ tests/morpho/dilation.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> #include <mln/win/backdiag2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> @@ -48,7 +48,7 @@ #include <mln/pw/cst.hh> #include <mln/fun/ops.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/neighb/image.hh> #include "tests/data.hh" Index: tests/morpho/line_graph_image_wst.cc --- tests/morpho/line_graph_image_wst.cc (revision 2172) +++ tests/morpho/line_graph_image_wst.cc (working copy) @@ -30,7 +30,7 @@ #include <vector> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.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> Index: tests/morpho/meyer_wst.cc --- tests/morpho/meyer_wst.cc (revision 2172) +++ tests/morpho/meyer_wst.cc (working copy) @@ -31,8 +31,8 @@ #include <iostream> #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> Index: tests/morpho/thinning.cc --- tests/morpho/thinning.cc (revision 2172) +++ tests/morpho/thinning.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/load.hh> Index: tests/morpho/erosion.cc --- tests/morpho/erosion.cc (revision 2172) +++ tests/morpho/erosion.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/win/octagon2d.hh> #include <mln/win/diag2d.hh> #include <mln/win/backdiag2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/dilation_max_h.cc --- tests/morpho/dilation_max_h.cc (revision 2172) +++ tests/morpho/dilation_max_h.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/hit_or_miss.cc --- tests/morpho/hit_or_miss.cc (revision 2172) +++ tests/morpho/hit_or_miss.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/geom/shift.hh> #include <mln/set/diff.hh> Index: tests/morpho/combined.cc --- tests/morpho/combined.cc (revision 2172) +++ tests/morpho/combined.cc (working copy) @@ -34,10 +34,10 @@ #include <mln/level/fill.hh> #include <mln/debug/println.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/morpho/erosion.hh> #include <mln/morpho/Rd.hh> Index: tests/morpho/gradient_elementary.cc --- tests/morpho/gradient_elementary.cc (revision 2172) +++ tests/morpho/gradient_elementary.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pbm/save.hh> Index: tests/morpho/closing_volume.cc --- tests/morpho/closing_volume.cc (revision 2172) +++ tests/morpho/closing_volume.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/closing_area.cc --- tests/morpho/closing_area.cc (revision 2172) +++ tests/morpho/closing_area.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/closing_height.cc --- tests/morpho/closing_height.cc (revision 2172) +++ tests/morpho/closing_height.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/opening_volume.cc --- tests/morpho/opening_volume.cc (revision 2172) +++ tests/morpho/opening_volume.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/opening_area.cc --- tests/morpho/opening_area.cc (revision 2172) +++ tests/morpho/opening_area.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/lena_line_graph_image_wst1.cc --- tests/morpho/lena_line_graph_image_wst1.cc (revision 2172) +++ tests/morpho/lena_line_graph_image_wst1.cc (working copy) @@ -49,9 +49,9 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> Index: tests/morpho/opening_height.cc --- tests/morpho/opening_height.cc (revision 2172) +++ tests/morpho/opening_height.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/erosion_min_h.cc --- tests/morpho/erosion_min_h.cc (revision 2172) +++ tests/morpho/erosion_min_h.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: tests/morpho/lena_line_graph_image_wst2.cc --- tests/morpho/lena_line_graph_image_wst2.cc (revision 2172) +++ tests/morpho/lena_line_graph_image_wst2.cc (working copy) @@ -52,9 +52,9 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> Index: tests/display/show.cc --- tests/display/show.cc (revision 2172) +++ tests/display/show.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/display/save.hh> #include <mln/display/remove.hh> Index: tests/display/save_and_show.cc --- tests/display/save_and_show.cc (revision 2172) +++ tests/display/save_and_show.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: tests/canvas/chamfer.cc --- tests/canvas/chamfer.cc (revision 2172) +++ tests/canvas/chamfer.cc (working copy) @@ -37,8 +37,8 @@ #include <mln/level/fill.hh> #include <mln/debug/println.hh> -#include <mln/core/w_window2d_int.hh> -#include <mln/core/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_float.hh> #include <mln/core/image_if_interval.hh> #include <mln/make/win_chamfer.hh> Index: tests/util/ordpair.cc --- tests/util/ordpair.cc (revision 2172) +++ tests/util/ordpair.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::util::ordpair. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/util/ordpair.hh> Index: tests/labeling/regional_maxima.cc --- tests/labeling/regional_maxima.cc (revision 2172) +++ tests/labeling/regional_maxima.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/labeling/regional_maxima.hh> Index: tests/labeling/background.cc --- tests/labeling/background.cc (revision 2172) +++ tests/labeling/background.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/background.hh> #include <mln/logical/not.hh> Index: tests/labeling/blobs.cc --- tests/labeling/blobs.cc (revision 2172) +++ tests/labeling/blobs.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/blobs.hh> #include "tests/data.hh" Index: tests/labeling/flat_zones.cc --- tests/labeling/flat_zones.cc (revision 2172) +++ tests/labeling/flat_zones.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/flat_zones.hh> #include <mln/labeling/blobs.hh> Index: tests/labeling/level.cc --- tests/labeling/level.cc (revision 2172) +++ tests/labeling/level.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> Index: tests/labeling/foreground.cc --- tests/labeling/foreground.cc (revision 2172) +++ tests/labeling/foreground.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/foreground.hh> #include "tests/data.hh" Index: tests/labeling/regional_minima.cc --- tests/labeling/regional_minima.cc (revision 2172) +++ tests/labeling/regional_minima.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/pw/all.hh> #include <mln/labeling/regional_minima.hh> Index: apps/statues/mesh-segm.cc --- apps/statues/mesh-segm.cc (revision 2172) +++ apps/statues/mesh-segm.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: apps/statues/mesh-skel.cc --- apps/statues/mesh-skel.cc (revision 2172) +++ apps/statues/mesh-skel.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: doc/tutorial/examples/sub_image.cc --- doc/tutorial/examples/sub_image.cc (revision 2172) +++ doc/tutorial/examples/sub_image.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/image/sub_image.hh> # include <mln/debug/iota.hh> Index: doc/tutorial/examples/image_if.cc --- doc/tutorial/examples/image_if.cc (revision 2172) +++ doc/tutorial/examples/image_if.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/image/image_if.hh> # include <mln/debug/iota.hh> Index: doc/tutorial/examples/p_vaccess.cc --- doc/tutorial/examples/p_vaccess.cc (revision 2172) +++ doc/tutorial/examples/p_vaccess.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2172) +++ doc/tutorial/examples/window.cc (working copy) @@ -1,11 +1,11 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> template <typename I, typename W, typename P> Index: doc/tutorial/examples/image2d.cc --- doc/tutorial/examples/image2d.cc (revision 2172) +++ doc/tutorial/examples/image2d.cc (working copy) @@ -1,11 +1,11 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> template <typename I, typename W, typename P> Index: doc/examples/labeling_algo.cc --- doc/examples/labeling_algo.cc (revision 2172) +++ doc/examples/labeling_algo.cc (working copy) @@ -32,7 +32,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/level/stretch.hh> Index: mln/debug/println_with_border.hh --- mln/debug/println_with_border.hh (revision 2172) +++ mln/debug/println_with_border.hh (working copy) @@ -37,8 +37,8 @@ # include <mln/core/concept/window.hh> # include <mln/debug/format.hh> -# include <mln/core/box2d.hh> -# include <mln/core/box3d.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/core/alias/box3d.hh> // Specializations are in: # include <mln/debug/println_with_border.spe.hh> Index: mln/core/p_image2d_pixter.hh --- mln/core/p_image2d_pixter.hh (revision 2172) +++ mln/core/p_image2d_pixter.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Pixel iterators on a mln::p_image2d. # include <mln/core/internal/pixel_iterator_base.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/geom/size2d.hh> namespace mln Index: mln/core/image/translate_image.hh --- mln/core/image/translate_image.hh (revision 2172) +++ mln/core/image/translate_image.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/internal/image_identity.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/line_piter.hh> Index: mln/core/image/hexa.hh --- mln/core/image/hexa.hh (revision 2172) +++ mln/core/image/hexa.hh (working copy) @@ -37,8 +37,8 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/point2d_h.hh> -# include <mln/core/box2d_h.hh> +# include <mln/core/alias/point2d_h.hh> +# include <mln/core/alias/box2d_h.hh> # include <mln/core/image/hexa_piter.hh> Index: mln/core/image/hexa_piter.hh --- mln/core/image/hexa_piter.hh (revision 2172) +++ mln/core/image/hexa_piter.hh (working copy) @@ -35,8 +35,8 @@ # include <mln/core/internal/piter_adaptor.hh> -# include <mln/core/box2d.hh> -# include <mln/core/box2d_h.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/core/alias/box2d_h.hh> # include <mln/core/image/inplace.hh> namespace mln Index: mln/core/image/image1d.hh --- mln/core/image/image1d.hh (revision 2172) +++ mln/core/image/image1d.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/internal/fixme.hh> # include <mln/core/internal/image_primary.hh> -# include <mln/core/box1d.hh> +# include <mln/core/alias/box1d.hh> # include <mln/border/thickness.hh> # include <mln/value/set.hh> Index: mln/core/image/fi_adaptor.hh --- mln/core/image/fi_adaptor.hh (revision 2172) +++ mln/core/image/fi_adaptor.hh (working copy) @@ -51,7 +51,7 @@ # include <FreeImagePlus.h> # include <mln/core/internal/image_primary.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/line_piter.hh> # include <mln/value/set.hh> Index: mln/core/image/image2d.hh --- mln/core/image/image2d.hh (revision 2172) +++ mln/core/image/image2d.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/init.hh> # include <mln/border/thickness.hh> Index: mln/core/image/image3d.hh --- mln/core/image/image3d.hh (revision 2172) +++ mln/core/image/image3d.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/internal/fixme.hh> # include <mln/core/internal/image_primary.hh> -# include <mln/core/box3d.hh> +# include <mln/core/alias/box3d.hh> # include <mln/border/thickness.hh> # include <mln/value/set.hh> Index: mln/core/p_image2d.hh --- mln/core/p_image2d.hh (revision 2172) +++ mln/core/p_image2d.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/internal/site_set_base.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> Index: mln/core/clock_neighb2d.hh --- mln/core/clock_neighb2d.hh (revision 2172) +++ mln/core/clock_neighb2d.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/clock_neighb.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln Index: mln/core/lazy_image.hh --- mln/core/lazy_image.hh (revision 2172) +++ mln/core/lazy_image.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/internal/image_identity.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/line_piter.hh> Index: mln/core/site_set/line2d.hh --- mln/core/site_set/line2d.hh (revision 2172) +++ mln/core/site_set/line2d.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/site_set/p_array.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/math/all.hh> Index: mln/core/pixter1d.hh --- mln/core/pixter1d.hh (revision 2172) +++ mln/core/pixter1d.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Pixel iterators on a 1-D image with border. # include <mln/core/internal/pixel_iterator_base.hh> -# include <mln/core/point1d.hh> +# include <mln/core/alias/point1d.hh> # include <mln/geom/size1d.hh> namespace mln Index: mln/core/pixter2d.hh --- mln/core/pixter2d.hh (revision 2172) +++ mln/core/pixter2d.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Pixel iterators on a 2-D image with border. # include <mln/core/internal/pixel_iterator_base.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/geom/size2d.hh> namespace mln Index: mln/core/pixter3d.hh --- mln/core/pixter3d.hh (revision 2172) +++ mln/core/pixter3d.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Pixel iterators on a 3-D image with border. # include <mln/core/internal/pixel_iterator_base.hh> -# include <mln/core/point3d.hh> +# include <mln/core/alias/point3d.hh> # include <mln/geom/size3d.hh> namespace mln Index: mln/core/alias/neighb1d.hh --- mln/core/alias/neighb1d.hh (revision 2172) +++ mln/core/alias/neighb1d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_NEIGHB1D_HH -# define MLN_CORE_NEIGHB1D_HH +#ifndef MLN_CORE_ALIAS_NEIGHB1D_HH +# define MLN_CORE_ALIAS_NEIGHB1D_HH -/*! \file mln/core/neighb1d.hh +/*! \file mln/core/alias/neighb1d.hh * * \brief Definition of the mln::neighb1d alias and of some classical * 1D neighborhoods. @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/neighb.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln @@ -77,4 +77,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_NEIGHB1D_HH +#endif // ! MLN_CORE_ALIAS_NEIGHB1D_HH Index: mln/core/alias/neighb2d.hh --- mln/core/alias/neighb2d.hh (revision 2172) +++ mln/core/alias/neighb2d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_NEIGHB2D_HH -# define MLN_CORE_NEIGHB2D_HH +#ifndef MLN_CORE_ALIAS_NEIGHB2D_HH +# define MLN_CORE_ALIAS_NEIGHB2D_HH -/*! \file mln/core/neighb2d.hh +/*! \file mln/core/alias/neighb2d.hh * * \brief Definition of the mln::neighb2d alias and of some classical * 2D neighborhoods. @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/neighborhood.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln @@ -167,4 +167,4 @@ -#endif // ! MLN_CORE_NEIGHB2D_HH +#endif // ! MLN_CORE_ALIAS_NEIGHB2D_HH Index: mln/core/alias/dpoint1d.hh --- mln/core/alias/dpoint1d.hh (revision 2172) +++ mln/core/alias/dpoint1d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DPOINT1D_HH -# define MLN_CORE_DPOINT1D_HH +#ifndef MLN_CORE_ALIAS_DPOINT1D_HH +# define MLN_CORE_ALIAS_DPOINT1D_HH -/*! \file mln/core/dpoint1d.hh +/*! \file mln/core/alias/dpoint1d.hh * * \brief Definition of the mln::dpoint1d alias and of its * construction routine. @@ -51,7 +51,7 @@ # include <mln/make/dpoint1d.hh> -# include <mln/core/point1d.hh> +# include <mln/core/alias/point1d.hh> namespace mln @@ -74,4 +74,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DPOINT1D_HH +#endif // ! MLN_CORE_ALIAS_DPOINT1D_HH Index: mln/core/alias/neighb3d.hh --- mln/core/alias/neighb3d.hh (revision 2172) +++ mln/core/alias/neighb3d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_NEIGHB3D_HH -# define MLN_CORE_NEIGHB3D_HH +#ifndef MLN_CORE_ALIAS_NEIGHB3D_HH +# define MLN_CORE_ALIAS_NEIGHB3D_HH -/*! \file mln/core/neighb3d.hh +/*! \file mln/core/alias/neighb3d.hh * * \brief Definition of the mln::neighb3d alias and of some classical * 3D neighborhoods. @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/neighb.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln @@ -174,4 +174,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_NEIGHB3D_HH +#endif // ! MLN_CORE_ALIAS_NEIGHB3D_HH Index: mln/core/alias/dpoint2d.hh --- mln/core/alias/dpoint2d.hh (revision 2172) +++ mln/core/alias/dpoint2d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DPOINT2D_HH -# define MLN_CORE_DPOINT2D_HH +#ifndef MLN_CORE_ALIAS_DPOINT2D_HH +# define MLN_CORE_ALIAS_DPOINT2D_HH -/*! \file mln/core/dpoint2d.hh +/*! \file mln/core/alias/dpoint2d.hh * * \brief Definition of the mln::dpoint2d alias and of its * construction routine. @@ -51,7 +51,7 @@ # include <mln/make/dpoint2d.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln @@ -73,4 +73,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DPOINT2D_HH +#endif // ! MLN_CORE_ALIAS_DPOINT2D_HH Index: mln/core/alias/dpoint3d.hh --- mln/core/alias/dpoint3d.hh (revision 2172) +++ mln/core/alias/dpoint3d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DPOINT3D_HH -# define MLN_CORE_DPOINT3D_HH +#ifndef MLN_CORE_ALIAS_DPOINT3D_HH +# define MLN_CORE_ALIAS_DPOINT3D_HH -/*! \file mln/core/dpoint3d.hh +/*! \file mln/core/alias/dpoint3d.hh * * \brief Definition of the mln::dpoint3d alias and of its * construction routine. @@ -51,7 +51,7 @@ # include <mln/make/dpoint3d.hh> -# include <mln/core/point3d.hh> +# include <mln/core/alias/point3d.hh> namespace mln @@ -75,4 +75,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DPOINT3D_HH +#endif // ! MLN_CORE_ALIAS_DPOINT3D_HH Index: mln/core/alias/box2d_h.hh --- mln/core/alias/box2d_h.hh (revision 2172) +++ mln/core/alias/box2d_h.hh (working copy) @@ -28,15 +28,15 @@ #ifndef MLN_CORE_SITE_SET_BOX2D_H_HH # define MLN_CORE_SITE_SET_BOX2D_H_HH -/*! \file mln/core/box2d_h.hh +/*! \file mln/core/alias/box2d_h.hh * * \brief Definition of the mln::box2d alias and of construction * routines. */ # include <mln/core/site_set/box.hh> -# include <mln/core/box2d.hh> -# include <mln/core/point2d_h.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/core/alias/point2d_h.hh> namespace mln Index: mln/core/alias/point2d_h.hh --- mln/core/alias/point2d_h.hh (revision 2172) +++ mln/core/alias/point2d_h.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_POINT2D_H_HH -# define MLN_CORE_POINT2D_H_HH +#ifndef MLN_CORE_ALIAS_POINT2D_H_HH +# define MLN_CORE_ALIAS_POINT2D_H_HH -/// \file mln/core/point2d_h.hh +/// \file mln/core/alias/point2d_h.hh /// \brief Definition of the mln::point2d_h alias and of its construction /// routine. @@ -49,7 +49,7 @@ # include <mln/make/point2d_h.hh> -# include <mln/core/dpoint2d_h.hh> +# include <mln/core/alias/dpoint2d_h.hh> -#endif // ! MLN_CORE_POINT2D_H_HH +#endif // ! MLN_CORE_ALIAS_POINT2D_H_HH Index: mln/core/alias/dpoint2d_h.hh --- mln/core/alias/dpoint2d_h.hh (revision 2172) +++ mln/core/alias/dpoint2d_h.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_DPOINT2D_H_HH -# define MLN_CORE_DPOINT2D_H_HH +#ifndef MLN_CORE_ALIAS_DPOINT2D_H_HH +# define MLN_CORE_ALIAS_DPOINT2D_H_HH -/*! \file mln/core/dpoint2d_h.hh +/*! \file mln/core/alias/dpoint2d_h.hh * * \brief Definition of the mln::dpoint2d_h alias and of its * construction routine. @@ -51,7 +51,7 @@ # include <mln/make/dpoint2d_h.hh> -# include <mln/core/point2d_h.hh> +# include <mln/core/alias/point2d_h.hh> namespace mln @@ -66,4 +66,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_DPOINT2D_H_HH +#endif // ! MLN_CORE_ALIAS_DPOINT2D_H_HH Index: mln/core/alias/w_window1d_int.hh --- mln/core/alias/w_window1d_int.hh (revision 2172) +++ mln/core/alias/w_window1d_int.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW1D_INT_HH -# define MLN_CORE_W_WINDOW1D_INT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW1D_INT_HH +# define MLN_CORE_ALIAS_W_WINDOW1D_INT_HH -/*! \file mln/core/w_window1d_int.hh +/*! \file mln/core/alias/w_window1d_int.hh * * \brief Definition of the mln::w_window1d_int alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window1d.hh> -#endif // ! MLN_CORE_W_WINDOW1D_INT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW1D_INT_HH Index: mln/core/alias/window1d.hh --- mln/core/alias/window1d.hh (revision 2172) +++ mln/core/alias/window1d.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_WINDOW1D_HH -# define MLN_CORE_WINDOW1D_HH +#ifndef MLN_CORE_ALIAS_WINDOW1D_HH +# define MLN_CORE_ALIAS_WINDOW1D_HH -/// \file mln/core/window1d.hh +/// \file mln/core/alias/window1d.hh /// \brief Definition of the mln::window1d alias and of a construction /// routine. # include <mln/core/window.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln @@ -50,4 +50,4 @@ # include <mln/make/window1d.hh> -#endif // ! MLN_CORE_WINDOW1D_HH +#endif // ! MLN_CORE_ALIAS_WINDOW1D_HH Index: mln/core/alias/w_window2d_int.hh --- mln/core/alias/w_window2d_int.hh (revision 2172) +++ mln/core/alias/w_window2d_int.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW2D_INT_HH -# define MLN_CORE_W_WINDOW2D_INT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW2D_INT_HH +# define MLN_CORE_ALIAS_W_WINDOW2D_INT_HH -/*! \file mln/core/w_window2d_int.hh +/*! \file mln/core/alias/w_window2d_int.hh * * \brief Definition of the mln::w_window2d_int alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window2d.hh> -#endif // ! MLN_CORE_W_WINDOW2D_INT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW2D_INT_HH Index: mln/core/alias/window2d.hh --- mln/core/alias/window2d.hh (revision 2172) +++ mln/core/alias/window2d.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_WINDOW2D_HH -# define MLN_CORE_WINDOW2D_HH +#ifndef MLN_CORE_ALIAS_WINDOW2D_HH +# define MLN_CORE_ALIAS_WINDOW2D_HH -/// \file mln/core/window2d.hh +/// \file mln/core/alias/window2d.hh /// \brief Definition of the mln::window2d alias and of a construction /// routine. # include <mln/core/window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln @@ -82,4 +82,4 @@ # include <mln/make/window2d.hh> -#endif // ! MLN_CORE_WINDOW2D_HH +#endif // ! MLN_CORE_ALIAS_WINDOW2D_HH Index: mln/core/alias/window3d.hh --- mln/core/alias/window3d.hh (revision 2172) +++ mln/core/alias/window3d.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_WINDOW3D_HH -# define MLN_CORE_WINDOW3D_HH +#ifndef MLN_CORE_ALIAS_WINDOW3D_HH +# define MLN_CORE_ALIAS_WINDOW3D_HH -/// \file mln/core/window3d.hh +/// \file mln/core/alias/window3d.hh /// \brief Definition of the mln::window3d alias and of a construction /// routine. # include <mln/core/window.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln @@ -50,4 +50,4 @@ # include <mln/make/window3d.hh> -#endif // ! MLN_CORE_WINDOW3D_HH +#endif // ! MLN_CORE_ALIAS_WINDOW3D_HH Index: mln/core/alias/w_window3d_int.hh --- mln/core/alias/w_window3d_int.hh (revision 2172) +++ mln/core/alias/w_window3d_int.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW3D_INT_HH -# define MLN_CORE_W_WINDOW3D_INT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW3D_INT_HH +# define MLN_CORE_ALIAS_W_WINDOW3D_INT_HH -/*! \file mln/core/w_window3d_int.hh +/*! \file mln/core/alias/w_window3d_int.hh * * \brief Definition of the mln::w_window3d_int alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window3d.hh> -#endif // ! MLN_CORE_W_WINDOW3D_INT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW3D_INT_HH Index: mln/core/alias/w_window1d_float.hh --- mln/core/alias/w_window1d_float.hh (revision 2172) +++ mln/core/alias/w_window1d_float.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW1D_FLOAT_HH -# define MLN_CORE_W_WINDOW1D_FLOAT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW1D_FLOAT_HH +# define MLN_CORE_ALIAS_W_WINDOW1D_FLOAT_HH -/*! \file mln/core/w_window1d_float.hh +/*! \file mln/core/alias/w_window1d_float.hh * * \brief Definition of the mln::w_window1d_float alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window1d.hh> -#endif // ! MLN_CORE_W_WINDOW1D_FLOAT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW1D_FLOAT_HH Index: mln/core/alias/w_window2d_float.hh --- mln/core/alias/w_window2d_float.hh (revision 2172) +++ mln/core/alias/w_window2d_float.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW2D_FLOAT_HH -# define MLN_CORE_W_WINDOW2D_FLOAT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW2D_FLOAT_HH +# define MLN_CORE_ALIAS_W_WINDOW2D_FLOAT_HH -/*! \file mln/core/w_window2d_float.hh +/*! \file mln/core/alias/w_window2d_float.hh * * \brief Definition of the mln::w_window2d_float alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window2d.hh> -#endif // ! MLN_CORE_W_WINDOW2D_FLOAT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW2D_FLOAT_HH Index: mln/core/alias/p_run2d.hh --- mln/core/alias/p_run2d.hh (revision 2172) +++ mln/core/alias/p_run2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/site_set/p_run.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln Index: mln/core/alias/w_window3d_float.hh --- mln/core/alias/w_window3d_float.hh (revision 2172) +++ mln/core/alias/w_window3d_float.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_W_WINDOW3D_FLOAT_HH -# define MLN_CORE_W_WINDOW3D_FLOAT_HH +#ifndef MLN_CORE_ALIAS_W_WINDOW3D_FLOAT_HH +# define MLN_CORE_ALIAS_W_WINDOW3D_FLOAT_HH -/*! \file mln/core/w_window3d_float.hh +/*! \file mln/core/alias/w_window3d_float.hh * * \brief Definition of the mln::w_window3d_float alias. */ # include <mln/core/w_window.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln @@ -53,4 +53,4 @@ # include <mln/make/w_window3d.hh> -#endif // ! MLN_CORE_W_WINDOW3D_FLOAT_HH +#endif // ! MLN_CORE_ALIAS_W_WINDOW3D_FLOAT_HH Index: mln/core/alias/box1d.hh --- mln/core/alias/box1d.hh (revision 2172) +++ mln/core/alias/box1d.hh (working copy) @@ -28,14 +28,14 @@ #ifndef MLN_CORE_SITE_SET_BOX1D_HH # define MLN_CORE_SITE_SET_BOX1D_HH -/*! \file mln/core/box1d.hh +/*! \file mln/core/alias/box1d.hh * * \brief Definition of the mln::box1d alias and of construction * routines. */ # include <mln/core/site_set/box.hh> -# include <mln/core/point1d.hh> +# include <mln/core/alias/point1d.hh> namespace mln Index: mln/core/alias/point1d.hh --- mln/core/alias/point1d.hh (revision 2172) +++ mln/core/alias/point1d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_POINT1D_HH -# define MLN_CORE_POINT1D_HH +#ifndef MLN_CORE_ALIAS_POINT1D_HH +# define MLN_CORE_ALIAS_POINT1D_HH -/*! \file mln/core/point1d.hh +/*! \file mln/core/alias/point1d.hh * * \brief Definition of the mln::point1d alias and of its construction * routine. @@ -50,7 +50,7 @@ # include <mln/make/point1d.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> -#endif // ! MLN_CORE_POINT1D_HH +#endif // ! MLN_CORE_ALIAS_POINT1D_HH Index: mln/core/alias/box2d.hh --- mln/core/alias/box2d.hh (revision 2172) +++ mln/core/alias/box2d.hh (working copy) @@ -28,14 +28,14 @@ #ifndef MLN_CORE_SITE_SET_BOX2D_HH # define MLN_CORE_SITE_SET_BOX2D_HH -/*! \file mln/core/box2d.hh +/*! \file mln/core/alias/box2d.hh * * \brief Definition of the mln::box2d alias and of construction * routines. */ # include <mln/core/site_set/box.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln Index: mln/core/alias/box3d.hh --- mln/core/alias/box3d.hh (revision 2172) +++ mln/core/alias/box3d.hh (working copy) @@ -28,14 +28,14 @@ #ifndef MLN_CORE_SITE_SET_BOX3D_HH # define MLN_CORE_SITE_SET_BOX3D_HH -/*! \file mln/core/box3d.hh +/*! \file mln/core/alias/box3d.hh * * \brief Definition of the mln::box3d alias and of construction * routines. */ # include <mln/core/site_set/box.hh> -# include <mln/core/point3d.hh> +# include <mln/core/alias/point3d.hh> namespace mln Index: mln/core/alias/point2d.hh --- mln/core/alias/point2d.hh (revision 2172) +++ mln/core/alias/point2d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_POINT2D_HH -# define MLN_CORE_POINT2D_HH +#ifndef MLN_CORE_ALIAS_POINT2D_HH +# define MLN_CORE_ALIAS_POINT2D_HH -/*! \file mln/core/point2d.hh +/*! \file mln/core/alias/point2d.hh * * \brief Definition of the mln::point2d alias and of its construction * routine. @@ -181,7 +181,7 @@ # include <mln/make/point2d.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> -#endif // ! MLN_CORE_POINT2D_HH +#endif // ! MLN_CORE_ALIAS_POINT2D_HH Index: mln/core/alias/point3d.hh --- mln/core/alias/point3d.hh (revision 2172) +++ mln/core/alias/point3d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_POINT3D_HH -# define MLN_CORE_POINT3D_HH +#ifndef MLN_CORE_ALIAS_POINT3D_HH +# define MLN_CORE_ALIAS_POINT3D_HH -/*! \file mln/core/point3d.hh +/*! \file mln/core/alias/point3d.hh * * \brief Definition of the mln::point3d alias and of its construction * routine. @@ -50,7 +50,7 @@ # include <mln/make/point3d.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> -#endif // ! MLN_CORE_POINT3D_HH +#endif // ! MLN_CORE_ALIAS_POINT3D_HH Index: mln/draw/box.hh --- mln/draw/box.hh (revision 2172) +++ mln/draw/box.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/level/paste.hh> # include <mln/draw/line.hh> # include <mln/pw/image.hh> Index: mln/level/was.median.hh --- mln/level/was.median.hh (revision 2172) +++ mln/level/was.median.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/geom/shift.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/geom/min_col.hh> # include <mln/geom/max_col.hh> # include <mln/geom/max_row.hh> Index: mln/level/median.hh --- mln/level/median.hh (revision 2172) +++ mln/level/median.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/geom/shift.hh> # include <mln/set/diff.hh> Index: mln/level/naive/median.hh --- mln/level/naive/median.hh (revision 2172) +++ mln/level/naive/median.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/accu/median.hh> Index: mln/level/fast_median.hh --- mln/level/fast_median.hh (revision 2172) +++ mln/level/fast_median.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/accu/median.hh> # include <mln/geom/shift.hh> # include <mln/geom/min_col.hh> Index: mln/linear/gaussian.hh --- mln/linear/gaussian.hh (revision 2172) +++ mln/linear/gaussian.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/level/paste.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> Index: mln/make/dpoint1d.hh --- mln/make/dpoint1d.hh (revision 2172) +++ mln/make/dpoint1d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::dpoint1d. */ -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln Index: mln/make/dpoint2d.hh --- mln/make/dpoint2d.hh (revision 2172) +++ mln/make/dpoint2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::dpoint2d. */ -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln Index: mln/make/dpoint3d.hh --- mln/make/dpoint3d.hh (revision 2172) +++ mln/make/dpoint3d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::dpoint3d. */ -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> namespace mln Index: mln/make/dpoint2d_h.hh --- mln/make/dpoint2d_h.hh (revision 2172) +++ mln/make/dpoint2d_h.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::dpoint2d_h. */ -# include <mln/core/dpoint2d_h.hh> +# include <mln/core/alias/dpoint2d_h.hh> namespace mln Index: mln/make/box1d.hh --- mln/make/box1d.hh (revision 2172) +++ mln/make/box1d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routines to construct an mln::box1d. */ -# include <mln/core/box1d.hh> +# include <mln/core/alias/box1d.hh> # include <mln/make/point1d.hh> Index: mln/make/box2d.hh --- mln/make/box2d.hh (revision 2172) +++ mln/make/box2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routines to construct an mln::box2d. */ -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/make/point2d.hh> Index: mln/make/point1d.hh --- mln/make/point1d.hh (revision 2172) +++ mln/make/point1d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::point1d. */ -# include <mln/core/point1d.hh> +# include <mln/core/alias/point1d.hh> namespace mln Index: mln/make/point2d.hh --- mln/make/point2d.hh (revision 2172) +++ mln/make/point2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::point2d. */ -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln Index: mln/make/box3d.hh --- mln/make/box3d.hh (revision 2172) +++ mln/make/box3d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routines to construct an mln::box3d. */ -# include <mln/core/box3d.hh> +# include <mln/core/alias/box3d.hh> # include <mln/make/point3d.hh> Index: mln/make/point3d.hh --- mln/make/point3d.hh (revision 2172) +++ mln/make/point3d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::point3d. */ -# include <mln/core/point3d.hh> +# include <mln/core/alias/point3d.hh> namespace mln Index: mln/make/win_chamfer.hh --- mln/make/win_chamfer.hh (revision 2172) +++ mln/make/win_chamfer.hh (working copy) @@ -37,8 +37,8 @@ */ -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include <math.h> namespace mln Index: mln/make/w_window1d.hh --- mln/make/w_window1d.hh (revision 2172) +++ mln/make/w_window1d.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/w_window.hh> -# include <mln/core/dpoint1d.hh> +# include <mln/core/alias/dpoint1d.hh> namespace mln Index: mln/make/w_window2d.hh --- mln/make/w_window2d.hh (revision 2172) +++ mln/make/w_window2d.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/w_window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> namespace mln Index: mln/make/w_window3d.hh --- mln/make/w_window3d.hh (revision 2172) +++ mln/make/w_window3d.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/w_window.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> #include <iostream> Index: mln/make/box2d_h.hh --- mln/make/box2d_h.hh (revision 2172) +++ mln/make/box2d_h.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routines to construct an mln::box2d_h. */ -# include <mln/core/box2d_h.hh> +# include <mln/core/alias/box2d_h.hh> # include <mln/make/point2d_h.hh> Index: mln/make/point2d_h.hh --- mln/make/point2d_h.hh (revision 2172) +++ mln/make/point2d_h.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to construct an mln::point2d_h. */ -# include <mln/core/point2d_h.hh> +# include <mln/core/alias/point2d_h.hh> namespace mln Index: mln/make/window1d.hh --- mln/make/window1d.hh (revision 2172) +++ mln/make/window1d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <cmath> -# include <mln/core/window1d.hh> +# include <mln/core/alias/window1d.hh> # include <mln/make/dpoint1d.hh> Index: mln/make/w_window1d_int.hh --- mln/make/w_window1d_int.hh (revision 2172) +++ mln/make/w_window1d_int.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create a mln::w_window1d_int. */ -# include <mln/core/w_window1d_int.hh> +# include <mln/core/alias/w_window1d_int.hh> # include <mln/make/w_window1d.hh> Index: mln/make/w_window2d_int.hh --- mln/make/w_window2d_int.hh (revision 2172) +++ mln/make/w_window2d_int.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create a mln::w_window2d_int. */ -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/make/w_window2d.hh> Index: mln/make/window2d.hh --- mln/make/window2d.hh (revision 2172) +++ mln/make/window2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create an mln::window2d. */ -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/metal/math/sqrt.hh> Index: mln/make/window3d.hh --- mln/make/window3d.hh (revision 2172) +++ mln/make/window3d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <cmath> -# include <mln/core/window3d.hh> +# include <mln/core/alias/window3d.hh> # include <mln/make/dpoint3d.hh> Index: mln/make/w_window3d_int.hh --- mln/make/w_window3d_int.hh (revision 2172) +++ mln/make/w_window3d_int.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create a mln::w_window3d_int. */ -# include <mln/core/w_window3d_int.hh> +# include <mln/core/alias/w_window3d_int.hh> # include <mln/make/w_window3d.hh> Index: mln/geom/chamfer.hh --- mln/geom/chamfer.hh (revision 2172) +++ mln/geom/chamfer.hh (working copy) @@ -34,8 +34,8 @@ */ # include <mln/level/fill.hh> -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> Index: mln/fun/p2b/chess.hh --- mln/fun/p2b/chess.hh (revision 2172) +++ mln/fun/p2b/chess.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/function.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> namespace mln Index: mln/win/cube3d.hh --- mln/win/cube3d.hh (revision 2172) +++ mln/win/cube3d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/diag2d.hh --- mln/win/diag2d.hh (revision 2172) +++ mln/win/diag2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/backdiag2d.hh --- mln/win/backdiag2d.hh (revision 2172) +++ mln/win/backdiag2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/cuboid3d.hh --- mln/win/cuboid3d.hh (revision 2172) +++ mln/win/cuboid3d.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint3d.hh> +# include <mln/core/alias/dpoint3d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/octagon2d.hh --- mln/win/octagon2d.hh (revision 2172) +++ mln/win/octagon2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/win/disk2d.hh --- mln/win/disk2d.hh (revision 2172) +++ mln/win/disk2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/window.hh> # include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/core/dpoints_piter.hh> Index: mln/morpho/erosion_fast.hh --- mln/morpho/erosion_fast.hh (revision 2172) +++ mln/morpho/erosion_fast.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/geom/shift.hh> # include <mln/set/diff.hh> Index: mln/morpho/line_gradient.hh --- mln/morpho/line_gradient.hh (revision 2172) +++ mln/morpho/line_gradient.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/math/abs.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/core/image/line_graph_image.hh> // FIXME: Generalize to other (input) images as well (image1d, Index: mln/morpho/dilation_fast.hh --- mln/morpho/dilation_fast.hh (revision 2172) +++ mln/morpho/dilation_fast.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/window.hh> -# include <mln/core/dpoint2d.hh> +# include <mln/core/alias/dpoint2d.hh> # include <mln/geom/shift.hh> # include <mln/set/diff.hh> Index: mln/io/pfm/save.hh --- mln/io/pfm/save.hh (revision 2172) +++ mln/io/pfm/save.hh (working copy) @@ -40,7 +40,7 @@ # include <iostream> # include <fstream> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/geom/size2d.hh> # include <mln/metal/equal.hh> # include <mln/metal/bexpr.hh> Index: mln/io/pnm/save.hh --- mln/io/pnm/save.hh (revision 2172) +++ mln/io/pnm/save.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <mln/core/concept/image.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/value/rgb.hh> # include <mln/value/rgb8.hh> Index: sandbox/duhamel/main_mesh_image.cc --- sandbox/duhamel/main_mesh_image.cc (revision 2172) +++ sandbox/duhamel/main_mesh_image.cc (working copy) @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/debug/println.hh> #include <mln/util/graph.hh> #include <mln/core/mesh_p.hh> Index: sandbox/duhamel/graph_labeling.hh --- sandbox/duhamel/graph_labeling.hh (revision 2172) +++ sandbox/duhamel/graph_labeling.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image2d_b.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/debug/println.hh> Index: sandbox/duhamel/translate_image.hh --- sandbox/duhamel/translate_image.hh (revision 2172) +++ sandbox/duhamel/translate_image.hh (working copy) @@ -36,7 +36,7 @@ # include <cmath> # include <mln/core/internal/image_identity.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> namespace mln Index: sandbox/duhamel/labeling_level_generic_10000x1000.cc --- sandbox/duhamel/labeling_level_generic_10000x1000.cc (revision 2172) +++ sandbox/duhamel/labeling_level_generic_10000x1000.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image2d_b.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/pw/all.hh> Index: sandbox/duhamel/slow_seed2tiling.cc --- sandbox/duhamel/slow_seed2tiling.cc (revision 2172) +++ sandbox/duhamel/slow_seed2tiling.cc (working copy) @@ -33,7 +33,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/level/stretch.hh> @@ -52,7 +52,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/make/win_chamfer.hh> Index: sandbox/duhamel/labeling_algo.cc --- sandbox/duhamel/labeling_algo.cc (revision 2172) +++ sandbox/duhamel/labeling_algo.cc (working copy) @@ -32,7 +32,7 @@ # include <mln/core/image2d_b.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> # include <mln/level/stretch.hh> Index: sandbox/duhamel/main.cc --- sandbox/duhamel/main.cc (revision 2172) +++ sandbox/duhamel/main.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image2d_b.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/level/fill.hh> #include <mln/level/stretch.hh> @@ -11,7 +11,7 @@ #include <mln/core/mesh_image.hh> # include <mln/labeling/base.hh> # include <mln/debug/println.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/core/concept/dpoint.hh> # include <mln/core/concept/neighborhood.hh> Index: sandbox/duhamel/color_sub.cc --- sandbox/duhamel/color_sub.cc (revision 2172) +++ sandbox/duhamel/color_sub.cc (working copy) @@ -46,8 +46,8 @@ # include <mln/core/image/inplace.hh> # include <mln/debug/println.hh> -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image_if_interval.hh> # include <mln/make/win_chamfer.hh> Index: sandbox/duhamel/labeling_level_fast_10000x1000.cc --- sandbox/duhamel/labeling_level_fast_10000x1000.cc (revision 2172) +++ sandbox/duhamel/labeling_level_fast_10000x1000.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/image2d_b.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/pw/all.hh> Index: sandbox/duhamel/chamfer.cc --- sandbox/duhamel/chamfer.cc (revision 2172) +++ sandbox/duhamel/chamfer.cc (working copy) @@ -5,8 +5,8 @@ #include <mln/level/fill.hh> # include <mln/debug/println.hh> -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image_if_interval.hh> # include "win_chamfer.hh" Index: sandbox/duhamel/labeling_level_fast.cc --- sandbox/duhamel/labeling_level_fast.cc (revision 2172) +++ sandbox/duhamel/labeling_level_fast.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d_b.hh> #include <mln/core/image1d_b.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/pw/all.hh> Index: sandbox/duhamel/labeling_algo.hh --- sandbox/duhamel/labeling_algo.hh (revision 2172) +++ sandbox/duhamel/labeling_algo.hh (working copy) @@ -6,7 +6,7 @@ #include <mln/core/image2d_b.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/debug/println.hh> Index: sandbox/duhamel/mesh_image.hh --- sandbox/duhamel/mesh_image.hh (revision 2172) +++ sandbox/duhamel/mesh_image.hh (working copy) @@ -40,7 +40,7 @@ # include "mesh_p.hh" # include "mesh_psite.hh" # include <vector> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> namespace mln { Index: sandbox/duhamel/chamfer.hh --- sandbox/duhamel/chamfer.hh (revision 2172) +++ sandbox/duhamel/chamfer.hh (working copy) @@ -34,8 +34,8 @@ */ # include <mln/level/fill.hh> -# include <mln/core/w_window2d_int.hh> -# include <mln/core/w_window2d_float.hh> +# include <mln/core/alias/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_float.hh> # include "canvas_chamfer.hh" Index: sandbox/duhamel/draw_mesh.hh --- sandbox/duhamel/draw_mesh.hh (revision 2172) +++ sandbox/duhamel/draw_mesh.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/pw/image.hh> # include <mln/core/image2d_b.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/level/fill.hh> # include <mln/draw/line.hh> # include <mln/core/mesh_p.hh> Index: sandbox/duhamel/labeling_level.hh --- sandbox/duhamel/labeling_level.hh (revision 2172) +++ sandbox/duhamel/labeling_level.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/labeling/base.hh> # include <mln/debug/println.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/core/concept/dpoint.hh> # include <mln/core/concept/neighborhood.hh> Index: sandbox/pellegrin/set/test/p_queue_fast.cc --- sandbox/pellegrin/set/test/p_queue_fast.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_queue_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_queue_fast. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/pellegrin/set/test/p_priority_queue_fast.cc --- sandbox/pellegrin/set/test/p_priority_queue_fast.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_priority_queue_fast.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue_fast. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_priority_queue_fast.hh> int main () Index: sandbox/pellegrin/set/test/p_bgraph.cc --- sandbox/pellegrin/set/test/p_bgraph.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_bgraph.cc (working copy) @@ -29,7 +29,7 @@ /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). #include "../core/site_set/p_bgraph.hh" -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/util/internal/boost_graph.hh> #include <boost/typeof/std/utility.hpp> Index: sandbox/pellegrin/set/test/p_queue.cc --- sandbox/pellegrin/set/test/p_queue.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_queue.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_queue. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_queue.hh> Index: sandbox/pellegrin/set/test/p_priority_queue.cc --- sandbox/pellegrin/set/test/p_priority_queue.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_priority_queue.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_priority_queue.hh> int main () Index: sandbox/pellegrin/set/test/p_set.cc --- sandbox/pellegrin/set/test/p_set.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_set.cc (working copy) @@ -32,7 +32,7 @@ #include <iterator> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_set.hh> Index: sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc --- sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc (revision 2172) +++ sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc (working copy) @@ -30,7 +30,7 @@ * \brief Tests on mln::p_priority_queue_fast_with_array. */ -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/p_priority_queue_fast_with_array.hh> int main () Index: sandbox/pellegrin/set/core/line2d.hh --- sandbox/pellegrin/set/core/line2d.hh (revision 2172) +++ sandbox/pellegrin/set/core/line2d.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/p_array_piter.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/math/all.hh> # include <trait/point_set.hh> Index: sandbox/aroumougame/skeleton/mesh-skel_region.cc --- sandbox/aroumougame/skeleton/mesh-skel_region.cc (revision 2172) +++ sandbox/aroumougame/skeleton/mesh-skel_region.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: sandbox/aroumougame/skeleton/test.cc --- sandbox/aroumougame/skeleton/test.cc (revision 2172) +++ sandbox/aroumougame/skeleton/test.cc (working copy) @@ -1,5 +1,5 @@ -#include <mln/core/point3d.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point3d.hh> +#include <mln/core/alias/point2d.hh> #include "thinning.hh" #include <mln/level/paste.hh> #include <mln/level/fill.hh> Index: sandbox/aroumougame/skeleton/neighborhood1.hh --- sandbox/aroumougame/skeleton/neighborhood1.hh (revision 2172) +++ sandbox/aroumougame/skeleton/neighborhood1.hh (working copy) @@ -1,6 +1,6 @@ -#include <mln/core/neighb1d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/neighb3d.hh> +#include <mln/core/alias/neighb1d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/neighb3d.hh> using namespace mln; Index: sandbox/aroumougame/skeleton/mesh-skel.cc --- sandbox/aroumougame/skeleton/mesh-skel.cc (revision 2172) +++ sandbox/aroumougame/skeleton/mesh-skel.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: sandbox/aroumougame/skeleton/test_image3d.cc --- sandbox/aroumougame/skeleton/test_image3d.cc (revision 2172) +++ sandbox/aroumougame/skeleton/test_image3d.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/value/rgb8.hh> -#include <mln/core/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/make/point3d.hh> #include <mln/util/graph.hh> Index: sandbox/nivault/plugin-gimp/src/gimp-image.hh --- sandbox/nivault/plugin-gimp/src/gimp-image.hh (revision 2172) +++ sandbox/nivault/plugin-gimp/src/gimp-image.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/internal/image_primary.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/value/set.hh> # include <mln/value/rgb8.hh> # include <mln/core/line_piter.hh> Index: sandbox/nivault/plugin-gimp/src/build-image.hh --- sandbox/nivault/plugin-gimp/src/build-image.hh (revision 2172) +++ sandbox/nivault/plugin-gimp/src/build-image.hh (working copy) @@ -32,7 +32,7 @@ # include <libgimp/gimpui.h> # include <src/gimp-image.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/level/fill.hh> # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> Index: sandbox/nivault/extract_score.cc --- sandbox/nivault/extract_score.cc (revision 2172) +++ sandbox/nivault/extract_score.cc (working copy) @@ -49,7 +49,7 @@ # include <mln/win/disk2d.hh> # include <mln/level/fill.hh> # include <mln/labeling/blobs.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/accu/mean.hh> # include <mln/accu/bbox.hh> Index: sandbox/nivault/extract_character.cc --- sandbox/nivault/extract_character.cc (revision 2172) +++ sandbox/nivault/extract_character.cc (working copy) @@ -48,7 +48,7 @@ # include <mln/win/disk2d.hh> # include <mln/level/fill.hh> # include <mln/labeling/blobs.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/accu/mean.hh> # include <mln/accu/bbox.hh> Index: sandbox/nivault/median.hh --- sandbox/nivault/median.hh (revision 2172) +++ sandbox/nivault/median.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/image.hh> # include <mln/geom/size2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/win/hline2d.hh> # include <mln/win/vline2d.hh> # include <mln/core/image/t_image.hh> Index: sandbox/geraud/fllt/fllt.hh --- sandbox/geraud/fllt/fllt.hh (revision 2172) +++ sandbox/geraud/fllt/fllt.hh (working copy) @@ -29,7 +29,7 @@ #include <set> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.1.cc --- sandbox/geraud/fllt/fllt.svg.1.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.1.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/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 2172) +++ sandbox/geraud/fllt/fllt.svg.7.hh (working copy) @@ -32,7 +32,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.6.cc --- sandbox/geraud/fllt/fllt.svg.6.cc (revision 2172) +++ sandbox/geraud/fllt/fllt.svg.6.cc (working copy) @@ -28,7 +28,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt_test.hh --- sandbox/geraud/fllt/fllt_test.hh (revision 2172) +++ sandbox/geraud/fllt/fllt_test.hh (working copy) @@ -28,7 +28,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt.svg.7.hh --- sandbox/geraud/fllt.svg.7.hh (revision 2172) +++ sandbox/geraud/fllt.svg.7.hh (working copy) @@ -32,7 +32,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/dmap.cc --- sandbox/geraud/dmap.cc (revision 2172) +++ sandbox/geraud/dmap.cc (working copy) @@ -1,7 +1,7 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/debug/println.hh> #include <mln/level/fill.hh> #include <mln/level/stretch.hh> Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 2172) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -28,7 +28,7 @@ #include <iomanip> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/win_fun.cc --- sandbox/geraud/win_fun.cc (revision 2172) +++ sandbox/geraud/win_fun.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/win/rectangle2d.hh> # include <mln/win/fun.hh> Index: sandbox/geraud/irm.cc --- sandbox/geraud/irm.cc (revision 2172) +++ sandbox/geraud/irm.cc (working copy) @@ -5,8 +5,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> Index: sandbox/geraud/cs2d/tuto.cc --- sandbox/geraud/cs2d/tuto.cc (revision 2172) +++ sandbox/geraud/cs2d/tuto.cc (working copy) @@ -1,8 +1,8 @@ # include <mln/core/image/image2d.hh> # include <mln/core/image/image_if.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/debug/println.hh> Index: sandbox/geraud/cs2d/kruskal.cc --- sandbox/geraud/cs2d/kruskal.cc (revision 2172) +++ sandbox/geraud/cs2d/kruskal.cc (working copy) @@ -5,8 +5,8 @@ # include <mln/core/image/image_if.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/debug/println.hh> Index: sandbox/geraud/cs2d/dbl_neighb.cc --- sandbox/geraud/cs2d/dbl_neighb.cc (revision 2172) +++ sandbox/geraud/cs2d/dbl_neighb.cc (working copy) @@ -4,8 +4,8 @@ # include <mln/value/rgb8.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_p_set.hh> # include <mln/convert/to_image.hh> Index: sandbox/geraud/cs2d/cs2d.hh --- sandbox/geraud/cs2d/cs2d.hh (revision 2172) +++ sandbox/geraud/cs2d/cs2d.hh (working copy) @@ -1,6 +1,6 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/core/image/image_if.hh> Index: sandbox/geraud/cs2d/tuto_bis.cc --- sandbox/geraud/cs2d/tuto_bis.cc (revision 2172) +++ sandbox/geraud/cs2d/tuto_bis.cc (working copy) @@ -5,8 +5,8 @@ # include <mln/core/image/image_if.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/neighb2d.hh> -# include <mln/core/window2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> # include <mln/debug/println.hh> Index: sandbox/geraud/max_tree_nnodes.cc --- sandbox/geraud/max_tree_nnodes.cc (revision 2172) +++ sandbox/geraud/max_tree_nnodes.cc (working copy) @@ -7,7 +7,7 @@ # include <mln/level/sort_psites.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/io/pgm/load.hh> Index: sandbox/vigouroux/convert/value_to_point.hh --- sandbox/vigouroux/convert/value_to_point.hh (revision 2172) +++ sandbox/vigouroux/convert/value_to_point.hh (working copy) @@ -27,8 +27,8 @@ #ifndef OLENA_VALUE_TO_POINT # define OLENA_VALUE_TO_POINT -# include <oln/core/point1d.hh> -# include <oln/core/point3d.hh> +# include <oln/core/alias/point1d.hh> +# include <oln/core/alias/point3d.hh> # include <ntg/int.hh> # include <ntg/color/color.hh> # include <oln/convert/conversion.hh> Index: sandbox/vigouroux/yuv/get_blue.hh --- sandbox/vigouroux/yuv/get_blue.hh (revision 2172) +++ sandbox/vigouroux/yuv/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yuv/get_red.hh --- sandbox/vigouroux/yuv/get_red.hh (revision 2172) +++ sandbox/vigouroux/yuv/get_red.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yuv/rgb_to_yuv.hh --- sandbox/vigouroux/yuv/rgb_to_yuv.hh (revision 2172) +++ sandbox/vigouroux/yuv/rgb_to_yuv.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yuv/get_green.hh --- sandbox/vigouroux/yuv/get_green.hh (revision 2172) +++ sandbox/vigouroux/yuv/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/hsi/get_blue.hh --- sandbox/vigouroux/hsi/get_blue.hh (revision 2172) +++ sandbox/vigouroux/hsi/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/hsi/get_red.hh --- sandbox/vigouroux/hsi/get_red.hh (revision 2172) +++ sandbox/vigouroux/hsi/get_red.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/hsi/rgb_to_hsi.hh --- sandbox/vigouroux/hsi/rgb_to_hsi.hh (revision 2172) +++ sandbox/vigouroux/hsi/rgb_to_hsi.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/hsi/get_green.hh --- sandbox/vigouroux/hsi/get_green.hh (revision 2172) +++ sandbox/vigouroux/hsi/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/function.hh --- sandbox/vigouroux/function.hh (revision 2172) +++ sandbox/vigouroux/function.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/tests.cc --- sandbox/vigouroux/tests.cc (revision 2172) +++ sandbox/vigouroux/tests.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/cmy/rgb_to_cmy.hh --- sandbox/vigouroux/cmy/rgb_to_cmy.hh (revision 2172) +++ sandbox/vigouroux/cmy/rgb_to_cmy.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/cmy/get_blue.hh --- sandbox/vigouroux/cmy/get_blue.hh (revision 2172) +++ sandbox/vigouroux/cmy/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/cmy/fun.hh --- sandbox/vigouroux/cmy/fun.hh (revision 2172) +++ sandbox/vigouroux/cmy/fun.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/cmy/get_green.hh --- sandbox/vigouroux/cmy/get_green.hh (revision 2172) +++ sandbox/vigouroux/cmy/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/xyz/rgb_to_xyz.hh --- sandbox/vigouroux/xyz/rgb_to_xyz.hh (revision 2172) +++ sandbox/vigouroux/xyz/rgb_to_xyz.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/xyz/get_blue.hh --- sandbox/vigouroux/xyz/get_blue.hh (revision 2172) +++ sandbox/vigouroux/xyz/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/xyz/get_red.hh --- sandbox/vigouroux/xyz/get_red.hh (revision 2172) +++ sandbox/vigouroux/xyz/get_red.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/xyz/get_green.hh --- sandbox/vigouroux/xyz/get_green.hh (revision 2172) +++ sandbox/vigouroux/xyz/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yiq/get_blue.hh --- sandbox/vigouroux/yiq/get_blue.hh (revision 2172) +++ sandbox/vigouroux/yiq/get_blue.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yiq/get_red.hh --- sandbox/vigouroux/yiq/get_red.hh (revision 2172) +++ sandbox/vigouroux/yiq/get_red.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yiq/rgb_to_yiq.hh --- sandbox/vigouroux/yiq/rgb_to_yiq.hh (revision 2172) +++ sandbox/vigouroux/yiq/rgb_to_yiq.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/yiq/get_green.hh --- sandbox/vigouroux/yiq/get_green.hh (revision 2172) +++ sandbox/vigouroux/yiq/get_green.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/load.cc --- sandbox/vigouroux/load.cc (revision 2172) +++ sandbox/vigouroux/load.cc (working copy) @@ -11,7 +11,7 @@ #include <mln/math/round.hh> #include <mln/level/transform.hh> -#include <mln/core/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_float.hh> #include <mln/border/thickness.hh> #include <mln/linear/convolve.hh> Index: sandbox/vigouroux/conv/getred.hh --- sandbox/vigouroux/conv/getred.hh (revision 2172) +++ sandbox/vigouroux/conv/getred.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/conv/tored.hh --- sandbox/vigouroux/conv/tored.hh (revision 2172) +++ sandbox/vigouroux/conv/tored.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/conv/torgb.hh --- sandbox/vigouroux/conv/torgb.hh (revision 2172) +++ sandbox/vigouroux/conv/torgb.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/conv/rgbto.hh --- sandbox/vigouroux/conv/rgbto.hh (revision 2172) +++ sandbox/vigouroux/conv/rgbto.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_hsl.hh --- sandbox/vigouroux/color/rgb_to_hsl.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_hsl.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_cmy.hh --- sandbox/vigouroux/color/rgb_to_cmy.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_cmy.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_xyz.hh --- sandbox/vigouroux/color/rgb_to_xyz.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_xyz.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/tests.cc --- sandbox/vigouroux/color/tests.cc (revision 2172) +++ sandbox/vigouroux/color/tests.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_hsv.hh --- sandbox/vigouroux/color/rgb_to_hsv.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_hsv.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> # include <mln/io/ppm/save.hh> # include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_yiq.hh --- sandbox/vigouroux/color/rgb_to_yiq.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_yiq.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_hsi.hh --- sandbox/vigouroux/color/rgb_to_hsi.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_hsi.hh (working copy) @@ -3,7 +3,7 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/vigouroux/color/rgb_to_yuv.hh --- sandbox/vigouroux/color/rgb_to_yuv.hh (revision 2172) +++ sandbox/vigouroux/color/rgb_to_yuv.hh (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> -#include <mln/core/w_window2d_int.hh> +#include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> #include <mln/io/ppm/save.hh> #include <mln/display/save_and_show.hh> Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2172) +++ sandbox/garrigues/level_set.hh (working copy) @@ -40,11 +40,11 @@ # include "upper.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/core/site_set/p_set.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/core/pset_if_piter.hh> # include <mln/core/site_set/pset_if.hh> Index: sandbox/garrigues/fllt/test_fllt_lena_tiles.cc --- sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt_lena_tiles.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt10.cc --- sandbox/garrigues/fllt/test_fllt10.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt10.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/lower.hh --- sandbox/garrigues/fllt/lower.hh (revision 2172) +++ sandbox/garrigues/fllt/lower.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/labeling/regional_minima.hh> # include <mln/accu/min.hh> Index: sandbox/garrigues/fllt/test_fllt12.cc --- sandbox/garrigues/fllt/test_fllt12.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt12.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/upper.hh --- sandbox/garrigues/fllt/upper.hh (revision 2172) +++ sandbox/garrigues/fllt/upper.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/labeling/regional_maxima.hh> # include <mln/accu/max.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.1.cc --- sandbox/garrigues/fllt/fllt_simple.svg.1.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_simple.svg.1.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.3.cc --- sandbox/garrigues/fllt/fllt_simple.svg.3.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/test_fllt10_inv.cc --- sandbox/garrigues/fllt/test_fllt10_inv.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt10_inv.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/fllt_theo.cc --- sandbox/garrigues/fllt/fllt_theo.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_theo.cc (working copy) @@ -30,7 +30,7 @@ #include <sstream> #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/test_fllt3.cc --- sandbox/garrigues/fllt/test_fllt3.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt3.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt5.cc --- sandbox/garrigues/fllt/test_fllt5.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt5.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt7.cc --- sandbox/garrigues/fllt/test_fllt7.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt7.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt9.cc --- sandbox/garrigues/fllt/test_fllt9.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt9.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt3_inv.cc --- sandbox/garrigues/fllt/test_fllt3_inv.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt3_inv.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt_lena.cc --- sandbox/garrigues/fllt/test_fllt_lena.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt_lena.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt.cc --- sandbox/garrigues/fllt/test_fllt.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_flltb.cc --- sandbox/garrigues/fllt/test_flltb.cc (revision 2172) +++ sandbox/garrigues/fllt/test_flltb.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt7_inv.cc --- sandbox/garrigues/fllt/test_fllt7_inv.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt7_inv.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt13.cc --- sandbox/garrigues/fllt/test_fllt13.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt13.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt15.cc --- sandbox/garrigues/fllt/test_fllt15.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt15.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.2.cc --- sandbox/garrigues/fllt/fllt_simple.svg.2.cc (revision 2172) +++ sandbox/garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2172) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/site_set/p_set.hh> # include <mln/core/image/inplace.hh> -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/core/pset_if_piter.hh> # include <mln/core/site_set/pset_if.hh> # include <mln/core/image/sub_image.hh> Index: sandbox/garrigues/fllt/test.cc --- sandbox/garrigues/fllt/test.cc (revision 2172) +++ sandbox/garrigues/fllt/test.cc (working copy) @@ -9,7 +9,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/give_confs.cc --- sandbox/garrigues/fllt/give_confs.cc (revision 2172) +++ sandbox/garrigues/fllt/give_confs.cc (working copy) @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/core/clock_neighb2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/labeling/level.hh> #include <mln/level/fill.hh> Index: sandbox/garrigues/fllt/test_fllt2.cc --- sandbox/garrigues/fllt/test_fllt2.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt2.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt4.cc --- sandbox/garrigues/fllt/test_fllt4.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt4.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt6.cc --- sandbox/garrigues/fllt/test_fllt6.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt6.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/fllt/test_fllt8.cc --- sandbox/garrigues/fllt/test_fllt8.cc (revision 2172) +++ sandbox/garrigues/fllt/test_fllt8.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> # include <mln/convert/to_w_window.hh> -# include <mln/core/w_window2d_int.hh> +# include <mln/core/alias/w_window2d_int.hh> # include <mln/convert/to_image.hh> # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> Index: sandbox/garrigues/lower.hh --- sandbox/garrigues/lower.hh (revision 2172) +++ sandbox/garrigues/lower.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/accu/min.hh> # include <mln/labeling/regional_minima.hh> Index: sandbox/garrigues/tiled_image2d/tiled_image2d.hh --- sandbox/garrigues/tiled_image2d/tiled_image2d.hh (revision 2172) +++ sandbox/garrigues/tiled_image2d/tiled_image2d.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> -# include <mln/core/box2d.hh> +# include <mln/core/alias/box2d.hh> # include <mln/core/image/inplace.hh> # include <mln/core/init.hh> # include <mln/core/line_piter.hh> Index: sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh --- sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh (revision 2172) +++ sandbox/garrigues/tiled_image2d/layout/page2d/lrtb.hh (working copy) @@ -28,7 +28,7 @@ #ifndef layout_page2d_lrtb_hh #define layout_page2d_lrtb_hh -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> namespace mln { Index: sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh --- sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh (revision 2172) +++ sandbox/garrigues/tiled_image2d/layout/image2d/lrtb.hh (working copy) @@ -28,7 +28,7 @@ #ifndef layout_image2d_lrtb_hh #define layout_image2d_lrtb_hh -#include <mln/core/point2d.hh> +#include <mln/core/alias/point2d.hh> namespace mln { Index: sandbox/garrigues/upper.hh --- sandbox/garrigues/upper.hh (revision 2172) +++ sandbox/garrigues/upper.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/neighb2d.hh> +# include <mln/core/alias/neighb2d.hh> # include <mln/accu/max.hh> # include <mln/labeling/regional_maxima.hh> Index: sandbox/garrigues/factures/extract_array_highlight.cc --- sandbox/garrigues/factures/extract_array_highlight.cc (revision 2172) +++ sandbox/garrigues/factures/extract_array_highlight.cc (working copy) @@ -45,7 +45,7 @@ #include <mln/labeling/level.hh> #include <mln/literal/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/accu/all.hh> Index: sandbox/garrigues/factures/extract_array.cc --- sandbox/garrigues/factures/extract_array.cc (revision 2172) +++ sandbox/garrigues/factures/extract_array.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/labeling/level.hh> #include <mln/literal/all.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/accu/all.hh> Index: sandbox/folio/test/psn.cc --- sandbox/folio/test/psn.cc (revision 2172) +++ sandbox/folio/test/psn.cc (working copy) @@ -154,7 +154,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/test/psn_log.cc --- sandbox/folio/test/psn_log.cc (revision 2172) +++ sandbox/folio/test/psn_log.cc (working copy) @@ -241,7 +241,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/test/dt_maze.cc --- sandbox/folio/test/dt_maze.cc (revision 2172) +++ sandbox/folio/test/dt_maze.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> Index: sandbox/folio/test/dt_bench.cc --- sandbox/folio/test/dt_bench.cc (revision 2172) +++ sandbox/folio/test/dt_bench.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/test/dt.cc --- sandbox/folio/test/dt.cc (revision 2172) +++ sandbox/folio/test/dt.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/psn.cc --- sandbox/folio/psn.cc (revision 2172) +++ sandbox/folio/psn.cc (working copy) @@ -154,7 +154,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/psn_log.cc --- sandbox/folio/psn_log.cc (revision 2172) +++ sandbox/folio/psn_log.cc (working copy) @@ -241,7 +241,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/folio/dt.cc --- sandbox/folio/dt.cc (revision 2172) +++ sandbox/folio/dt.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/println.hh> #include <mln/make/win_chamfer.hh> #include <mln/level/fill.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> Index: sandbox/beguin/irm_g.cc --- sandbox/beguin/irm_g.cc (revision 2172) +++ sandbox/beguin/irm_g.cc (working copy) @@ -5,8 +5,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> Index: sandbox/beguin/fusion_graph.hh --- sandbox/beguin/fusion_graph.hh (revision 2172) +++ sandbox/beguin/fusion_graph.hh (working copy) @@ -9,8 +9,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> Index: sandbox/beguin/irm.cc --- sandbox/beguin/irm.cc (revision 2172) +++ sandbox/beguin/irm.cc (working copy) @@ -10,8 +10,8 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/neighb2d.hh> -#include <mln/core/window2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> #include <mln/core/image/image_if.hh> #include <mln/win/rectangle2d.hh> Index: sandbox/abraham/tests/morpho/test_component_tree.cc --- sandbox/abraham/tests/morpho/test_component_tree.cc (revision 2172) +++ sandbox/abraham/tests/morpho/test_component_tree.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> Index: sandbox/abraham/tests/morpho/test_watershed.cc --- sandbox/abraham/tests/morpho/test_watershed.cc (revision 2172) +++ sandbox/abraham/tests/morpho/test_watershed.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/compare.hh> Index: sandbox/abraham/tests/morpho/test_watershed_topo.cc --- sandbox/abraham/tests/morpho/test_watershed_topo.cc (revision 2172) +++ sandbox/abraham/tests/morpho/test_watershed_topo.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/window2d.hh> -#include <mln/core/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> Index: sandbox/abraham/mln/io/tikz/save.hh --- sandbox/abraham/mln/io/tikz/save.hh (revision 2172) +++ sandbox/abraham/mln/io/tikz/save.hh (working copy) @@ -41,7 +41,7 @@ # include <fstream> # include <mln/core/concept/image.hh> -# include <mln/core/point2d.hh> +# include <mln/core/alias/point2d.hh> # include <mln/value/graylevel.hh> # include <mln/value/rgb.hh>