[Olena-patches] 3901: Update image includes in sandbox.

* abraham/tests/core/image/fun_image_const.cc, * abraham/tests/core/image/fun_image_norm.cc, * abraham/tests/core/image/fun_image_v2v.cc, * abraham/tests/core/image/thru_const.cc, * abraham/tests/core/image/thru_norm.cc, * abraham/tests/core/image/thru_v2v.cc, * abraham/tests/core/image/thru_v2w2v.cc, * abraham/tests/core/image/violent_cast_image.cc, * abraham/tests/fun/meta/red.cc, * abraham/tests/morpho/levelings.cc, * abraham/tests/morpho/red_erosion.cc, * abraham/tests/morpho/red_erosion3.cc, * aroumougame/skeleton/sedt.hh, * aroumougame/skeleton/test.cc, * aroumougame/skeleton/test_image2d.cc, * beguin/fusion_graph.hh, * beguin/irm.cc, * beguin/irm_g.cc, * bugs/piter_slice.cc, * bugs/piter_slice.solved.cc, * delmon/minsurf/main.cc, * duhamel/chamfer.cc, * duhamel/color_sub.cc, * duhamel/graph_labeling.hh, * duhamel/labeling_algo.cc, * duhamel/labeling_algo.hh, * duhamel/main.cc, * duhamel/main_mesh_image.cc, * duhamel/slow_seed2tiling.cc, * edwin/tests/sharp.cc, * exec/histo_save.cc, * fabien/bin/dump2pbm.cc, * fabien/bin/dump_mask.cc, * fabien/igr/fixed_seg/main.cc, * fabien/igr/fun_labels.cc, * fabien/igr/graph.cc, * fabien/igr/label2gif.cc, * fabien/igr/mat2mln/raw2mlndata.cc, * fabien/igr/matlab.cc, * fabien/igr/mean_slices.cc, * fabien/igr/med.cc, * fabien/igr/nbasins_finder.cc, * fabien/igr/norm.cc, * fabien/igr/plot_label.hh, * fabien/igr/seg_fixed.cc, * fabien/igr/smooth_fixed_seg/main.cc, * fabien/igr/space_smooth/linear.cc, * fabien/igr/space_smooth/median.cc, * fabien/igr/space_smooth/morpho.cc, * fabien/igr/thres.cc, * fabien/igr/time_max.cc, * fabien/igr/time_max_norm.cc, * fabien/igr/time_smooth/linear.cc, * fabien/igr/time_smooth/median.cc, * fabien/igr/time_smooth/morpho.cc, * fabien/igr/watershed.hh, * fabien/igr/watershed2d.cc, * fabien/igr/watershed3d.cc, * folio/test/dt/dt.cc, * folio/test/dt/dt_bench.cc, * folio/test/dt/dt_maze.cc, * folio/test/dt/psn.cc, * folio/test/dt/psn_log.cc, * folio/test/histo/projected3d.cc, * fred/tests/thru.cc, * garrigues/fllt/essai.cc, * garrigues/fllt/fllt.hh, * garrigues/fllt/fllt_simple.cc, * garrigues/fllt/fllt_simple.svg.1.cc, * garrigues/fllt/fllt_simple.svg.2.cc, * garrigues/fllt/fllt_simple.svg.3.cc, * garrigues/fllt/fllt_theo.cc, * garrigues/fllt/test.cc, * garrigues/level_set.hh, * garrigues/tiled_image2d/tiled_image2d.cc, * garrigues/union_find/self_dual_reconstruction.hh, * icdar/2009/dibco/binarization.cc, * icdar/2009/dibco/quasi.cc, * icdar/2009/dibco/svg.1.binarization.cc, * icdar/2009/dibco/svg.2.binarization.cc, * icdar/2009/dibco/svg.3.binarization.cc, * icdar/2009/hsc/clean_lines.hh, * icdar/2009/hsc/clean_lines_with_grouped_bboxes.hh, * icdar/2009/hsc/first_attempts/exec/iz_lines.cc, * icdar/2009/hsc/first_attempts/exec/relabel_lines.cc, * icdar/2009/hsc/first_attempts/main.cc, * icdar/2009/hsc/get_line_images.hh, * icdar/2009/hsc/input_lines_to_lines.cc, * icdar/2009/hsc/input_to_lines.hh, * icdar/2009/hsc/input_to_ws.hh, * icdar/2009/hsc/lines_to_boxes.cc, * icdar/2009/hsc/old_input_to_lines.cc, * icdar/2009/hsc/ws_to_wsl.hh, * inim/2009/color/laplacien.cc, * inim/2009/color/min_tree_area_filter.cc, * inim/2009/color/min_tree_color.cc, * inim/2009/color/min_tree_color_v2.cc, * inim/2009/color/min_tree_height_filter.cc, * inim/2009/color/min_tree_volume_filter.cc, * inim/2009/color/reference.cc, * inim/2009/color/reference2.cc, * inim/2009/nature/histo_hsi.cc, * inim/2009/nature/mco.cc, * inim/2009/nature/nature.cc, * inim/2009/nature/proj.cc, * inim/2009/ocr/Makefile, * inim/2009/ocr/ocr_with_preprocess.cc, * inim/2009/ocr/ocr_without_preprocess.cc, * inim/2009/ocr/skeleton.hh, * inim/2009/ocr/skeleton.old.cc, * inim/2010/cag/superpose.hh, * inim/2010/rag/rag.hh, * inim/2011/fredwin/inim.cc, * jardonnet/n_cmpt/fused_filter.cc, * jardonnet/n_cmpt/n_cmpt5.hh, * jardonnet/test/big_chess.cc, * jardonnet/test/registration.cc, * jardonnet/virtual/access.cc, * laurent/ismm2009.hh, * laurent/memo/ismm2009.v0.cc, * lazzara/igr/igr-biggest-comp.cc, * lazzara/igr/igr-cloud.cc, * lazzara/igr/igr.cc, * lazzara/igr/irm/grad_clo_and_wshd.cc, * lazzara/igr/irm/hsl_grad_and_wst.cc, * lazzara/igr/irm_seg_with_mm_and_rag.mine.cc, * lazzara/igr/tr_image.cc, * nivault/extract_character.cc, * nivault/extract_score.cc, * nivault/median.hh, * nivault/rotation.cc, * theo/color/filter_blen_rgb_edges.cc, * theo/color/filter_meandist_rgb_pixels.cc, * theo/color/segment_gl_pixels.cc, * theo/color/segment_rgb_edges.cc, * theo/color/segment_rgb_pixels.cc, * theo/cs2d/cs2d.hh, * theo/cs2d/kruskal.cc, * theo/cs2d/tuto.cc, * theo/esiee/laurent/ismm09/cplx2d.hh, * theo/esiee/laurent/presentation/wst_edge.cc, * theo/exec/superpose.cc, * theo/experimental/projected_histo.cc, * theo/fllt.svg.6.cc, * theo/fllt.svg.7.hh, * theo/fllt/fllt.hh, * theo/fllt/fllt.svg.3.cc, * theo/fllt/fllt.svg.4.cc, * theo/fllt/fllt.svg.5.cc, * theo/fllt/fllt.svg.6.cc, * theo/fllt/fllt.svg.7.hh, * theo/fllt/fllt_test.hh, * theo/igr/dump_to_dist.cc, * theo/igr/irm_seg_with_mm_and_rag.cc, * theo/publis/icip2009/compute_a.cc, * vigouroux/color/rgb_to_cmy.hh, * vigouroux/color/rgb_to_hsi.hh, * vigouroux/color/rgb_to_xyz.hh, * vigouroux/color/rgb_to_yuv.hh, * vigouroux/tests.cc: update image includes. --- milena/sandbox/ChangeLog | 169 ++++++++++++++++++++ .../abraham/tests/core/image/fun_image_const.cc | 5 +- .../abraham/tests/core/image/fun_image_norm.cc | 5 +- .../abraham/tests/core/image/fun_image_v2v.cc | 5 +- .../sandbox/abraham/tests/core/image/thru_const.cc | 3 +- .../sandbox/abraham/tests/core/image/thru_norm.cc | 5 +- .../sandbox/abraham/tests/core/image/thru_v2v.cc | 3 +- .../sandbox/abraham/tests/core/image/thru_v2w2v.cc | 3 +- .../abraham/tests/core/image/violent_cast_image.cc | 5 +- milena/sandbox/abraham/tests/fun/meta/red.cc | 2 +- milena/sandbox/abraham/tests/morpho/levelings.cc | 4 +- milena/sandbox/abraham/tests/morpho/red_erosion.cc | 2 +- .../sandbox/abraham/tests/morpho/red_erosion3.cc | 4 +- milena/sandbox/aroumougame/skeleton/sedt.hh | 2 +- milena/sandbox/aroumougame/skeleton/test.cc | 2 +- .../sandbox/aroumougame/skeleton/test_image2d.cc | 2 +- milena/sandbox/beguin/fusion_graph.hh | 2 +- milena/sandbox/beguin/irm.cc | 2 +- milena/sandbox/beguin/irm_g.cc | 2 +- milena/sandbox/bugs/piter_slice.cc | 2 +- milena/sandbox/bugs/piter_slice.solved.cc | 2 +- milena/sandbox/delmon/minsurf/main.cc | 2 +- milena/sandbox/duhamel/chamfer.cc | 2 +- milena/sandbox/duhamel/color_sub.cc | 4 +- milena/sandbox/duhamel/graph_labeling.hh | 2 +- milena/sandbox/duhamel/labeling_algo.cc | 2 +- milena/sandbox/duhamel/labeling_algo.hh | 2 +- milena/sandbox/duhamel/main.cc | 2 +- milena/sandbox/duhamel/main_mesh_image.cc | 2 +- milena/sandbox/duhamel/slow_seed2tiling.cc | 4 +- milena/sandbox/edwin/tests/sharp.cc | 2 +- milena/sandbox/exec/histo_save.cc | 2 +- milena/sandbox/fabien/bin/dump2pbm.cc | 2 +- milena/sandbox/fabien/bin/dump_mask.cc | 2 +- milena/sandbox/fabien/igr/fixed_seg/main.cc | 4 +- milena/sandbox/fabien/igr/fun_labels.cc | 4 +- milena/sandbox/fabien/igr/graph.cc | 2 +- milena/sandbox/fabien/igr/label2gif.cc | 4 +- milena/sandbox/fabien/igr/mat2mln/raw2mlndata.cc | 2 +- milena/sandbox/fabien/igr/matlab.cc | 6 +- milena/sandbox/fabien/igr/mean_slices.cc | 4 +- milena/sandbox/fabien/igr/med.cc | 2 +- milena/sandbox/fabien/igr/nbasins_finder.cc | 2 +- milena/sandbox/fabien/igr/norm.cc | 2 +- milena/sandbox/fabien/igr/plot_label.hh | 4 +- milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc | 4 +- milena/sandbox/fabien/igr/space_smooth/linear.cc | 6 +- milena/sandbox/fabien/igr/space_smooth/median.cc | 6 +- milena/sandbox/fabien/igr/space_smooth/morpho.cc | 6 +- milena/sandbox/fabien/igr/thres.cc | 2 +- milena/sandbox/fabien/igr/time_max.cc | 6 +- milena/sandbox/fabien/igr/time_max_norm.cc | 6 +- milena/sandbox/fabien/igr/time_smooth/linear.cc | 6 +- milena/sandbox/fabien/igr/time_smooth/median.cc | 6 +- milena/sandbox/fabien/igr/time_smooth/morpho.cc | 6 +- milena/sandbox/fabien/igr/watershed.hh | 2 +- milena/sandbox/fabien/igr/watershed2d.cc | 2 +- milena/sandbox/fabien/igr/watershed3d.cc | 2 +- milena/sandbox/fabien/level.cc | 2 +- milena/sandbox/folio/mln/dt/dt_old/dt.cc | 4 +- milena/sandbox/folio/mln/dt/dt_old/psn.cc | 7 +- milena/sandbox/folio/mln/dt/dt_old/psn_log.cc | 8 +- milena/sandbox/folio/test/dt/dt.cc | 4 +- milena/sandbox/folio/test/dt/dt_bench.cc | 4 +- milena/sandbox/folio/test/dt/dt_maze.cc | 4 +- milena/sandbox/folio/test/dt/psn.cc | 7 +- milena/sandbox/folio/test/dt/psn_log.cc | 8 +- milena/sandbox/folio/test/histo/projected3d.cc | 4 +- milena/sandbox/fred/tests/thru.cc | 6 +- milena/sandbox/garrigues/fllt/essai.cc | 2 +- milena/sandbox/garrigues/fllt/fllt.hh | 4 +- milena/sandbox/garrigues/fllt/fllt_simple.cc | 4 +- milena/sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 4 +- milena/sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 4 +- milena/sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 4 +- milena/sandbox/garrigues/fllt/fllt_theo.cc | 2 +- milena/sandbox/garrigues/fllt/test.cc | 2 +- milena/sandbox/garrigues/level_set.hh | 4 +- .../garrigues/tiled_image2d/tiled_image2d.cc | 2 +- .../union_find/self_dual_reconstruction.hh | 2 +- milena/sandbox/icdar/2009/dibco/binarization.cc | 2 +- milena/sandbox/icdar/2009/dibco/quasi.cc | 2 +- .../sandbox/icdar/2009/dibco/svg.1.binarization.cc | 2 +- .../sandbox/icdar/2009/dibco/svg.2.binarization.cc | 2 +- .../sandbox/icdar/2009/dibco/svg.3.binarization.cc | 2 +- milena/sandbox/icdar/2009/hsc/clean_lines.hh | 2 +- .../2009/hsc/clean_lines_with_grouped_bboxes.hh | 2 +- .../icdar/2009/hsc/first_attempts/exec/iz_lines.cc | 2 +- .../2009/hsc/first_attempts/exec/relabel_lines.cc | 2 +- .../sandbox/icdar/2009/hsc/first_attempts/main.cc | 2 +- milena/sandbox/icdar/2009/hsc/get_line_images.hh | 4 +- .../sandbox/icdar/2009/hsc/input_lines_to_lines.cc | 2 +- milena/sandbox/icdar/2009/hsc/input_to_lines.hh | 2 +- milena/sandbox/icdar/2009/hsc/input_to_ws.hh | 2 +- milena/sandbox/icdar/2009/hsc/lines_to_boxes.cc | 2 +- .../sandbox/icdar/2009/hsc/old_input_to_lines.cc | 2 +- milena/sandbox/icdar/2009/hsc/ws_to_wsl.hh | 2 +- milena/sandbox/inim/2009/color/laplacien.cc | 2 +- .../inim/2009/color/min_tree_area_filter.cc | 4 +- milena/sandbox/inim/2009/color/min_tree_color.cc | 4 +- .../sandbox/inim/2009/color/min_tree_color_v2.cc | 4 +- .../inim/2009/color/min_tree_height_filter.cc | 4 +- .../inim/2009/color/min_tree_volume_filter.cc | 4 +- milena/sandbox/inim/2009/color/reference.cc | 4 +- milena/sandbox/inim/2009/color/reference2.cc | 4 +- milena/sandbox/inim/2009/nature/histo_hsi.cc | 2 +- milena/sandbox/inim/2009/nature/mco.cc | 2 +- milena/sandbox/inim/2009/nature/nature.cc | 2 +- milena/sandbox/inim/2009/nature/proj.cc | 2 +- milena/sandbox/inim/2009/ocr/Makefile | 2 +- .../sandbox/inim/2009/ocr/ocr_with_preprocess.cc | 5 +- .../inim/2009/ocr/ocr_without_preprocess.cc | 2 +- milena/sandbox/inim/2009/ocr/skeleton.hh | 6 +- milena/sandbox/inim/2009/ocr/skeleton.old.cc | 2 +- milena/sandbox/inim/2010/cag/superpose.hh | 2 +- milena/sandbox/inim/2010/rag/rag.hh | 2 +- milena/sandbox/inim/2011/fredwin/inim.cc | 2 +- milena/sandbox/jardonnet/n_cmpt/fused_filter.cc | 2 +- milena/sandbox/jardonnet/n_cmpt/n_cmpt5.hh | 2 +- milena/sandbox/jardonnet/test/big_chess.cc | 4 +- milena/sandbox/jardonnet/test/registration.cc | 2 +- milena/sandbox/jardonnet/virtual/access.cc | 4 +- milena/sandbox/laurent/ismm2009.hh | 2 +- milena/sandbox/laurent/memo/ismm2009.v0.cc | 2 +- milena/sandbox/lazzara/igr/igr-biggest-comp.cc | 6 +- milena/sandbox/lazzara/igr/igr-cloud.cc | 6 +- milena/sandbox/lazzara/igr/igr.cc | 6 +- .../sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc | 2 +- milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc | 2 +- .../lazzara/igr/irm_seg_with_mm_and_rag.mine.cc | 6 +- milena/sandbox/lazzara/igr/tr_image.cc | 4 +- milena/sandbox/nivault/extract_character.cc | 2 +- milena/sandbox/nivault/extract_score.cc | 2 +- milena/sandbox/nivault/median.hh | 2 +- milena/sandbox/nivault/rotation.cc | 2 +- milena/sandbox/theo/color/filter_blen_rgb_edges.cc | 2 +- .../theo/color/filter_meandist_rgb_pixels.cc | 2 +- milena/sandbox/theo/color/segment_gl_pixels.cc | 2 +- milena/sandbox/theo/color/segment_rgb_edges.cc | 2 +- milena/sandbox/theo/color/segment_rgb_pixels.cc | 2 +- milena/sandbox/theo/cs2d/cs2d.hh | 2 +- milena/sandbox/theo/cs2d/kruskal.cc | 4 +- milena/sandbox/theo/cs2d/tuto.cc | 2 +- milena/sandbox/theo/esiee/laurent/ismm09/cplx2d.hh | 2 +- .../theo/esiee/laurent/presentation/wst_edge.cc | 4 +- milena/sandbox/theo/exec/superpose.cc | 2 +- .../sandbox/theo/experimental/projected_histo.cc | 4 +- milena/sandbox/theo/fllt.svg.6.cc | 4 +- milena/sandbox/theo/fllt.svg.7.hh | 4 +- milena/sandbox/theo/fllt/fllt.hh | 4 +- milena/sandbox/theo/fllt/fllt.svg.3.cc | 2 +- milena/sandbox/theo/fllt/fllt.svg.4.cc | 2 +- milena/sandbox/theo/fllt/fllt.svg.5.cc | 2 +- milena/sandbox/theo/fllt/fllt.svg.6.cc | 4 +- milena/sandbox/theo/fllt/fllt.svg.7.hh | 4 +- milena/sandbox/theo/fllt/fllt_test.hh | 4 +- milena/sandbox/theo/igr/dump_to_dist.cc | 2 +- milena/sandbox/theo/igr/irm_seg_with_mm_and_rag.cc | 2 +- milena/sandbox/theo/publis/icip2009/compute_a.cc | 2 +- milena/sandbox/vigouroux/color/rgb_to_cmy.hh | 2 +- milena/sandbox/vigouroux/color/rgb_to_hsi.hh | 2 +- milena/sandbox/vigouroux/color/rgb_to_xyz.hh | 2 +- milena/sandbox/vigouroux/color/rgb_to_yuv.hh | 2 +- milena/sandbox/vigouroux/tests.cc | 2 +- 164 files changed, 431 insertions(+), 249 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 40309a4..6123dcf 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,172 @@ +2009-05-28 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + + Update image includes in sandbox. + + * abraham/tests/core/image/fun_image_const.cc, + * abraham/tests/core/image/fun_image_norm.cc, + * abraham/tests/core/image/fun_image_v2v.cc, + * abraham/tests/core/image/thru_const.cc, + * abraham/tests/core/image/thru_norm.cc, + * abraham/tests/core/image/thru_v2v.cc, + * abraham/tests/core/image/thru_v2w2v.cc, + * abraham/tests/core/image/violent_cast_image.cc, + * abraham/tests/fun/meta/red.cc, + * abraham/tests/morpho/levelings.cc, + * abraham/tests/morpho/red_erosion.cc, + * abraham/tests/morpho/red_erosion3.cc, + * aroumougame/skeleton/sedt.hh, + * aroumougame/skeleton/test.cc, + * aroumougame/skeleton/test_image2d.cc, + * beguin/fusion_graph.hh, + * beguin/irm.cc, + * beguin/irm_g.cc, + * bugs/piter_slice.cc, + * bugs/piter_slice.solved.cc, + * delmon/minsurf/main.cc, + * duhamel/chamfer.cc, + * duhamel/color_sub.cc, + * duhamel/graph_labeling.hh, + * duhamel/labeling_algo.cc, + * duhamel/labeling_algo.hh, + * duhamel/main.cc, + * duhamel/main_mesh_image.cc, + * duhamel/slow_seed2tiling.cc, + * edwin/tests/sharp.cc, + * exec/histo_save.cc, + * fabien/bin/dump2pbm.cc, + * fabien/bin/dump_mask.cc, + * fabien/igr/fixed_seg/main.cc, + * fabien/igr/fun_labels.cc, + * fabien/igr/graph.cc, + * fabien/igr/label2gif.cc, + * fabien/igr/mat2mln/raw2mlndata.cc, + * fabien/igr/matlab.cc, + * fabien/igr/mean_slices.cc, + * fabien/igr/med.cc, + * fabien/igr/nbasins_finder.cc, + * fabien/igr/norm.cc, + * fabien/igr/plot_label.hh, + * fabien/igr/seg_fixed.cc, + * fabien/igr/smooth_fixed_seg/main.cc, + * fabien/igr/space_smooth/linear.cc, + * fabien/igr/space_smooth/median.cc, + * fabien/igr/space_smooth/morpho.cc, + * fabien/igr/thres.cc, + * fabien/igr/time_max.cc, + * fabien/igr/time_max_norm.cc, + * fabien/igr/time_smooth/linear.cc, + * fabien/igr/time_smooth/median.cc, + * fabien/igr/time_smooth/morpho.cc, + * fabien/igr/watershed.hh, + * fabien/igr/watershed2d.cc, + * fabien/igr/watershed3d.cc, + * fabien/level.cc, + * folio/mln/dt/dt_old/dt.cc, + * folio/mln/dt/dt_old/psn.cc, + * folio/mln/dt/dt_old/psn_log.cc, + * folio/test/dt/dt.cc, + * folio/test/dt/dt_bench.cc, + * folio/test/dt/dt_maze.cc, + * folio/test/dt/psn.cc, + * folio/test/dt/psn_log.cc, + * folio/test/histo/projected3d.cc, + * fred/tests/thru.cc, + * garrigues/fllt/essai.cc, + * garrigues/fllt/fllt.hh, + * garrigues/fllt/fllt_simple.cc, + * garrigues/fllt/fllt_simple.svg.1.cc, + * garrigues/fllt/fllt_simple.svg.2.cc, + * garrigues/fllt/fllt_simple.svg.3.cc, + * garrigues/fllt/fllt_theo.cc, + * garrigues/fllt/test.cc, + * garrigues/level_set.hh, + * garrigues/tiled_image2d/tiled_image2d.cc, + * garrigues/union_find/self_dual_reconstruction.hh, + * icdar/2009/dibco/binarization.cc, + * icdar/2009/dibco/quasi.cc, + * icdar/2009/dibco/svg.1.binarization.cc, + * icdar/2009/dibco/svg.2.binarization.cc, + * icdar/2009/dibco/svg.3.binarization.cc, + * icdar/2009/hsc/clean_lines.hh, + * icdar/2009/hsc/clean_lines_with_grouped_bboxes.hh, + * icdar/2009/hsc/first_attempts/exec/iz_lines.cc, + * icdar/2009/hsc/first_attempts/exec/relabel_lines.cc, + * icdar/2009/hsc/first_attempts/main.cc, + * icdar/2009/hsc/get_line_images.hh, + * icdar/2009/hsc/input_lines_to_lines.cc, + * icdar/2009/hsc/input_to_lines.hh, + * icdar/2009/hsc/input_to_ws.hh, + * icdar/2009/hsc/lines_to_boxes.cc, + * icdar/2009/hsc/old_input_to_lines.cc, + * icdar/2009/hsc/ws_to_wsl.hh, + * inim/2009/color/laplacien.cc, + * inim/2009/color/min_tree_area_filter.cc, + * inim/2009/color/min_tree_color.cc, + * inim/2009/color/min_tree_color_v2.cc, + * inim/2009/color/min_tree_height_filter.cc, + * inim/2009/color/min_tree_volume_filter.cc, + * inim/2009/color/reference.cc, + * inim/2009/color/reference2.cc, + * inim/2009/nature/histo_hsi.cc, + * inim/2009/nature/mco.cc, + * inim/2009/nature/nature.cc, + * inim/2009/nature/proj.cc, + * inim/2009/ocr/Makefile, + * inim/2009/ocr/ocr_with_preprocess.cc, + * inim/2009/ocr/ocr_without_preprocess.cc, + * inim/2009/ocr/skeleton.hh, + * inim/2009/ocr/skeleton.old.cc, + * inim/2010/cag/superpose.hh, + * inim/2010/rag/rag.hh, + * inim/2011/fredwin/inim.cc, + * jardonnet/n_cmpt/fused_filter.cc, + * jardonnet/n_cmpt/n_cmpt5.hh, + * jardonnet/test/big_chess.cc, + * jardonnet/test/registration.cc, + * jardonnet/virtual/access.cc, + * laurent/ismm2009.hh, + * laurent/memo/ismm2009.v0.cc, + * lazzara/igr/igr-biggest-comp.cc, + * lazzara/igr/igr-cloud.cc, + * lazzara/igr/igr.cc, + * lazzara/igr/irm/grad_clo_and_wshd.cc, + * lazzara/igr/irm/hsl_grad_and_wst.cc, + * lazzara/igr/irm_seg_with_mm_and_rag.mine.cc, + * lazzara/igr/tr_image.cc, + * nivault/extract_character.cc, + * nivault/extract_score.cc, + * nivault/median.hh, + * nivault/rotation.cc, + * theo/color/filter_blen_rgb_edges.cc, + * theo/color/filter_meandist_rgb_pixels.cc, + * theo/color/segment_gl_pixels.cc, + * theo/color/segment_rgb_edges.cc, + * theo/color/segment_rgb_pixels.cc, + * theo/cs2d/cs2d.hh, + * theo/cs2d/kruskal.cc, + * theo/cs2d/tuto.cc, + * theo/esiee/laurent/ismm09/cplx2d.hh, + * theo/esiee/laurent/presentation/wst_edge.cc, + * theo/exec/superpose.cc, + * theo/experimental/projected_histo.cc, + * theo/fllt.svg.6.cc, + * theo/fllt.svg.7.hh, + * theo/fllt/fllt.hh, + * theo/fllt/fllt.svg.3.cc, + * theo/fllt/fllt.svg.4.cc, + * theo/fllt/fllt.svg.5.cc, + * theo/fllt/fllt.svg.6.cc, + * theo/fllt/fllt.svg.7.hh, + * theo/fllt/fllt_test.hh, + * theo/igr/dump_to_dist.cc, + * theo/igr/irm_seg_with_mm_and_rag.cc, + * theo/publis/icip2009/compute_a.cc, + * vigouroux/color/rgb_to_cmy.hh, + * vigouroux/color/rgb_to_hsi.hh, + * vigouroux/color/rgb_to_xyz.hh, + * vigouroux/color/rgb_to_yuv.hh, + * vigouroux/tests.cc: update image includes. + 2009-05-27 Fabien Freling &lt;fabien.freling(a)lrde.epita.fr&gt; Create tools for processing chain on edge images. diff --git a/milena/sandbox/abraham/tests/core/image/fun_image_const.cc b/milena/sandbox/abraham/tests/core/image/fun_image_const.cc index d0bf643..307b778 100644 --- a/milena/sandbox/abraham/tests/core/image/fun_image_const.cc +++ b/milena/sandbox/abraham/tests/core/image/fun_image_const.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -26,7 +27,7 @@ // Public License. # include <mln/core/image/image2d.hh> -# include <mln/core/image/fun_image.hh> +# include <mln/core/image/dmorph/fun_image.hh> # include <mln/fun/v2w2v/cos.hh> int main () diff --git a/milena/sandbox/abraham/tests/core/image/fun_image_norm.cc b/milena/sandbox/abraham/tests/core/image/fun_image_norm.cc index 1da57a6..4058f9d 100644 --- a/milena/sandbox/abraham/tests/core/image/fun_image_norm.cc +++ b/milena/sandbox/abraham/tests/core/image/fun_image_norm.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -30,7 +31,7 @@ # include <mln/fun/v2w_w2v/norm.hh> # include <mln/algebra/vec.hh> # include <mln/data/fill.hh> -# include <mln/core/image/violent_cast_image.hh> +# include <mln/core/image/vmorph/violent_cast_image.hh> #include <mln/morpho/erosion.hh> diff --git a/milena/sandbox/abraham/tests/core/image/fun_image_v2v.cc b/milena/sandbox/abraham/tests/core/image/fun_image_v2v.cc index 948a25b..2ff772c 100644 --- a/milena/sandbox/abraham/tests/core/image/fun_image_v2v.cc +++ b/milena/sandbox/abraham/tests/core/image/fun_image_v2v.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -26,7 +27,7 @@ // Public License. # include <mln/core/image/image2d.hh> -# include <mln/core/image/fun_image.hh> +# include <mln/core/image/dmorph/fun_image.hh> # include <mln/fun/v2v/abs.hh> int main () diff --git a/milena/sandbox/abraham/tests/core/image/thru_const.cc b/milena/sandbox/abraham/tests/core/image/thru_const.cc index 7079e3c..0670246 100644 --- a/milena/sandbox/abraham/tests/core/image/thru_const.cc +++ b/milena/sandbox/abraham/tests/core/image/thru_const.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms diff --git a/milena/sandbox/abraham/tests/core/image/thru_norm.cc b/milena/sandbox/abraham/tests/core/image/thru_norm.cc index c23ea22..8d372d4 100644 --- a/milena/sandbox/abraham/tests/core/image/thru_norm.cc +++ b/milena/sandbox/abraham/tests/core/image/thru_norm.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -30,7 +31,7 @@ # include <mln/fun/v2w_w2v/norm.hh> # include <mln/algebra/vec.hh> # include <mln/data/fill.hh> -# include <mln/core/image/violent_cast_image.hh> +# include <mln/core/image/vmorph/violent_cast_image.hh> int main () diff --git a/milena/sandbox/abraham/tests/core/image/thru_v2v.cc b/milena/sandbox/abraham/tests/core/image/thru_v2v.cc index ec0a88e..7343606 100644 --- a/milena/sandbox/abraham/tests/core/image/thru_v2v.cc +++ b/milena/sandbox/abraham/tests/core/image/thru_v2v.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms diff --git a/milena/sandbox/abraham/tests/core/image/thru_v2w2v.cc b/milena/sandbox/abraham/tests/core/image/thru_v2w2v.cc index 854eb16..2e88c07 100644 --- a/milena/sandbox/abraham/tests/core/image/thru_v2w2v.cc +++ b/milena/sandbox/abraham/tests/core/image/thru_v2w2v.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms diff --git a/milena/sandbox/abraham/tests/core/image/violent_cast_image.cc b/milena/sandbox/abraham/tests/core/image/violent_cast_image.cc index 2d510ed..3c0ff93 100644 --- a/milena/sandbox/abraham/tests/core/image/violent_cast_image.cc +++ b/milena/sandbox/abraham/tests/core/image/violent_cast_image.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -26,7 +27,7 @@ // Public License. # include <mln/core/image/image2d.hh> -# include <mln/core/image/violent_cast_image.hh> +# include <mln/core/image/vmorph/violent_cast_image.hh> int main () { diff --git a/milena/sandbox/abraham/tests/fun/meta/red.cc b/milena/sandbox/abraham/tests/fun/meta/red.cc index 963d983..6b8559d 100644 --- a/milena/sandbox/abraham/tests/fun/meta/red.cc +++ b/milena/sandbox/abraham/tests/fun/meta/red.cc @@ -1,6 +1,6 @@ #include <mln/fun/meta/red.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/fun_image.hh> +#include <mln/core/image/dmorph/fun_image.hh> namespace mln { diff --git a/milena/sandbox/abraham/tests/morpho/levelings.cc b/milena/sandbox/abraham/tests/morpho/levelings.cc index 211cd63..798c11f 100644 --- a/milena/sandbox/abraham/tests/morpho/levelings.cc +++ b/milena/sandbox/abraham/tests/morpho/levelings.cc @@ -8,8 +8,8 @@ #include <mln/fun/meta/red.hh> #include <mln/value/rgb8.hh> #include <mln/value/mixin.hh> -#include <mln/core/image/fun_image.hh> -#include <mln/core/image/violent_cast_image.hh> +#include <mln/core/image/dmorph/fun_image.hh> +#include <mln/core/image/vmorph/violent_cast_image.hh> int main (int argc, const char * argv[]) { diff --git a/milena/sandbox/abraham/tests/morpho/red_erosion.cc b/milena/sandbox/abraham/tests/morpho/red_erosion.cc index 13ca3fc..768e0ab 100644 --- a/milena/sandbox/abraham/tests/morpho/red_erosion.cc +++ b/milena/sandbox/abraham/tests/morpho/red_erosion.cc @@ -5,7 +5,7 @@ #include <mln/morpho/erosion.hh> #include <mln/fun/meta/red.hh> #include <mln/value/rgb8.hh> -#include <mln/core/image/fun_image.hh> +#include <mln/core/image/dmorph/fun_image.hh> int main (int argc, const char * argv[]) { diff --git a/milena/sandbox/abraham/tests/morpho/red_erosion3.cc b/milena/sandbox/abraham/tests/morpho/red_erosion3.cc index 252ccd6..ccfb58f 100644 --- a/milena/sandbox/abraham/tests/morpho/red_erosion3.cc +++ b/milena/sandbox/abraham/tests/morpho/red_erosion3.cc @@ -6,8 +6,8 @@ #include <mln/fun/meta/red.hh> #include <mln/value/rgb8.hh> #include <mln/value/mixin.hh> -#include <mln/core/image/fun_image.hh> -#include <mln/core/image/violent_cast_image.hh> +#include <mln/core/image/dmorph/fun_image.hh> +#include <mln/core/image/vmorph/violent_cast_image.hh> namespace mln { diff --git a/milena/sandbox/aroumougame/skeleton/sedt.hh b/milena/sandbox/aroumougame/skeleton/sedt.hh index 9a224ab..4368790 100644 --- a/milena/sandbox/aroumougame/skeleton/sedt.hh +++ b/milena/sandbox/aroumougame/skeleton/sedt.hh @@ -5,7 +5,7 @@ #include <mln/math/min.hh> #include <mln/math/sqr.hh> # include <mln/value/int_u.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> diff --git a/milena/sandbox/aroumougame/skeleton/test.cc b/milena/sandbox/aroumougame/skeleton/test.cc index bd58317..90a39db 100644 --- a/milena/sandbox/aroumougame/skeleton/test.cc +++ b/milena/sandbox/aroumougame/skeleton/test.cc @@ -3,7 +3,7 @@ #include "thinning.hh" #include <mln/data/paste.hh> #include <mln/data/fill.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> diff --git a/milena/sandbox/aroumougame/skeleton/test_image2d.cc b/milena/sandbox/aroumougame/skeleton/test_image2d.cc index b83bed8..8d19fb0 100755 --- a/milena/sandbox/aroumougame/skeleton/test_image2d.cc +++ b/milena/sandbox/aroumougame/skeleton/test_image2d.cc @@ -1,6 +1,6 @@ #include "thinning.hh" #include <mln/core/image/image2d.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> #include <mln/data/paste.hh> diff --git a/milena/sandbox/beguin/fusion_graph.hh b/milena/sandbox/beguin/fusion_graph.hh index f0b3b3f..39fcff2 100644 --- a/milena/sandbox/beguin/fusion_graph.hh +++ b/milena/sandbox/beguin/fusion_graph.hh @@ -11,7 +11,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/win/rectangle2d.hh> //#include "map.hh" diff --git a/milena/sandbox/beguin/irm.cc b/milena/sandbox/beguin/irm.cc index 7ba074d..7dfb874 100644 --- a/milena/sandbox/beguin/irm.cc +++ b/milena/sandbox/beguin/irm.cc @@ -12,7 +12,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> diff --git a/milena/sandbox/beguin/irm_g.cc b/milena/sandbox/beguin/irm_g.cc index 844d7fc..e7015fb 100644 --- a/milena/sandbox/beguin/irm_g.cc +++ b/milena/sandbox/beguin/irm_g.cc @@ -7,7 +7,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> diff --git a/milena/sandbox/bugs/piter_slice.cc b/milena/sandbox/bugs/piter_slice.cc index c5b42d7..9d39432 100644 --- a/milena/sandbox/bugs/piter_slice.cc +++ b/milena/sandbox/bugs/piter_slice.cc @@ -5,7 +5,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/bugs/piter_slice.solved.cc b/milena/sandbox/bugs/piter_slice.solved.cc index 6f91eb0..a8043d5 100644 --- a/milena/sandbox/bugs/piter_slice.solved.cc +++ b/milena/sandbox/bugs/piter_slice.solved.cc @@ -5,7 +5,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/delmon/minsurf/main.cc b/milena/sandbox/delmon/minsurf/main.cc index 205dfbe..5d8944a 100644 --- a/milena/sandbox/delmon/minsurf/main.cc +++ b/milena/sandbox/delmon/minsurf/main.cc @@ -8,7 +8,7 @@ #include <mln/core/var.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/routine/extend.hh> #include <mln/io/pgm/all.hh> diff --git a/milena/sandbox/duhamel/chamfer.cc b/milena/sandbox/duhamel/chamfer.cc index 5a0084b..cb2ce2a 100644 --- a/milena/sandbox/duhamel/chamfer.cc +++ b/milena/sandbox/duhamel/chamfer.cc @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/image_if_value.hh> diff --git a/milena/sandbox/duhamel/color_sub.cc b/milena/sandbox/duhamel/color_sub.cc index 99ea0e4..ed799cf 100644 --- a/milena/sandbox/duhamel/color_sub.cc +++ b/milena/sandbox/duhamel/color_sub.cc @@ -31,7 +31,7 @@ */ # include <mln/core/image2d_b.hh> -# include <mln/core/image/sub_image.hh> +# include <mln/core/image/dmorph/sub_image.hh> # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> @@ -41,7 +41,7 @@ # include <mln/debug/println.hh> # include <mln/io/ppm/save.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image/sub_image.hh> +# include <mln/core/image/dmorph/sub_image.hh> # include <mln/core/image_if_value.hh> diff --git a/milena/sandbox/duhamel/graph_labeling.hh b/milena/sandbox/duhamel/graph_labeling.hh index 2b4475f..4e28b97 100644 --- a/milena/sandbox/duhamel/graph_labeling.hh +++ b/milena/sandbox/duhamel/graph_labeling.hh @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> diff --git a/milena/sandbox/duhamel/labeling_algo.cc b/milena/sandbox/duhamel/labeling_algo.cc index 384a8d9..3534ab9 100644 --- a/milena/sandbox/duhamel/labeling_algo.cc +++ b/milena/sandbox/duhamel/labeling_algo.cc @@ -31,7 +31,7 @@ */ # include <mln/core/image2d_b.hh> -# include <mln/core/image/sub_image.hh> +# include <mln/core/image/dmorph/sub_image.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/data/fill.hh> diff --git a/milena/sandbox/duhamel/labeling_algo.hh b/milena/sandbox/duhamel/labeling_algo.hh index ec94321..333d9b3 100644 --- a/milena/sandbox/duhamel/labeling_algo.hh +++ b/milena/sandbox/duhamel/labeling_algo.hh @@ -5,7 +5,7 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> diff --git a/milena/sandbox/duhamel/main.cc b/milena/sandbox/duhamel/main.cc index c80c795..c9328eb 100644 --- a/milena/sandbox/duhamel/main.cc +++ b/milena/sandbox/duhamel/main.cc @@ -1,5 +1,5 @@ #include <mln/core/image2d_b.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> #include <mln/data/fill.hh> diff --git a/milena/sandbox/duhamel/main_mesh_image.cc b/milena/sandbox/duhamel/main_mesh_image.cc index 53e4094..4feb181 100644 --- a/milena/sandbox/duhamel/main_mesh_image.cc +++ b/milena/sandbox/duhamel/main_mesh_image.cc @@ -6,7 +6,7 @@ #include <mln/core/mesh_psite.hh> #include <mln/draw/mesh.hh> #include <mln/core/mesh_image.hh> -#include <mln/core/image/interpolated.hh> +#include <mln/core/image/imorph/interpolated.hh> using namespace mln; diff --git a/milena/sandbox/duhamel/slow_seed2tiling.cc b/milena/sandbox/duhamel/slow_seed2tiling.cc index aab58f2..077cb3e 100644 --- a/milena/sandbox/duhamel/slow_seed2tiling.cc +++ b/milena/sandbox/duhamel/slow_seed2tiling.cc @@ -32,7 +32,7 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/image/sub_image.hh> +# include <mln/core/image/dmorph/sub_image.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/value/int_u8.hh> # include <mln/data/fill.hh> @@ -48,7 +48,7 @@ # include <mln/make/voronoi.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/image_if_value.hh> diff --git a/milena/sandbox/edwin/tests/sharp.cc b/milena/sandbox/edwin/tests/sharp.cc index 9ff72c3..21d8978 100644 --- a/milena/sandbox/edwin/tests/sharp.cc +++ b/milena/sandbox/edwin/tests/sharp.cc @@ -1,6 +1,6 @@ /* mln core */ #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/var.hh> diff --git a/milena/sandbox/exec/histo_save.cc b/milena/sandbox/exec/histo_save.cc index 8b1d2ee..ccd7325 100644 --- a/milena/sandbox/exec/histo_save.cc +++ b/milena/sandbox/exec/histo_save.cc @@ -3,7 +3,7 @@ #include <mln/histo/compute.hh> #include <mln/debug/histo.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/all.hh> diff --git a/milena/sandbox/fabien/bin/dump2pbm.cc b/milena/sandbox/fabien/bin/dump2pbm.cc index 2afc984..869eb93 100644 --- a/milena/sandbox/fabien/bin/dump2pbm.cc +++ b/milena/sandbox/fabien/bin/dump2pbm.cc @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/make/image3d.hh> #include <mln/debug/slices_2d.hh> diff --git a/milena/sandbox/fabien/bin/dump_mask.cc b/milena/sandbox/fabien/bin/dump_mask.cc index 9511478..85ccd18 100644 --- a/milena/sandbox/fabien/bin/dump_mask.cc +++ b/milena/sandbox/fabien/bin/dump_mask.cc @@ -1,7 +1,7 @@ #include <mln/core/concept/image.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/neighb3d.hh> #include <mln/core/var.hh> diff --git a/milena/sandbox/fabien/igr/fixed_seg/main.cc b/milena/sandbox/fabien/igr/fixed_seg/main.cc index f270123..67a2786 100644 --- a/milena/sandbox/fabien/igr/fixed_seg/main.cc +++ b/milena/sandbox/fabien/igr/fixed_seg/main.cc @@ -5,8 +5,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/routine/extend.hh> #include <mln/core/var.hh> diff --git a/milena/sandbox/fabien/igr/fun_labels.cc b/milena/sandbox/fabien/igr/fun_labels.cc index 82b1a0e..30f98f1 100644 --- a/milena/sandbox/fabien/igr/fun_labels.cc +++ b/milena/sandbox/fabien/igr/fun_labels.cc @@ -2,8 +2,8 @@ #include <sstream> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/routine/extend.hh> #include <mln/core/var.hh> diff --git a/milena/sandbox/fabien/igr/graph.cc b/milena/sandbox/fabien/igr/graph.cc index 7402f23..4a17f21 100644 --- a/milena/sandbox/fabien/igr/graph.cc +++ b/milena/sandbox/fabien/igr/graph.cc @@ -1,7 +1,7 @@ #include <iostream> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/fabien/igr/label2gif.cc b/milena/sandbox/fabien/igr/label2gif.cc index b48326c..22fea43 100644 --- a/milena/sandbox/fabien/igr/label2gif.cc +++ b/milena/sandbox/fabien/igr/label2gif.cc @@ -2,8 +2,8 @@ #include <sstream> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/routine/extend.hh> #include <mln/core/var.hh> diff --git a/milena/sandbox/fabien/igr/mat2mln/raw2mlndata.cc b/milena/sandbox/fabien/igr/mat2mln/raw2mlndata.cc index 53c5f5c..2d38a8b 100644 --- a/milena/sandbox/fabien/igr/mat2mln/raw2mlndata.cc +++ b/milena/sandbox/fabien/igr/mat2mln/raw2mlndata.cc @@ -7,7 +7,7 @@ #include <mln/io/pgm/save.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image/image2d.hh> diff --git a/milena/sandbox/fabien/igr/matlab.cc b/milena/sandbox/fabien/igr/matlab.cc index e1fbdce..d1d29cd 100644 --- a/milena/sandbox/fabien/igr/matlab.cc +++ b/milena/sandbox/fabien/igr/matlab.cc @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/fabien/igr/mean_slices.cc b/milena/sandbox/fabien/igr/mean_slices.cc index 656d5ba..4843e49 100644 --- a/milena/sandbox/fabien/igr/mean_slices.cc +++ b/milena/sandbox/fabien/igr/mean_slices.cc @@ -2,8 +2,8 @@ #include <sstream> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/routine/extend.hh> #include <mln/core/var.hh> diff --git a/milena/sandbox/fabien/igr/med.cc b/milena/sandbox/fabien/igr/med.cc index 0da6f86..1bc5a1f 100644 --- a/milena/sandbox/fabien/igr/med.cc +++ b/milena/sandbox/fabien/igr/med.cc @@ -1,7 +1,7 @@ #include <iostream> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/fabien/igr/nbasins_finder.cc b/milena/sandbox/fabien/igr/nbasins_finder.cc index aecfbfa..5b1bc4a 100644 --- a/milena/sandbox/fabien/igr/nbasins_finder.cc +++ b/milena/sandbox/fabien/igr/nbasins_finder.cc @@ -3,7 +3,7 @@ #include <mln/core/alias/neighb3d.hh> #include <mln/core/alias/window3d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/io/pgm/load.hh> #include <mln/io/dicom/load.hh> diff --git a/milena/sandbox/fabien/igr/norm.cc b/milena/sandbox/fabien/igr/norm.cc index 2850097..0dba363 100644 --- a/milena/sandbox/fabien/igr/norm.cc +++ b/milena/sandbox/fabien/igr/norm.cc @@ -1,7 +1,7 @@ #include <iostream> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/fabien/igr/plot_label.hh b/milena/sandbox/fabien/igr/plot_label.hh index 47fefdb..27a9b0f 100644 --- a/milena/sandbox/fabien/igr/plot_label.hh +++ b/milena/sandbox/fabien/igr/plot_label.hh @@ -5,8 +5,8 @@ #include <sstream> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/geom/bbox.hh> diff --git a/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc b/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc index 80bb6da..78206a9 100644 --- a/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc +++ b/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc @@ -5,8 +5,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/routine/extend.hh> #include <mln/core/var.hh> diff --git a/milena/sandbox/fabien/igr/space_smooth/linear.cc b/milena/sandbox/fabien/igr/space_smooth/linear.cc index bf25dbf..d2e0f02 100644 --- a/milena/sandbox/fabien/igr/space_smooth/linear.cc +++ b/milena/sandbox/fabien/igr/space_smooth/linear.cc @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/fabien/igr/space_smooth/median.cc b/milena/sandbox/fabien/igr/space_smooth/median.cc index c8d1b5b..b716e7a 100644 --- a/milena/sandbox/fabien/igr/space_smooth/median.cc +++ b/milena/sandbox/fabien/igr/space_smooth/median.cc @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/fabien/igr/space_smooth/morpho.cc b/milena/sandbox/fabien/igr/space_smooth/morpho.cc index 5c0878a..4736b84 100644 --- a/milena/sandbox/fabien/igr/space_smooth/morpho.cc +++ b/milena/sandbox/fabien/igr/space_smooth/morpho.cc @@ -2,9 +2,9 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/fabien/igr/thres.cc b/milena/sandbox/fabien/igr/thres.cc index 95639ca..09f2ecc 100644 --- a/milena/sandbox/fabien/igr/thres.cc +++ b/milena/sandbox/fabien/igr/thres.cc @@ -1,7 +1,7 @@ #include <iostream> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/fabien/igr/time_max.cc b/milena/sandbox/fabien/igr/time_max.cc index ab09e9c..4c8800b 100644 --- a/milena/sandbox/fabien/igr/time_max.cc +++ b/milena/sandbox/fabien/igr/time_max.cc @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/fabien/igr/time_max_norm.cc b/milena/sandbox/fabien/igr/time_max_norm.cc index 6714542..5749c8b 100644 --- a/milena/sandbox/fabien/igr/time_max_norm.cc +++ b/milena/sandbox/fabien/igr/time_max_norm.cc @@ -2,9 +2,9 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/fabien/igr/time_smooth/linear.cc b/milena/sandbox/fabien/igr/time_smooth/linear.cc index 12cd475..440581e 100644 --- a/milena/sandbox/fabien/igr/time_smooth/linear.cc +++ b/milena/sandbox/fabien/igr/time_smooth/linear.cc @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/fabien/igr/time_smooth/median.cc b/milena/sandbox/fabien/igr/time_smooth/median.cc index 2c6eb66..291677d 100644 --- a/milena/sandbox/fabien/igr/time_smooth/median.cc +++ b/milena/sandbox/fabien/igr/time_smooth/median.cc @@ -1,8 +1,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/fabien/igr/time_smooth/morpho.cc b/milena/sandbox/fabien/igr/time_smooth/morpho.cc index 7ba26d6..6115e84 100644 --- a/milena/sandbox/fabien/igr/time_smooth/morpho.cc +++ b/milena/sandbox/fabien/igr/time_smooth/morpho.cc @@ -2,9 +2,9 @@ #include <mln/core/alias/neighb1d.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/cast_image.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/vmorph/cast_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/value/int_u12.hh> diff --git a/milena/sandbox/fabien/igr/watershed.hh b/milena/sandbox/fabien/igr/watershed.hh index 9906b5e..094130b 100644 --- a/milena/sandbox/fabien/igr/watershed.hh +++ b/milena/sandbox/fabien/igr/watershed.hh @@ -3,7 +3,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/io/ppm/save.hh> #include <mln/io/ppm/load.hh> diff --git a/milena/sandbox/fabien/igr/watershed2d.cc b/milena/sandbox/fabien/igr/watershed2d.cc index 9906b5e..094130b 100644 --- a/milena/sandbox/fabien/igr/watershed2d.cc +++ b/milena/sandbox/fabien/igr/watershed2d.cc @@ -3,7 +3,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/io/ppm/save.hh> #include <mln/io/ppm/load.hh> diff --git a/milena/sandbox/fabien/igr/watershed3d.cc b/milena/sandbox/fabien/igr/watershed3d.cc index 73036ba..745a922 100644 --- a/milena/sandbox/fabien/igr/watershed3d.cc +++ b/milena/sandbox/fabien/igr/watershed3d.cc @@ -6,7 +6,7 @@ #include <mln/core/alias/window2d.hh> #include <mln/core/alias/neighb3d.hh> #include <mln/core/alias/window3d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/io/ppm/save.hh> #include <mln/io/ppm/load.hh> diff --git a/milena/sandbox/fabien/level.cc b/milena/sandbox/fabien/level.cc index 7170a01..70967ec 100644 --- a/milena/sandbox/fabien/level.cc +++ b/milena/sandbox/fabien/level.cc @@ -41,7 +41,7 @@ #include "level.hh" #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/debug/println.hh> diff --git a/milena/sandbox/folio/mln/dt/dt_old/dt.cc b/milena/sandbox/folio/mln/dt/dt_old/dt.cc index e2c1c60..036ed09 100644 --- a/milena/sandbox/folio/mln/dt/dt_old/dt.cc +++ b/milena/sandbox/folio/mln/dt/dt_old/dt.cc @@ -15,8 +15,8 @@ #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/image/sub_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> #include "dt.hh" diff --git a/milena/sandbox/folio/mln/dt/dt_old/psn.cc b/milena/sandbox/folio/mln/dt/dt_old/psn.cc index b9c9e7f..0e75232 100644 --- a/milena/sandbox/folio/mln/dt/dt_old/psn.cc +++ b/milena/sandbox/folio/mln/dt/dt_old/psn.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -161,8 +162,8 @@ namespace mln #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/image/sub_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> int main() diff --git a/milena/sandbox/folio/mln/dt/dt_old/psn_log.cc b/milena/sandbox/folio/mln/dt/dt_old/psn_log.cc index 5f0816c..e280c43 100644 --- a/milena/sandbox/folio/mln/dt/dt_old/psn_log.cc +++ b/milena/sandbox/folio/mln/dt/dt_old/psn_log.cc @@ -1,5 +1,5 @@ - -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -248,8 +248,8 @@ namespace mln #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/image/sub_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> int main() diff --git a/milena/sandbox/folio/test/dt/dt.cc b/milena/sandbox/folio/test/dt/dt.cc index 7692453..447b1cd 100644 --- a/milena/sandbox/folio/test/dt/dt.cc +++ b/milena/sandbox/folio/test/dt/dt.cc @@ -16,8 +16,8 @@ #include <mln/data/paste.hh> #include <mln/value/int_u8.hh> -#include <mln/core/image/sub_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> #include "../dt/dmap.hh" diff --git a/milena/sandbox/folio/test/dt/dt_bench.cc b/milena/sandbox/folio/test/dt/dt_bench.cc index 5c52a9e..2779c2f 100644 --- a/milena/sandbox/folio/test/dt/dt_bench.cc +++ b/milena/sandbox/folio/test/dt/dt_bench.cc @@ -16,8 +16,8 @@ #include <mln/data/paste.hh> #include <mln/value/int_u8.hh> -#include <mln/core/image/sub_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> // #include "../dt/dmap.hh" diff --git a/milena/sandbox/folio/test/dt/dt_maze.cc b/milena/sandbox/folio/test/dt/dt_maze.cc index 579d740..a590fea 100644 --- a/milena/sandbox/folio/test/dt/dt_maze.cc +++ b/milena/sandbox/folio/test/dt/dt_maze.cc @@ -18,8 +18,8 @@ #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> -#include <mln/core/image/sub_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/all.hh> #include "../dt/path.hh" diff --git a/milena/sandbox/folio/test/dt/psn.cc b/milena/sandbox/folio/test/dt/psn.cc index b9c9e7f..0e75232 100644 --- a/milena/sandbox/folio/test/dt/psn.cc +++ b/milena/sandbox/folio/test/dt/psn.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -161,8 +162,8 @@ namespace mln #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/image/sub_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> int main() diff --git a/milena/sandbox/folio/test/dt/psn_log.cc b/milena/sandbox/folio/test/dt/psn_log.cc index 5f0816c..e280c43 100644 --- a/milena/sandbox/folio/test/dt/psn_log.cc +++ b/milena/sandbox/folio/test/dt/psn_log.cc @@ -1,5 +1,5 @@ - -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -248,8 +248,8 @@ namespace mln #include <mln/level/stretch.hh> #include <mln/value/int_u8.hh> -#include <mln/core/image/sub_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> int main() diff --git a/milena/sandbox/folio/test/histo/projected3d.cc b/milena/sandbox/folio/test/histo/projected3d.cc index a8d103f..78ba33c 100644 --- a/milena/sandbox/folio/test/histo/projected3d.cc +++ b/milena/sandbox/folio/test/histo/projected3d.cc @@ -2,10 +2,10 @@ #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/unproject_image.hh> +#include <mln/core/image/dmorph/unproject_image.hh> #include <mln/fun/v2v/projection.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> #include <mln/level/transform.hh> #include <mln/level/stretch.hh> diff --git a/milena/sandbox/fred/tests/thru.cc b/milena/sandbox/fred/tests/thru.cc index 7837fe0..981189a 100644 --- a/milena/sandbox/fred/tests/thru.cc +++ b/milena/sandbox/fred/tests/thru.cc @@ -1,8 +1,8 @@ // Meta functions test #include <mln/fun/v2v/convert.hh> #include <mln/fun/math/cos.hh> -#include <mln/core/image/thru_morpher.hh> -#include <mln/core/image/thrubin_morpher.hh> +#include <mln/core/image/vmorph/thru_image.hh> +#include <mln/core/image/vmorph/thrubin_image.hh> #include <mln/fun/compose.hh> #include <mln/core/var.hh> @@ -47,4 +47,4 @@ int main() std::cout << row(p); debug::println(ima2); -} \ No newline at end of file +} diff --git a/milena/sandbox/garrigues/fllt/essai.cc b/milena/sandbox/garrigues/fllt/essai.cc index 7dc9d0a..a4774f8 100644 --- a/milena/sandbox/garrigues/fllt/essai.cc +++ b/milena/sandbox/garrigues/fllt/essai.cc @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/image_if_value.hh> diff --git a/milena/sandbox/garrigues/fllt/fllt.hh b/milena/sandbox/garrigues/fllt/fllt.hh index a106266..55cc94f 100644 --- a/milena/sandbox/garrigues/fllt/fllt.hh +++ b/milena/sandbox/garrigues/fllt/fllt.hh @@ -41,8 +41,8 @@ # include <mln/core/alias/neighb2d.hh> # include <mln/core/p_if_piter.hh> # include <mln/core/site_set/p_if.hh> -# include <mln/core/image/sub_image.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/sub_image.hh> +# include <mln/core/image/dmorph/image_if.hh> # include <mln/core/routine/duplicate.hh> # include <mln/core/a_point_of.hh> diff --git a/milena/sandbox/garrigues/fllt/fllt_simple.cc b/milena/sandbox/garrigues/fllt/fllt_simple.cc index 86f7752..a4b5cd8 100644 --- a/milena/sandbox/garrigues/fllt/fllt_simple.cc +++ b/milena/sandbox/garrigues/fllt/fllt_simple.cc @@ -30,12 +30,12 @@ #include <sstream> #include <mln/core/image/image2d.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> #include <mln/util/array.hh> diff --git a/milena/sandbox/garrigues/fllt/fllt_simple.svg.1.cc b/milena/sandbox/garrigues/fllt/fllt_simple.svg.1.cc index f06812f..d466b78 100644 --- a/milena/sandbox/garrigues/fllt/fllt_simple.svg.1.cc +++ b/milena/sandbox/garrigues/fllt/fllt_simple.svg.1.cc @@ -30,7 +30,7 @@ #include <sstream> #include <mln/core/image/image2d.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> @@ -47,7 +47,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> namespace mln { diff --git a/milena/sandbox/garrigues/fllt/fllt_simple.svg.2.cc b/milena/sandbox/garrigues/fllt/fllt_simple.svg.2.cc index de6f34a..fef09cf 100644 --- a/milena/sandbox/garrigues/fllt/fllt_simple.svg.2.cc +++ b/milena/sandbox/garrigues/fllt/fllt_simple.svg.2.cc @@ -30,7 +30,7 @@ #include <sstream> #include <mln/core/image/image2d.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> @@ -47,7 +47,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> namespace mln { diff --git a/milena/sandbox/garrigues/fllt/fllt_simple.svg.3.cc b/milena/sandbox/garrigues/fllt/fllt_simple.svg.3.cc index a2ccd6c..3dc4628 100644 --- a/milena/sandbox/garrigues/fllt/fllt_simple.svg.3.cc +++ b/milena/sandbox/garrigues/fllt/fllt_simple.svg.3.cc @@ -30,7 +30,7 @@ #include <sstream> #include <mln/core/image/image2d.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> @@ -51,7 +51,7 @@ #include <mln/util/tree_to_image.hh> #include <mln/util/branch_iter_ind.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> namespace mln diff --git a/milena/sandbox/garrigues/fllt/fllt_theo.cc b/milena/sandbox/garrigues/fllt/fllt_theo.cc index 211bcad..ebb1e19 100644 --- a/milena/sandbox/garrigues/fllt/fllt_theo.cc +++ b/milena/sandbox/garrigues/fllt/fllt_theo.cc @@ -46,7 +46,7 @@ #include <mln/io/pgm/save.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> namespace mln { diff --git a/milena/sandbox/garrigues/fllt/test.cc b/milena/sandbox/garrigues/fllt/test.cc index df61704..3ae6ac3 100644 --- a/milena/sandbox/garrigues/fllt/test.cc +++ b/milena/sandbox/garrigues/fllt/test.cc @@ -4,7 +4,7 @@ # include "compute_level_set_fast2.hh" # include <mln/core/image/image2d.hh> -# include <mln/core/image/cast_image.hh> +# include <mln/core/image/vmorph/cast_image.hh> # include <mln/core/routine/duplicate.hh> # include <mln/value/int_u8.hh> # include <mln/debug/println.hh> diff --git a/milena/sandbox/garrigues/level_set.hh b/milena/sandbox/garrigues/level_set.hh index 52e855b..e0ae3ee 100644 --- a/milena/sandbox/garrigues/level_set.hh +++ b/milena/sandbox/garrigues/level_set.hh @@ -48,8 +48,8 @@ # include <mln/core/clock_neighb2d.hh> # include <mln/core/p_if_piter.hh> # include <mln/core/site_set/p_if.hh> -# include <mln/core/image/sub_image.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/sub_image.hh> +# include <mln/core/image/dmorph/image_if.hh> # include <mln/core/routine/duplicate.hh> # include <mln/core/a_point_of.hh> diff --git a/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.cc b/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.cc index 13eea0a..7d11bc7 100644 --- a/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.cc +++ b/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.cc @@ -32,7 +32,7 @@ #include "tiled_image2d.hh" -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/data/fill.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/garrigues/union_find/self_dual_reconstruction.hh b/milena/sandbox/garrigues/union_find/self_dual_reconstruction.hh index 38418a0..8868e98 100644 --- a/milena/sandbox/garrigues/union_find/self_dual_reconstruction.hh +++ b/milena/sandbox/garrigues/union_find/self_dual_reconstruction.hh @@ -44,7 +44,7 @@ # include <tests/timer.hh> # include <mln/pw/value.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/image_if.hh> # include "canvas/self_dual_reconstruction.hh" # include "reconstructions_on_function.hh" diff --git a/milena/sandbox/icdar/2009/dibco/binarization.cc b/milena/sandbox/icdar/2009/dibco/binarization.cc index 786df7a..fb6cc6c 100644 --- a/milena/sandbox/icdar/2009/dibco/binarization.cc +++ b/milena/sandbox/icdar/2009/dibco/binarization.cc @@ -10,7 +10,7 @@ #include <mln/core/image/vertex_image.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/site_set/p_queue.hh> #include <mln/core/routine/extend.hh> diff --git a/milena/sandbox/icdar/2009/dibco/quasi.cc b/milena/sandbox/icdar/2009/dibco/quasi.cc index 6ad69fc..39f06f0 100644 --- a/milena/sandbox/icdar/2009/dibco/quasi.cc +++ b/milena/sandbox/icdar/2009/dibco/quasi.cc @@ -2,7 +2,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/site_set/p_queue.hh> #include <mln/core/site_set/p_array.hh> diff --git a/milena/sandbox/icdar/2009/dibco/svg.1.binarization.cc b/milena/sandbox/icdar/2009/dibco/svg.1.binarization.cc index f6824ea..5f44a06 100644 --- a/milena/sandbox/icdar/2009/dibco/svg.1.binarization.cc +++ b/milena/sandbox/icdar/2009/dibco/svg.1.binarization.cc @@ -8,7 +8,7 @@ #include <mln/core/site_set/p_queue.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/data/fill.hh> diff --git a/milena/sandbox/icdar/2009/dibco/svg.2.binarization.cc b/milena/sandbox/icdar/2009/dibco/svg.2.binarization.cc index daebc17..695c14e 100644 --- a/milena/sandbox/icdar/2009/dibco/svg.2.binarization.cc +++ b/milena/sandbox/icdar/2009/dibco/svg.2.binarization.cc @@ -8,7 +8,7 @@ #include <mln/make/double_neighb2d.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/site_set/p_queue.hh> #include <mln/core/routine/extend.hh> diff --git a/milena/sandbox/icdar/2009/dibco/svg.3.binarization.cc b/milena/sandbox/icdar/2009/dibco/svg.3.binarization.cc index 1fa40d7..6bef1fb 100644 --- a/milena/sandbox/icdar/2009/dibco/svg.3.binarization.cc +++ b/milena/sandbox/icdar/2009/dibco/svg.3.binarization.cc @@ -11,7 +11,7 @@ #include <mln/core/image/edge_image.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/site_set/p_queue.hh> #include <mln/core/routine/extend.hh> diff --git a/milena/sandbox/icdar/2009/hsc/clean_lines.hh b/milena/sandbox/icdar/2009/hsc/clean_lines.hh index 956c150..bc07af7 100644 --- a/milena/sandbox/icdar/2009/hsc/clean_lines.hh +++ b/milena/sandbox/icdar/2009/hsc/clean_lines.hh @@ -11,7 +11,7 @@ #include <mln/io/pgm/all.hh> #include <mln/labeling/compute.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/data/fill.hh> #include "label_maj.hh" diff --git a/milena/sandbox/icdar/2009/hsc/clean_lines_with_grouped_bboxes.hh b/milena/sandbox/icdar/2009/hsc/clean_lines_with_grouped_bboxes.hh index 8942e83..d5839b8 100644 --- a/milena/sandbox/icdar/2009/hsc/clean_lines_with_grouped_bboxes.hh +++ b/milena/sandbox/icdar/2009/hsc/clean_lines_with_grouped_bboxes.hh @@ -11,7 +11,7 @@ #include <mln/io/pgm/all.hh> #include <mln/labeling/compute.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/data/fill.hh> #include <mln/literal/colors.hh> #include <mln/logical/not.hh> diff --git a/milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc b/milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc index 7df51ef..dc59912 100644 --- a/milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc +++ b/milena/sandbox/icdar/2009/hsc/first_attempts/exec/iz_lines.cc @@ -3,7 +3,7 @@ #include <mln/core/alias/point2d.hh> #include <mln/core/alias/dpoint2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/data/fill.hh> #include <mln/data/paste.hh> diff --git a/milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc b/milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc index 6f86fbe..34664bf 100644 --- a/milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc +++ b/milena/sandbox/icdar/2009/hsc/first_attempts/exec/relabel_lines.cc @@ -4,7 +4,7 @@ #include <mln/core/alias/dpoint2d.hh> #include <mln/value/label_8.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/data/fill.hh> #include <mln/pw/all.hh> diff --git a/milena/sandbox/icdar/2009/hsc/first_attempts/main.cc b/milena/sandbox/icdar/2009/hsc/first_attempts/main.cc index 8c4b331..d1b6cb3 100644 --- a/milena/sandbox/icdar/2009/hsc/first_attempts/main.cc +++ b/milena/sandbox/icdar/2009/hsc/first_attempts/main.cc @@ -2,7 +2,7 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/pw/all.hh> diff --git a/milena/sandbox/icdar/2009/hsc/get_line_images.hh b/milena/sandbox/icdar/2009/hsc/get_line_images.hh index 506a64b..732e7c3 100644 --- a/milena/sandbox/icdar/2009/hsc/get_line_images.hh +++ b/milena/sandbox/icdar/2009/hsc/get_line_images.hh @@ -3,7 +3,7 @@ #include <mln/core/concept/image.hh> #include <mln/core/site_set/box.hh> -#include <mln/core/image/extended.hh> +#include <mln/core/image/dmorph/extended.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/routine/extend.hh> #include <mln/core/var.hh> @@ -19,7 +19,7 @@ #include <mln/util/array.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> namespace mln diff --git a/milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc b/milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc index 18f7d3a..05c8daf 100644 --- a/milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc +++ b/milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc @@ -8,7 +8,7 @@ #include <mln/io/pgm/all.hh> #include <mln/labeling/compute.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/data/fill.hh> #include "label_maj.hh" #include "clean_lines.hh" diff --git a/milena/sandbox/icdar/2009/hsc/input_to_lines.hh b/milena/sandbox/icdar/2009/hsc/input_to_lines.hh index a3e03a4..360a97e 100644 --- a/milena/sandbox/icdar/2009/hsc/input_to_lines.hh +++ b/milena/sandbox/icdar/2009/hsc/input_to_lines.hh @@ -7,7 +7,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/label.hh> #include <mln/labeling/pack.hh> -#include <mln/core/image/violent_cast_image.hh> +#include <mln/core/image/vmorph/violent_cast_image.hh> #include <mln/io/pgm/save.hh> diff --git a/milena/sandbox/icdar/2009/hsc/input_to_ws.hh b/milena/sandbox/icdar/2009/hsc/input_to_ws.hh index a1ea537..bd419e6 100644 --- a/milena/sandbox/icdar/2009/hsc/input_to_ws.hh +++ b/milena/sandbox/icdar/2009/hsc/input_to_ws.hh @@ -20,7 +20,7 @@ #include <mln/level/convert.hh> #include <mln/labeling/wrap.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> namespace mln diff --git a/milena/sandbox/icdar/2009/hsc/lines_to_boxes.cc b/milena/sandbox/icdar/2009/hsc/lines_to_boxes.cc index cb035be..f3c2723 100644 --- a/milena/sandbox/icdar/2009/hsc/lines_to_boxes.cc +++ b/milena/sandbox/icdar/2009/hsc/lines_to_boxes.cc @@ -8,7 +8,7 @@ #include <mln/value/label_8.hh> #include <mln/estim/min_max.hh> -#include <mln/core/image/violent_cast_image.hh> +#include <mln/core/image/vmorph/violent_cast_image.hh> #include <mln/core/var.hh> #include <scribo/draw/bounding_boxes.hh> diff --git a/milena/sandbox/icdar/2009/hsc/old_input_to_lines.cc b/milena/sandbox/icdar/2009/hsc/old_input_to_lines.cc index 212b077..1f76f68 100644 --- a/milena/sandbox/icdar/2009/hsc/old_input_to_lines.cc +++ b/milena/sandbox/icdar/2009/hsc/old_input_to_lines.cc @@ -2,7 +2,7 @@ #include <vector> #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/pw/all.hh> diff --git a/milena/sandbox/icdar/2009/hsc/ws_to_wsl.hh b/milena/sandbox/icdar/2009/hsc/ws_to_wsl.hh index 1f27525..706199d 100644 --- a/milena/sandbox/icdar/2009/hsc/ws_to_wsl.hh +++ b/milena/sandbox/icdar/2009/hsc/ws_to_wsl.hh @@ -33,7 +33,7 @@ #include <mln/literal/colors.hh> #include <mln/level/convert.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/fun/i2v/array.hh> #include <mln/level/transform.hh> diff --git a/milena/sandbox/inim/2009/color/laplacien.cc b/milena/sandbox/inim/2009/color/laplacien.cc index dc5e5b9..7bc7544 100644 --- a/milena/sandbox/inim/2009/color/laplacien.cc +++ b/milena/sandbox/inim/2009/color/laplacien.cc @@ -1,5 +1,5 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/make/double_neighb2d.hh> diff --git a/milena/sandbox/inim/2009/color/min_tree_area_filter.cc b/milena/sandbox/inim/2009/color/min_tree_area_filter.cc index 0604c92..cb35e64 100644 --- a/milena/sandbox/inim/2009/color/min_tree_area_filter.cc +++ b/milena/sandbox/inim/2009/color/min_tree_area_filter.cc @@ -1,8 +1,8 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/core/routine/extend.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/inim/2009/color/min_tree_color.cc b/milena/sandbox/inim/2009/color/min_tree_color.cc index 98b6793..67279f3 100644 --- a/milena/sandbox/inim/2009/color/min_tree_color.cc +++ b/milena/sandbox/inim/2009/color/min_tree_color.cc @@ -1,8 +1,8 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/core/routine/extend.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/inim/2009/color/min_tree_color_v2.cc b/milena/sandbox/inim/2009/color/min_tree_color_v2.cc index d22460c..a75419e 100644 --- a/milena/sandbox/inim/2009/color/min_tree_color_v2.cc +++ b/milena/sandbox/inim/2009/color/min_tree_color_v2.cc @@ -1,8 +1,8 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/core/routine/extend.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/inim/2009/color/min_tree_height_filter.cc b/milena/sandbox/inim/2009/color/min_tree_height_filter.cc index bdee88a..1f38689 100644 --- a/milena/sandbox/inim/2009/color/min_tree_height_filter.cc +++ b/milena/sandbox/inim/2009/color/min_tree_height_filter.cc @@ -1,8 +1,8 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/core/routine/extend.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/inim/2009/color/min_tree_volume_filter.cc b/milena/sandbox/inim/2009/color/min_tree_volume_filter.cc index f9f4457..59c1045 100644 --- a/milena/sandbox/inim/2009/color/min_tree_volume_filter.cc +++ b/milena/sandbox/inim/2009/color/min_tree_volume_filter.cc @@ -1,8 +1,8 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/core/routine/extend.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/inim/2009/color/reference.cc b/milena/sandbox/inim/2009/color/reference.cc index 411cd20..2ad7cc6 100644 --- a/milena/sandbox/inim/2009/color/reference.cc +++ b/milena/sandbox/inim/2009/color/reference.cc @@ -1,8 +1,8 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/core/routine/extend.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/inim/2009/color/reference2.cc b/milena/sandbox/inim/2009/color/reference2.cc index ec6c512..65a01ec 100644 --- a/milena/sandbox/inim/2009/color/reference2.cc +++ b/milena/sandbox/inim/2009/color/reference2.cc @@ -1,8 +1,8 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/core/routine/extend.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/inim/2009/nature/histo_hsi.cc b/milena/sandbox/inim/2009/nature/histo_hsi.cc index bba9624..5ed4677 100644 --- a/milena/sandbox/inim/2009/nature/histo_hsi.cc +++ b/milena/sandbox/inim/2009/nature/histo_hsi.cc @@ -29,7 +29,7 @@ #include <string> #include <mln/core/image/image2d.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/core/image/thru.hh> #include <mln/core/alias/window2d.hh> #include <mln/core/alias/neighb2d.hh> diff --git a/milena/sandbox/inim/2009/nature/mco.cc b/milena/sandbox/inim/2009/nature/mco.cc index ded27e7..fb9ce94 100644 --- a/milena/sandbox/inim/2009/nature/mco.cc +++ b/milena/sandbox/inim/2009/nature/mco.cc @@ -1,7 +1,7 @@ #include <iostream> #include <mln/core/image/image2d.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/value/int_u16.hh> #include "co_occurence.hh" #include <mln/core/alias/dpoint2d.hh> diff --git a/milena/sandbox/inim/2009/nature/nature.cc b/milena/sandbox/inim/2009/nature/nature.cc index a1bca29..bd4d9bb 100644 --- a/milena/sandbox/inim/2009/nature/nature.cc +++ b/milena/sandbox/inim/2009/nature/nature.cc @@ -27,7 +27,7 @@ // Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/core/image/thru.hh> #include <mln/core/alias/neighb2d.hh> diff --git a/milena/sandbox/inim/2009/nature/proj.cc b/milena/sandbox/inim/2009/nature/proj.cc index d1cab03..cf9e362 100644 --- a/milena/sandbox/inim/2009/nature/proj.cc +++ b/milena/sandbox/inim/2009/nature/proj.cc @@ -28,7 +28,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image1d.hh> #include <mln/win/rectangle2d.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> diff --git a/milena/sandbox/inim/2009/ocr/Makefile b/milena/sandbox/inim/2009/ocr/Makefile index 2b61618..55fa29f 100644 --- a/milena/sandbox/inim/2009/ocr/Makefile +++ b/milena/sandbox/inim/2009/ocr/Makefile @@ -1,4 +1,4 @@ -CXXFLAGS=-I../../.. -I${HOME}/local/include +CXXFLAGS=-I../../../.. -I${HOME}/local/include LFLAGS=-L${HOME}/local/lib -ltesseract_full -lpthread all: ocr_without_preprocess ocr_with_preprocess diff --git a/milena/sandbox/inim/2009/ocr/ocr_with_preprocess.cc b/milena/sandbox/inim/2009/ocr/ocr_with_preprocess.cc index 271b946..d79d9b2 100644 --- a/milena/sandbox/inim/2009/ocr/ocr_with_preprocess.cc +++ b/milena/sandbox/inim/2009/ocr/ocr_with_preprocess.cc @@ -31,7 +31,7 @@ #include <mln/core/alias/window2d.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/value/int_u8.hh> @@ -143,6 +143,9 @@ int main(int argc, char** argv) OCR_TEST(K); io::pbm::save(K, std::string(argv[2]) + "_6_K.pbm"); + io::pgm::save(blur, std::string(argv[2]) + "_6_blur_revert.pgm"); + io::pgm::save(arith::revert(blur), std::string(argv[2]) + "_6_blur_revert.pgm"); + image2d<bool> skel_on_gaussian = skeleton_with_constraint(big, 8, K, arith::revert(blur)); OCR_TEST(skel_on_gaussian); io::pbm::save(skel_on_gaussian, std::string(argv[2]) + "_7_skeleton_on_gaussian.pbm"); diff --git a/milena/sandbox/inim/2009/ocr/ocr_without_preprocess.cc b/milena/sandbox/inim/2009/ocr/ocr_without_preprocess.cc index d895a05..ac65458 100644 --- a/milena/sandbox/inim/2009/ocr/ocr_without_preprocess.cc +++ b/milena/sandbox/inim/2009/ocr/ocr_without_preprocess.cc @@ -31,7 +31,7 @@ #include <mln/core/alias/window2d.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/inim/2009/ocr/skeleton.hh b/milena/sandbox/inim/2009/ocr/skeleton.hh index 2f2a3f8..c39c9f5 100644 --- a/milena/sandbox/inim/2009/ocr/skeleton.hh +++ b/milena/sandbox/inim/2009/ocr/skeleton.hh @@ -35,14 +35,14 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/cast_image.hh> +# include <mln/core/image/vmorph/cast_image.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/site_set/p_queue_fast.hh> # include <mln/core/site_set/p_priority.hh> # include <mln/value/int_u8.hh> # include <mln/arith/revert.hh> -# include <mln/transform/distance.hh> +# include <mln/transform/distance_front.hh> # include <mln/make/w_window2d_int.hh> @@ -182,7 +182,7 @@ namespace mln 9, 6, 4, 6, 9, 0, 9, 0, 9, 0 }; - image2d<value::int_u8> dist_map_n = transform::distance(value::int_u8(), logical::not_(input), nbh, make::w_window2d_int(vals)); + image2d<value::int_u8> dist_map_n = transform::distance_front(logical::not_(input), nbh, make::w_window2d_int(vals), mln_max(value::int_u8)); image2d<value::int_u8> dist_map = arith::revert(dist_map_n); io::pgm::save(dist_map, "distance.pgm"); diff --git a/milena/sandbox/inim/2009/ocr/skeleton.old.cc b/milena/sandbox/inim/2009/ocr/skeleton.old.cc index 2f33102..077e74f 100644 --- a/milena/sandbox/inim/2009/ocr/skeleton.old.cc +++ b/milena/sandbox/inim/2009/ocr/skeleton.old.cc @@ -3,7 +3,7 @@ #include "skeleton.hh" #include <mln/data/paste.hh> #include <mln/data/fill.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> #include <mln/io/pbm/load.hh> diff --git a/milena/sandbox/inim/2010/cag/superpose.hh b/milena/sandbox/inim/2010/cag/superpose.hh index a05b105..f5ec1dd 100644 --- a/milena/sandbox/inim/2010/cag/superpose.hh +++ b/milena/sandbox/inim/2010/cag/superpose.hh @@ -35,7 +35,7 @@ /// whose value is less that mln_max(...). # include <mln/core/concept/image.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/image_if.hh> # include <mln/level/convert.hh> # include <mln/data/fill.hh> # include <mln/value/rgb8.hh> diff --git a/milena/sandbox/inim/2010/rag/rag.hh b/milena/sandbox/inim/2010/rag/rag.hh index 295aaee..bd6e2c6 100644 --- a/milena/sandbox/inim/2010/rag/rag.hh +++ b/milena/sandbox/inim/2010/rag/rag.hh @@ -40,7 +40,7 @@ # include "center_weight.hh" # include "p_vertices_with_accu.hh" -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/canvas/browsing/depth_first_search.hh> diff --git a/milena/sandbox/inim/2011/fredwin/inim.cc b/milena/sandbox/inim/2011/fredwin/inim.cc index 57eb27b..4670aec 100644 --- a/milena/sandbox/inim/2011/fredwin/inim.cc +++ b/milena/sandbox/inim/2011/fredwin/inim.cc @@ -1,6 +1,6 @@ /* mln core */ #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> #include <mln/core/alias/w_window2d_int.hh> diff --git a/milena/sandbox/jardonnet/n_cmpt/fused_filter.cc b/milena/sandbox/jardonnet/n_cmpt/fused_filter.cc index fb4af39..c08c76f 100644 --- a/milena/sandbox/jardonnet/n_cmpt/fused_filter.cc +++ b/milena/sandbox/jardonnet/n_cmpt/fused_filter.cc @@ -19,7 +19,7 @@ #include <mln/debug/iota.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/opt/at.hh> diff --git a/milena/sandbox/jardonnet/n_cmpt/n_cmpt5.hh b/milena/sandbox/jardonnet/n_cmpt/n_cmpt5.hh index 804cec7..ee0cc86 100644 --- a/milena/sandbox/jardonnet/n_cmpt/n_cmpt5.hh +++ b/milena/sandbox/jardonnet/n_cmpt/n_cmpt5.hh @@ -41,7 +41,7 @@ # include <mln/pw/all.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/image_if.hh> namespace mln { diff --git a/milena/sandbox/jardonnet/test/big_chess.cc b/milena/sandbox/jardonnet/test/big_chess.cc index 4d746ad..2f4e366 100644 --- a/milena/sandbox/jardonnet/test/big_chess.cc +++ b/milena/sandbox/jardonnet/test/big_chess.cc @@ -1,8 +1,8 @@ #include <iostream> -# include <mln/core/image/sub_image_if.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/sub_image_if.hh> +# include <mln/core/image/dmorph/image_if.hh> #include <mln/debug/println.hh> diff --git a/milena/sandbox/jardonnet/test/registration.cc b/milena/sandbox/jardonnet/test/registration.cc index e63c19f..762ee4b 100644 --- a/milena/sandbox/jardonnet/test/registration.cc +++ b/milena/sandbox/jardonnet/test/registration.cc @@ -5,7 +5,7 @@ #include <mln/io/ppm/save.hh> #include <mln/convert/to_p_array.hh> #include <mln/norm/l2.hh> -#include <mln/core/image/lazy_image.hh> +#include <mln/core/image/imorph/lazy_image.hh> #include <sandbox/jardonnet/registration/registration.hh> #include <sandbox/jardonnet/registration/tools.hh> diff --git a/milena/sandbox/jardonnet/virtual/access.cc b/milena/sandbox/jardonnet/virtual/access.cc index 4239f35..6ba552e 100644 --- a/milena/sandbox/jardonnet/virtual/access.cc +++ b/milena/sandbox/jardonnet/virtual/access.cc @@ -10,8 +10,8 @@ #include <mln/border/adjust.hh> #include <mln/border/fill.hh> #include <mln/literal/all.hh> -#include <mln/core/image/interpolated.hh> -#include <mln/core/image/tr_image.hh> +#include <mln/core/image/imorph/interpolated.hh> +#include <mln/core/image/imorph/tr_image.hh> #include <mln/core/var.hh> #include <mln/data/fill.hh> diff --git a/milena/sandbox/laurent/ismm2009.hh b/milena/sandbox/laurent/ismm2009.hh index 1f00d1c..1404b85 100644 --- a/milena/sandbox/laurent/ismm2009.hh +++ b/milena/sandbox/laurent/ismm2009.hh @@ -3,7 +3,7 @@ #include <mln/core/var.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/make/double_neighb2d.hh> diff --git a/milena/sandbox/laurent/memo/ismm2009.v0.cc b/milena/sandbox/laurent/memo/ismm2009.v0.cc index a3ec9a9..ca9d71d 100644 --- a/milena/sandbox/laurent/memo/ismm2009.v0.cc +++ b/milena/sandbox/laurent/memo/ismm2009.v0.cc @@ -3,7 +3,7 @@ #include <mln/core/var.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/make/double_neighb2d.hh> diff --git a/milena/sandbox/lazzara/igr/igr-biggest-comp.cc b/milena/sandbox/lazzara/igr/igr-biggest-comp.cc index a59176f..c4a1641 100644 --- a/milena/sandbox/lazzara/igr/igr-biggest-comp.cc +++ b/milena/sandbox/lazzara/igr/igr-biggest-comp.cc @@ -9,9 +9,9 @@ #include <mln/essential/3d.hh> -#include <mln/core/image/slice_image.hh> -#include <mln/core/image/tr_image.hh> -#include <mln/core/image/interpolated.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/image/imorph/tr_image.hh> +#include <mln/core/image/imorph/interpolated.hh> #include <mln/io/cloud/load.hh> #include <mln/util/timer.hh> diff --git a/milena/sandbox/lazzara/igr/igr-cloud.cc b/milena/sandbox/lazzara/igr/igr-cloud.cc index df4b7c8..ae54aa3 100644 --- a/milena/sandbox/lazzara/igr/igr-cloud.cc +++ b/milena/sandbox/lazzara/igr/igr-cloud.cc @@ -26,11 +26,11 @@ # include <mln/literal/white.hh> # include <mln/literal/colors.hh> -# include <mln/core/image/slice_image.hh> +# include <mln/core/image/dmorph/slice_image.hh> # include <mln/util/timer.hh> -#include <mln/core/image/tr_image.hh> -#include <mln/core/image/extension_fun.hh> +#include <mln/core/image/imorph/tr_image.hh> +#include <mln/core/image/dmorph/extension_fun.hh> #include <mln/accu/histo.hh> #include <mln/accu/sum.hh> diff --git a/milena/sandbox/lazzara/igr/igr.cc b/milena/sandbox/lazzara/igr/igr.cc index fffd88f..3af2801 100644 --- a/milena/sandbox/lazzara/igr/igr.cc +++ b/milena/sandbox/lazzara/igr/igr.cc @@ -10,9 +10,9 @@ //#include <mln/registration/multiscale.hh> #include <mln/essential/3d.hh> -#include <mln/core/image/slice_image.hh> -#include <mln/core/image/tr_image.hh> -#include <mln/core/image/interpolated.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/image/imorph/tr_image.hh> +#include <mln/core/image/imorph/interpolated.hh> #include <mln/io/cloud/load.hh> #include <mln/util/timer.hh> diff --git a/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc b/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc index 49fdb1a..854e41c 100644 --- a/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc +++ b/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc @@ -3,7 +3,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/io/ppm/save.hh> #include <mln/io/ppm/load.hh> diff --git a/milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc b/milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc index 3fb657d..24cff5b 100644 --- a/milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc +++ b/milena/sandbox/lazzara/igr/irm/hsl_grad_and_wst.cc @@ -1,6 +1,6 @@ #include <mln/essential/2d.hh> -#include <mln/core/image/violent_cast_image.hh> +#include <mln/core/image/vmorph/violent_cast_image.hh> #include <mln/extract/all.hh> diff --git a/milena/sandbox/lazzara/igr/irm_seg_with_mm_and_rag.mine.cc b/milena/sandbox/lazzara/igr/irm_seg_with_mm_and_rag.mine.cc index 5b54eca..0c68b34 100644 --- a/milena/sandbox/lazzara/igr/irm_seg_with_mm_and_rag.mine.cc +++ b/milena/sandbox/lazzara/igr/irm_seg_with_mm_and_rag.mine.cc @@ -7,9 +7,9 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/image/image_if.hh> -#include <mln/core/image/extension_fun.hh> -#include <mln/core/image/tr_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/extension_fun.hh> +#include <mln/core/image/imorph/tr_image.hh> #include <mln/core/var.hh> #include <mln/win/rectangle2d.hh> diff --git a/milena/sandbox/lazzara/igr/tr_image.cc b/milena/sandbox/lazzara/igr/tr_image.cc index d1a8056..48c3c99 100644 --- a/milena/sandbox/lazzara/igr/tr_image.cc +++ b/milena/sandbox/lazzara/igr/tr_image.cc @@ -3,10 +3,10 @@ #include <mln/fun/x2x/composed.hh> #include <mln/fun/x2x/rotation.hh> #include <mln/fun/x2x/translation.hh> -#include <mln/core/image/interpolated.hh> +#include <mln/core/image/imorph/interpolated.hh> #include <mln/fun/x2v/trilinear.hh> #include <mln/fun/x2v/bilinear.hh> -#include <mln/core/image/tr_image.hh> +#include <mln/core/image/imorph/tr_image.hh> #include <mln/io/cloud/save.hh> #include <mln/debug/slices_2d.hh> diff --git a/milena/sandbox/nivault/extract_character.cc b/milena/sandbox/nivault/extract_character.cc index 1629a4c..db6932d 100644 --- a/milena/sandbox/nivault/extract_character.cc +++ b/milena/sandbox/nivault/extract_character.cc @@ -64,7 +64,7 @@ # include <mln/level/stretch.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image/sub_image.hh> +# include <mln/core/image/dmorph/sub_image.hh> # include <mln/data/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> diff --git a/milena/sandbox/nivault/extract_score.cc b/milena/sandbox/nivault/extract_score.cc index 7f42105..5704e05 100644 --- a/milena/sandbox/nivault/extract_score.cc +++ b/milena/sandbox/nivault/extract_score.cc @@ -68,7 +68,7 @@ # include <mln/linear/gaussian.hh> # include <mln/core/image_if_value.hh> -# include <mln/core/image/sub_image.hh> +# include <mln/core/image/dmorph/sub_image.hh> # include <mln/data/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> diff --git a/milena/sandbox/nivault/median.hh b/milena/sandbox/nivault/median.hh index 3e68877..0c4515a 100644 --- a/milena/sandbox/nivault/median.hh +++ b/milena/sandbox/nivault/median.hh @@ -39,7 +39,7 @@ # include <mln/core/alias/window2d.hh> # include <mln/win/hline2d.hh> # include <mln/win/vline2d.hh> -# include <mln/core/image/t_image.hh> +# include <mln/core/image/morph/t_image.hh> # include <mln/core/dpoint.hh> # include <mln/accu/median.hh> diff --git a/milena/sandbox/nivault/rotation.cc b/milena/sandbox/nivault/rotation.cc index 104dc1c..ca87166 100644 --- a/milena/sandbox/nivault/rotation.cc +++ b/milena/sandbox/nivault/rotation.cc @@ -37,7 +37,7 @@ #include <mln/io/pgm/load.hh> #include <mln/core/image2d_b.hh> #include <mln/value/int_u8.hh> -#include <mln/core/image/interpolated.hh> +#include <mln/core/image/imorph/interpolated.hh> int main() diff --git a/milena/sandbox/theo/color/filter_blen_rgb_edges.cc b/milena/sandbox/theo/color/filter_blen_rgb_edges.cc index 3d91a0a..b64b8cb 100644 --- a/milena/sandbox/theo/color/filter_blen_rgb_edges.cc +++ b/milena/sandbox/theo/color/filter_blen_rgb_edges.cc @@ -8,7 +8,7 @@ #include <mln/value/label_8.hh> #include <mln/value/label_16.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/extend.hh> #include <mln/core/routine/duplicate.hh> #include <mln/data/paste.hh> diff --git a/milena/sandbox/theo/color/filter_meandist_rgb_pixels.cc b/milena/sandbox/theo/color/filter_meandist_rgb_pixels.cc index 9d198ca..d66e980 100644 --- a/milena/sandbox/theo/color/filter_meandist_rgb_pixels.cc +++ b/milena/sandbox/theo/color/filter_meandist_rgb_pixels.cc @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/theo/color/segment_gl_pixels.cc b/milena/sandbox/theo/color/segment_gl_pixels.cc index 29e1912..5ab0fc5 100644 --- a/milena/sandbox/theo/color/segment_gl_pixels.cc +++ b/milena/sandbox/theo/color/segment_gl_pixels.cc @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/theo/color/segment_rgb_edges.cc b/milena/sandbox/theo/color/segment_rgb_edges.cc index bc4d076..a08651d 100644 --- a/milena/sandbox/theo/color/segment_rgb_edges.cc +++ b/milena/sandbox/theo/color/segment_rgb_edges.cc @@ -7,7 +7,7 @@ #include <mln/value/label_8.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/extend.hh> #include <mln/core/routine/duplicate.hh> #include <mln/data/paste.hh> diff --git a/milena/sandbox/theo/color/segment_rgb_pixels.cc b/milena/sandbox/theo/color/segment_rgb_pixels.cc index 442ccca..8215bfe 100644 --- a/milena/sandbox/theo/color/segment_rgb_pixels.cc +++ b/milena/sandbox/theo/color/segment_rgb_pixels.cc @@ -1,6 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/theo/cs2d/cs2d.hh b/milena/sandbox/theo/cs2d/cs2d.hh index f4b30b3..d792443 100644 --- a/milena/sandbox/theo/cs2d/cs2d.hh +++ b/milena/sandbox/theo/cs2d/cs2d.hh @@ -3,7 +3,7 @@ # include <mln/core/alias/window2d.hh> # include <mln/convert/to_window.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/image_if.hh> # include <mln/debug/println.hh> diff --git a/milena/sandbox/theo/cs2d/kruskal.cc b/milena/sandbox/theo/cs2d/kruskal.cc index f45bc48..67691e8 100644 --- a/milena/sandbox/theo/cs2d/kruskal.cc +++ b/milena/sandbox/theo/cs2d/kruskal.cc @@ -1,8 +1,8 @@ # include <vector> # include <mln/core/image/image2d.hh> -# include <mln/core/image/sub_image.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/sub_image.hh> +# include <mln/core/image/dmorph/image_if.hh> # include <mln/core/image_if_value.hh> # include <mln/core/alias/neighb2d.hh> diff --git a/milena/sandbox/theo/cs2d/tuto.cc b/milena/sandbox/theo/cs2d/tuto.cc index 99868d4..8cb814d 100644 --- a/milena/sandbox/theo/cs2d/tuto.cc +++ b/milena/sandbox/theo/cs2d/tuto.cc @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/image_if.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/theo/esiee/laurent/ismm09/cplx2d.hh b/milena/sandbox/theo/esiee/laurent/ismm09/cplx2d.hh index 264f1f2..35458be 100644 --- a/milena/sandbox/theo/esiee/laurent/ismm09/cplx2d.hh +++ b/milena/sandbox/theo/esiee/laurent/ismm09/cplx2d.hh @@ -4,7 +4,7 @@ #include <mln/make/double_neighb2d.hh> #include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/extend.hh> #include <mln/data/paste.hh> diff --git a/milena/sandbox/theo/esiee/laurent/presentation/wst_edge.cc b/milena/sandbox/theo/esiee/laurent/presentation/wst_edge.cc index b8e636e..b54705a 100644 --- a/milena/sandbox/theo/esiee/laurent/presentation/wst_edge.cc +++ b/milena/sandbox/theo/esiee/laurent/presentation/wst_edge.cc @@ -1,8 +1,8 @@ # include <mln/core/var.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image_if.hh> -# include <mln/core/image/extended.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extended.hh> # include <mln/core/routine/extend.hh> # include <mln/core/alias/window2d.hh> diff --git a/milena/sandbox/theo/exec/superpose.cc b/milena/sandbox/theo/exec/superpose.cc index c3fb1db..630295b 100644 --- a/milena/sandbox/theo/exec/superpose.cc +++ b/milena/sandbox/theo/exec/superpose.cc @@ -1,6 +1,6 @@ #include "filetype.hh" -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/data/fill.hh> #include <mln/pw/all.hh> diff --git a/milena/sandbox/theo/experimental/projected_histo.cc b/milena/sandbox/theo/experimental/projected_histo.cc index ffca527..4f3ec9d 100644 --- a/milena/sandbox/theo/experimental/projected_histo.cc +++ b/milena/sandbox/theo/experimental/projected_histo.cc @@ -2,10 +2,10 @@ #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/unproject_image.hh> +#include <mln/core/image/dmorph/unproject_image.hh> #include <mln/fun/v2v/projection.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> #include <mln/accu/count.hh> diff --git a/milena/sandbox/theo/fllt.svg.6.cc b/milena/sandbox/theo/fllt.svg.6.cc index 1e2708f..65a6cee 100644 --- a/milena/sandbox/theo/fllt.svg.6.cc +++ b/milena/sandbox/theo/fllt.svg.6.cc @@ -32,9 +32,9 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> diff --git a/milena/sandbox/theo/fllt.svg.7.hh b/milena/sandbox/theo/fllt.svg.7.hh index 653f513..9437c55 100644 --- a/milena/sandbox/theo/fllt.svg.7.hh +++ b/milena/sandbox/theo/fllt.svg.7.hh @@ -36,9 +36,9 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> diff --git a/milena/sandbox/theo/fllt/fllt.hh b/milena/sandbox/theo/fllt/fllt.hh index 0f4ae96..60a78ec 100644 --- a/milena/sandbox/theo/fllt/fllt.hh +++ b/milena/sandbox/theo/fllt/fllt.hh @@ -33,9 +33,9 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/opt/at.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/theo/fllt/fllt.svg.3.cc b/milena/sandbox/theo/fllt/fllt.svg.3.cc index 3ecd05b..e791bda 100644 --- a/milena/sandbox/theo/fllt/fllt.svg.3.cc +++ b/milena/sandbox/theo/fllt/fllt.svg.3.cc @@ -30,7 +30,7 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> diff --git a/milena/sandbox/theo/fllt/fllt.svg.4.cc b/milena/sandbox/theo/fllt/fllt.svg.4.cc index 7bb79b0..9c774d6 100644 --- a/milena/sandbox/theo/fllt/fllt.svg.4.cc +++ b/milena/sandbox/theo/fllt/fllt.svg.4.cc @@ -30,7 +30,7 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> diff --git a/milena/sandbox/theo/fllt/fllt.svg.5.cc b/milena/sandbox/theo/fllt/fllt.svg.5.cc index 62e0f8f..2147921 100644 --- a/milena/sandbox/theo/fllt/fllt.svg.5.cc +++ b/milena/sandbox/theo/fllt/fllt.svg.5.cc @@ -30,7 +30,7 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> diff --git a/milena/sandbox/theo/fllt/fllt.svg.6.cc b/milena/sandbox/theo/fllt/fllt.svg.6.cc index 05eedb0..147892a 100644 --- a/milena/sandbox/theo/fllt/fllt.svg.6.cc +++ b/milena/sandbox/theo/fllt/fllt.svg.6.cc @@ -32,9 +32,9 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> diff --git a/milena/sandbox/theo/fllt/fllt.svg.7.hh b/milena/sandbox/theo/fllt/fllt.svg.7.hh index 60d054b..900d05e 100644 --- a/milena/sandbox/theo/fllt/fllt.svg.7.hh +++ b/milena/sandbox/theo/fllt/fllt.svg.7.hh @@ -36,9 +36,9 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/opt/at.hh> diff --git a/milena/sandbox/theo/fllt/fllt_test.hh b/milena/sandbox/theo/fllt/fllt_test.hh index 209eb9e..186db00 100644 --- a/milena/sandbox/theo/fllt/fllt_test.hh +++ b/milena/sandbox/theo/fllt/fllt_test.hh @@ -32,9 +32,9 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image_if_value.hh> -#include <mln/core/image/sub_image.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/image/cast_image.hh> +#include <mln/core/image/vmorph/cast_image.hh> #include <mln/opt/at.hh> diff --git a/milena/sandbox/theo/igr/dump_to_dist.cc b/milena/sandbox/theo/igr/dump_to_dist.cc index a7ea633..3947428 100644 --- a/milena/sandbox/theo/igr/dump_to_dist.cc +++ b/milena/sandbox/theo/igr/dump_to_dist.cc @@ -3,7 +3,7 @@ #include <mln/core/var.hh> #include <mln/core/image/image3d.hh> #include <mln/core/image/image2d.hh> -#include <mln/core/image/slice_image.hh> +#include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/concept/function.hh> diff --git a/milena/sandbox/theo/igr/irm_seg_with_mm_and_rag.cc b/milena/sandbox/theo/igr/irm_seg_with_mm_and_rag.cc index 74b89e8..1475367 100644 --- a/milena/sandbox/theo/igr/irm_seg_with_mm_and_rag.cc +++ b/milena/sandbox/theo/igr/irm_seg_with_mm_and_rag.cc @@ -7,7 +7,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/win/rectangle2d.hh> #include <mln/io/pgm/load.hh> diff --git a/milena/sandbox/theo/publis/icip2009/compute_a.cc b/milena/sandbox/theo/publis/icip2009/compute_a.cc index 9f91ef1..fd84701 100644 --- a/milena/sandbox/theo/publis/icip2009/compute_a.cc +++ b/milena/sandbox/theo/publis/icip2009/compute_a.cc @@ -29,7 +29,7 @@ /// \file sandbox/theo/publis/icip2009/compute_a.cc #include <mln/core/image/image2d.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/all.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> diff --git a/milena/sandbox/vigouroux/color/rgb_to_cmy.hh b/milena/sandbox/vigouroux/color/rgb_to_cmy.hh index f2ac8a0..b71dc2e 100644 --- a/milena/sandbox/vigouroux/color/rgb_to_cmy.hh +++ b/milena/sandbox/vigouroux/color/rgb_to_cmy.hh @@ -1,4 +1,4 @@ -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> diff --git a/milena/sandbox/vigouroux/color/rgb_to_hsi.hh b/milena/sandbox/vigouroux/color/rgb_to_hsi.hh index 221f203..5899b06 100644 --- a/milena/sandbox/vigouroux/color/rgb_to_hsi.hh +++ b/milena/sandbox/vigouroux/color/rgb_to_hsi.hh @@ -1,7 +1,7 @@ #include <cmath> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> diff --git a/milena/sandbox/vigouroux/color/rgb_to_xyz.hh b/milena/sandbox/vigouroux/color/rgb_to_xyz.hh index a379922..d25fd54 100644 --- a/milena/sandbox/vigouroux/color/rgb_to_xyz.hh +++ b/milena/sandbox/vigouroux/color/rgb_to_xyz.hh @@ -1,7 +1,7 @@ #ifndef OLENA_CONVERT_RGBXYZ_HH # define OLENA_CONVERT_RGBXYZ_HH -# include <mln/core/image/image_if.hh> +# include <mln/core/image/dmorph/image_if.hh> # include <mln/core/alias/w_window2d_int.hh> # include <mln/display/show.hh> diff --git a/milena/sandbox/vigouroux/color/rgb_to_yuv.hh b/milena/sandbox/vigouroux/color/rgb_to_yuv.hh index f122e23..ddcdba4 100644 --- a/milena/sandbox/vigouroux/color/rgb_to_yuv.hh +++ b/milena/sandbox/vigouroux/color/rgb_to_yuv.hh @@ -1,4 +1,4 @@ -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> diff --git a/milena/sandbox/vigouroux/tests.cc b/milena/sandbox/vigouroux/tests.cc index 35c9b8b..7c9435a 100644 --- a/milena/sandbox/vigouroux/tests.cc +++ b/milena/sandbox/vigouroux/tests.cc @@ -1,4 +1,4 @@ -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/alias/w_window2d_int.hh> #include <mln/display/show.hh> -- 1.5.6.5