* tests/unit_test/unit-tests.mk, * doc/tutorial/figures/figures.mk, * doc/tutorial/outputs/outputs.mk, * doc/tutorial/samples/samples.mk, * headers.mk: include new files in distribution. * mln/canvas/morpho/algebraic_filter.hh * mln/canvas/morpho/algebraic_union_find.hh: fix wrong call to find_root. * mln/canvas/morpho/internal/find_root.hh: add missing include. --- milena/ChangeLog | 16 ++++++++++++++++ milena/doc/tutorial/figures/figures.mk | 5 +++++ milena/doc/tutorial/outputs/outputs.mk | 1 + milena/doc/tutorial/samples/samples.mk | 1 + milena/headers.mk | 7 ++++++- milena/mln/canvas/morpho/algebraic_filter.hh | 4 ++-- milena/mln/canvas/morpho/algebraic_union_find.hh | 4 ++-- milena/mln/canvas/morpho/internal/find_root.hh | 2 ++ milena/tests/unit_test/unit-tests.mk | 12 ++++++++++++ 9 files changed, 47 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 62bbc11..131f040 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,19 @@ +2009-02-25 Guillaume Lazzara <z@lrde.epita.fr> + + Small fixes. + + * tests/unit_test/unit-tests.mk, + * doc/tutorial/figures/figures.mk, + * doc/tutorial/outputs/outputs.mk, + * doc/tutorial/samples/samples.mk, + * headers.mk: include new files in distribution. + + * mln/canvas/morpho/algebraic_filter.hh + * mln/canvas/morpho/algebraic_union_find.hh: fix wrong call to + find_root. + + * mln/canvas/morpho/internal/find_root.hh: add missing include. + 2009-02-25 Fabien Freling <fabien.freling@lrde.epita.fr> Fix DICOM implementation: was DCMTK, now is GDCM. diff --git a/milena/doc/tutorial/figures/figures.mk b/milena/doc/tutorial/figures/figures.mk index 400b2ff..41dba2b 100644 --- a/milena/doc/tutorial/figures/figures.mk +++ b/milena/doc/tutorial/figures/figures.mk @@ -1,6 +1,7 @@ ## Generated by ../generate_dist_files, do not modify. EXTRA_DIST += \ +figures/extend-1.ppm \ figures/ima2d-rot-2.ppm \ figures/tuto3_rw_image-1.ppm \ figures/logical-not-2.pbm \ @@ -17,17 +18,21 @@ figures/ima_save.pbm \ figures/tuto2_first_image-1.pbm \ figures/figures.mk \ figures/fill-subimage-cfun-1.ppm \ +figures/extend-3.ppm \ figures/fill-subdomain-4.ppm \ figures/tuto4_genericity_and_algorithms-7.ppm \ figures/tuto4_genericity_and_algorithms-6.ppm \ +figures/extend-5.ppm \ figures/logical-not-3.pbm \ figures/tuto4_genericity_and_algorithms-3.pbm \ figures/tuto4_genericity_and_algorithms-1.ppm \ +figures/extend-4.ppm \ figures/tuto4_genericity_and_algorithms-8.ppm \ figures/labeling-compute-1.pbm \ figures/tuto3_rw_image-3.ppm \ figures/tuto4_genericity_and_algorithms-4.ppm \ figures/tuto4_genericity_and_algorithms-8.pgm \ +figures/extend-2.ppm \ figures/tuto4_genericity_and_algorithms-2.ppm \ figures/fill-subdomain-1.pbm \ figures/tuto3_rw_image-2.ppm diff --git a/milena/doc/tutorial/outputs/outputs.mk b/milena/doc/tutorial/outputs/outputs.mk index dfba0d6..1e4c9cf 100644 --- a/milena/doc/tutorial/outputs/outputs.mk +++ b/milena/doc/tutorial/outputs/outputs.mk @@ -4,6 +4,7 @@ EXTRA_DIST += \ outputs/win-create-1-display.txt \ outputs/win-create-2.txt \ outputs/accu-right-instanciation.txt \ +outputs/extend.txt \ outputs/ima2d-1.txt \ outputs/borderthickness.txt \ outputs/ima-save.txt \ diff --git a/milena/doc/tutorial/samples/samples.mk b/milena/doc/tutorial/samples/samples.mk index 442eec6..e0e3f5d 100644 --- a/milena/doc/tutorial/samples/samples.mk +++ b/milena/doc/tutorial/samples/samples.mk @@ -30,6 +30,7 @@ samples/fill-subdomain-shorter.cc \ samples/tuto3_rw_image.cc \ samples/ima2d-2.cc \ samples/extension-ignore.cc \ +samples/extend.cc \ samples/Makefile.am \ samples/parray-bbox.cc \ samples/graph-data.cc \ diff --git a/milena/headers.mk b/milena/headers.mk index d3c584f..6460d8f 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -59,7 +59,6 @@ mln/registration/get_rtransf.hh \ mln/registration/internal/rms.hh \ mln/registration/get_rot.hh \ mln/registration/all.hh \ -mln/registration/multiscale.hh \ mln/registration/registration.hh \ mln/registration/essential.hh \ mln/registration/icp.hh \ @@ -116,6 +115,7 @@ mln/data/all.hh \ mln/data/paste.hh \ mln/data/fill_with_image.hh \ mln/data/fill_with_image.spe.hh \ +mln/data/swap.hh \ mln/data/fill_with_value.hh \ mln/data/fill_with_value.spe.hh \ mln/data/fill.hh \ @@ -207,6 +207,7 @@ mln/fun/vv2v/essential.hh \ mln/fun/internal/array_base.hh \ mln/fun/internal/x2x_linear_impl.hh \ mln/fun/internal/ch_function_value_impl.hh \ +mln/fun/internal/resolve.hh \ mln/fun/internal/selector.hh \ mln/fun/v2w_w2v/norm.hh \ mln/fun/p2v/ternary.hh \ @@ -448,8 +449,10 @@ mln/math/essential.hh \ mln/math/acos.hh \ mln/math/round_sat.hh \ mln/opt/at.hh \ +mln/opt/all.hh \ mln/opt/element.hh \ mln/opt/value.hh \ +mln/opt/essential.hh \ mln/binarization/includes.hh \ mln/binarization/all.hh \ mln/binarization/binarization.hh \ @@ -529,6 +532,7 @@ mln/canvas/chamfer.hh \ mln/canvas/distance_geodesic.hh \ mln/canvas/all.hh \ mln/canvas/distance_front.hh \ +mln/canvas/morpho/internal/find_root.hh \ mln/canvas/morpho/all.hh \ mln/canvas/morpho/connected_filter.hh \ mln/canvas/morpho/algebraic_filter.hh \ @@ -1036,6 +1040,7 @@ mln/io/pnm/save.hh \ mln/io/pnm/save_header.hh \ mln/io/txt/all.hh \ mln/io/txt/save.hh \ +mln/io/dicom/load.hh \ mln/io/abort.hh \ mln/io/fits/load.hh \ mln/io/fits/all.hh \ diff --git a/milena/mln/canvas/morpho/algebraic_filter.hh b/milena/mln/canvas/morpho/algebraic_filter.hh index bfcf55e..883b959 100644 --- a/milena/mln/canvas/morpho/algebraic_filter.hh +++ b/milena/mln/canvas/morpho/algebraic_filter.hh @@ -136,7 +136,7 @@ namespace mln if (input.domain().has(n) && deja_vu(n)) { // Do-Union. - P r = find_root(parent, n); + P r = internal::find_root(parent, n); if (r != p) { if (input(r) == input(p) || (activity(r) && data(r) < lambda)) // Equiv(r, p) @@ -258,7 +258,7 @@ namespace mln if (! deja_vu.element(n)) continue; - unsigned r = find_root_fastest(parent, n); + unsigned r = internal::find_root_fastest(parent, n); if (r != p) { if (input.element(r) == input.element(p) diff --git a/milena/mln/canvas/morpho/algebraic_union_find.hh b/milena/mln/canvas/morpho/algebraic_union_find.hh index 75ac3f6..f99ac3d 100644 --- a/milena/mln/canvas/morpho/algebraic_union_find.hh +++ b/milena/mln/canvas/morpho/algebraic_union_find.hh @@ -148,7 +148,7 @@ namespace mln if (input.domain().has(n) && deja_vu(n)) { //do_union(n, p); - P r = find_root(parent, n); + P r = internal::find_root(parent, n); if (r != p) { if (input(r) == input(p) || (activity(r) && f.is_active(data(r)))) // Equiv(r, p) @@ -274,7 +274,7 @@ namespace mln if (! deja_vu.element(n)) continue; - unsigned r = find_root_fastest(parent, n); + unsigned r = internal::find_root_fastest(parent, n); if (r != p) { if (input.element(r) == input.element(p) diff --git a/milena/mln/canvas/morpho/internal/find_root.hh b/milena/mln/canvas/morpho/internal/find_root.hh index 8011122..3ca0717 100644 --- a/milena/mln/canvas/morpho/internal/find_root.hh +++ b/milena/mln/canvas/morpho/internal/find_root.hh @@ -34,6 +34,8 @@ /// /// \todo write a 'parent' image instead? +# include <mln/core/concept/image.hh> + namespace mln { diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 9bb3a70..055ede1 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -111,6 +111,7 @@ mln_data_memcpy_ \ mln_data_all \ mln_data_paste \ mln_data_fill_with_image \ +mln_data_swap \ mln_data_fill_with_value \ mln_data_fill \ mln_data_essential \ @@ -201,6 +202,7 @@ mln_fun_vv2v_essential \ mln_fun_internal_array_base \ mln_fun_internal_x2x_linear_impl \ mln_fun_internal_ch_function_value_impl \ +mln_fun_internal_resolve \ mln_fun_internal_selector \ mln_fun_v2w_w2v_norm \ mln_fun_p2v_ternary \ @@ -440,8 +442,10 @@ mln_math_essential \ mln_math_acos \ mln_math_round_sat \ mln_opt_at \ +mln_opt_all \ mln_opt_element \ mln_opt_value \ +mln_opt_essential \ mln_binarization_includes \ mln_binarization_all \ mln_binarization_binarization \ @@ -521,6 +525,7 @@ mln_canvas_chamfer \ mln_canvas_distance_geodesic \ mln_canvas_all \ mln_canvas_distance_front \ +mln_canvas_morpho_internal_find_root \ mln_canvas_morpho_all \ mln_canvas_morpho_connected_filter \ mln_canvas_morpho_algebraic_filter \ @@ -1006,6 +1011,7 @@ mln_io_pnm_save \ mln_io_pnm_save_header \ mln_io_txt_all \ mln_io_txt_save \ +mln_io_dicom_load \ mln_io_abort \ mln_io_fits_load \ mln_io_fits_all \ @@ -1180,6 +1186,7 @@ mln_data_memcpy__SOURCES = mln_data_memcpy_.cc mln_data_all_SOURCES = mln_data_all.cc mln_data_paste_SOURCES = mln_data_paste.cc mln_data_fill_with_image_SOURCES = mln_data_fill_with_image.cc +mln_data_swap_SOURCES = mln_data_swap.cc mln_data_fill_with_value_SOURCES = mln_data_fill_with_value.cc mln_data_fill_SOURCES = mln_data_fill.cc mln_data_essential_SOURCES = mln_data_essential.cc @@ -1270,6 +1277,7 @@ mln_fun_vv2v_essential_SOURCES = mln_fun_vv2v_essential.cc mln_fun_internal_array_base_SOURCES = mln_fun_internal_array_base.cc mln_fun_internal_x2x_linear_impl_SOURCES = mln_fun_internal_x2x_linear_impl.cc mln_fun_internal_ch_function_value_impl_SOURCES = mln_fun_internal_ch_function_value_impl.cc +mln_fun_internal_resolve_SOURCES = mln_fun_internal_resolve.cc mln_fun_internal_selector_SOURCES = mln_fun_internal_selector.cc mln_fun_v2w_w2v_norm_SOURCES = mln_fun_v2w_w2v_norm.cc mln_fun_p2v_ternary_SOURCES = mln_fun_p2v_ternary.cc @@ -1509,8 +1517,10 @@ mln_math_essential_SOURCES = mln_math_essential.cc mln_math_acos_SOURCES = mln_math_acos.cc mln_math_round_sat_SOURCES = mln_math_round_sat.cc mln_opt_at_SOURCES = mln_opt_at.cc +mln_opt_all_SOURCES = mln_opt_all.cc mln_opt_element_SOURCES = mln_opt_element.cc mln_opt_value_SOURCES = mln_opt_value.cc +mln_opt_essential_SOURCES = mln_opt_essential.cc mln_binarization_includes_SOURCES = mln_binarization_includes.cc mln_binarization_all_SOURCES = mln_binarization_all.cc mln_binarization_binarization_SOURCES = mln_binarization_binarization.cc @@ -1590,6 +1600,7 @@ mln_canvas_chamfer_SOURCES = mln_canvas_chamfer.cc mln_canvas_distance_geodesic_SOURCES = mln_canvas_distance_geodesic.cc mln_canvas_all_SOURCES = mln_canvas_all.cc mln_canvas_distance_front_SOURCES = mln_canvas_distance_front.cc +mln_canvas_morpho_internal_find_root_SOURCES = mln_canvas_morpho_internal_find_root.cc mln_canvas_morpho_all_SOURCES = mln_canvas_morpho_all.cc mln_canvas_morpho_connected_filter_SOURCES = mln_canvas_morpho_connected_filter.cc mln_canvas_morpho_algebraic_filter_SOURCES = mln_canvas_morpho_algebraic_filter.cc @@ -2075,6 +2086,7 @@ mln_io_pnm_save_SOURCES = mln_io_pnm_save.cc mln_io_pnm_save_header_SOURCES = mln_io_pnm_save_header.cc mln_io_txt_all_SOURCES = mln_io_txt_all.cc mln_io_txt_save_SOURCES = mln_io_txt_save.cc +mln_io_dicom_load_SOURCES = mln_io_dicom_load.cc mln_io_abort_SOURCES = mln_io_abort.cc mln_io_fits_load_SOURCES = mln_io_fits_load.cc mln_io_fits_all_SOURCES = mln_io_fits_all.cc -- 1.5.6.5