* headers.mk,
* tests/unit_test/unit-tests.mk: Regen.
---
milena/ChangeLog | 7 +++++++
milena/headers.mk | 17 ++++++++++++++++-
milena/tests/unit_test/unit-tests.mk | 32 ++++++++++++++++++++++++++++++--
3 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 97a4b48..4a7d67e 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,12 @@
2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr>
+ Regen mk files.
+
+ * headers.mk,
+ * tests/unit_test/unit-tests.mk: Regen.
+
+2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr>
+
* tests/tools/pretty_check.sh: Change data base url.
2009-08-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr>
diff --git a/milena/headers.mk b/milena/headers.mk
index bdc488f..76c9755 100644
--- a/milena/headers.mk
+++ b/milena/headers.mk
@@ -129,7 +129,14 @@ mln/canvas/chamfer.hh \
mln/canvas/distance_front.hh \
mln/canvas/distance_geodesic.hh \
mln/canvas/essential.hh \
-mln/canvas/labeling.hh \
+mln/canvas/labeling/all.hh \
+mln/canvas/labeling/blobs.hh \
+mln/canvas/labeling/essential.hh \
+mln/canvas/labeling/generic.hh \
+mln/canvas/labeling/internal/find_root_fastest.hh \
+mln/canvas/labeling/internal/tests.hh \
+mln/canvas/labeling/sorted.hh \
+mln/canvas/labeling/video.hh \
mln/canvas/morpho/all.hh \
mln/canvas/morpho/attribute_filter.hh \
mln/canvas/morpho/essential.hh \
@@ -278,6 +285,8 @@ mln/core/image/dmorph/unproject_image.hh \
mln/core/image/edge_image.hh \
mln/core/image/essential.hh \
mln/core/image/flat_image.hh \
+mln/core/image/graph_elt_mixed_neighborhood.hh \
+mln/core/image/graph_elt_mixed_window.hh \
mln/core/image/graph_elt_neighborhood.hh \
mln/core/image/graph_elt_neighborhood_if.hh \
mln/core/image/graph_elt_window.hh \
@@ -323,6 +332,8 @@ mln/core/internal/image_primary.hh \
mln/core/internal/image_value_morpher.hh \
mln/core/internal/is_masked_impl_selector.hh \
mln/core/internal/morpher_lvalue.hh \
+mln/core/internal/neighb_base.hh \
+mln/core/internal/neighb_niter_base.hh \
mln/core/internal/neighb_niter_impl.hh \
mln/core/internal/neighborhood_base.hh \
mln/core/internal/p_complex_piter_base.hh \
@@ -341,6 +352,7 @@ mln/core/internal/site_set_iterator_base.hh \
mln/core/internal/weighted_window_base.hh \
mln/core/internal/window_base.hh \
mln/core/macros.hh \
+mln/core/mixed_neighb.hh \
mln/core/neighb.hh \
mln/core/pixel.hh \
mln/core/pixter1d.hh \
@@ -665,6 +677,7 @@ mln/io/txt/save.hh \
mln/labeling/all.hh \
mln/labeling/background.hh \
mln/labeling/blobs.hh \
+mln/labeling/blobs_and_compute.hh \
mln/labeling/colorize.hh \
mln/labeling/compute.hh \
mln/labeling/compute_image.hh \
@@ -678,6 +691,7 @@ mln/labeling/pack.hh \
mln/labeling/regional_maxima.hh \
mln/labeling/regional_minima.hh \
mln/labeling/relabel.hh \
+mln/labeling/superpose.hh \
mln/labeling/value.hh \
mln/labeling/value.spe.hh \
mln/labeling/wrap.hh \
@@ -1222,6 +1236,7 @@ mln/world/inter_pixel/is_pixel.hh \
mln/world/inter_pixel/is_separator.hh \
mln/world/inter_pixel/neighb2d.hh \
mln/world/inter_pixel/separator_to_pixels.hh
+
#<<lrde
nobase_include_HEADERS += \
mln/accu/math/inf.hh \
diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk
index 00d39de..0475d0c 100644
--- a/milena/tests/unit_test/unit-tests.mk
+++ b/milena/tests/unit_test/unit-tests.mk
@@ -127,7 +127,14 @@ mln_canvas_chamfer \
mln_canvas_distance_front \
mln_canvas_distance_geodesic \
mln_canvas_essential \
-mln_canvas_labeling \
+mln_canvas_labeling_all \
+mln_canvas_labeling_blobs \
+mln_canvas_labeling_essential \
+mln_canvas_labeling_generic \
+mln_canvas_labeling_internal_find_root_fastest \
+mln_canvas_labeling_internal_tests \
+mln_canvas_labeling_sorted \
+mln_canvas_labeling_video \
mln_canvas_morpho_all \
mln_canvas_morpho_attribute_filter \
mln_canvas_morpho_essential \
@@ -257,6 +264,8 @@ mln_core_image_dmorph_unproject_image \
mln_core_image_edge_image \
mln_core_image_essential \
mln_core_image_flat_image \
+mln_core_image_graph_elt_mixed_neighborhood \
+mln_core_image_graph_elt_mixed_window \
mln_core_image_graph_elt_neighborhood \
mln_core_image_graph_elt_neighborhood_if \
mln_core_image_graph_elt_window \
@@ -304,6 +313,8 @@ mln_core_internal_image_primary \
mln_core_internal_image_value_morpher \
mln_core_internal_is_masked_impl_selector \
mln_core_internal_morpher_lvalue \
+mln_core_internal_neighb_base \
+mln_core_internal_neighb_niter_base \
mln_core_internal_neighb_niter_impl \
mln_core_internal_neighborhood_base \
mln_core_internal_p_complex_piter_base \
@@ -322,6 +333,7 @@ mln_core_internal_site_set_iterator_base \
mln_core_internal_weighted_window_base \
mln_core_internal_window_base \
mln_core_macros \
+mln_core_mixed_neighb \
mln_core_neighb \
mln_core_pixel \
mln_core_pixter1d \
@@ -681,6 +693,7 @@ mln_io_txt_save \
mln_labeling_all \
mln_labeling_background \
mln_labeling_blobs \
+mln_labeling_blobs_and_compute \
mln_labeling_colorize \
mln_labeling_compute \
mln_labeling_compute_image \
@@ -694,6 +707,7 @@ mln_labeling_pack \
mln_labeling_regional_maxima \
mln_labeling_regional_minima \
mln_labeling_relabel \
+mln_labeling_superpose \
mln_labeling_value \
mln_labeling_wrap \
mln_linear_all \
@@ -1388,7 +1402,14 @@ mln_canvas_chamfer_SOURCES = mln_canvas_chamfer.cc
mln_canvas_distance_front_SOURCES = mln_canvas_distance_front.cc
mln_canvas_distance_geodesic_SOURCES = mln_canvas_distance_geodesic.cc
mln_canvas_essential_SOURCES = mln_canvas_essential.cc
-mln_canvas_labeling_SOURCES = mln_canvas_labeling.cc
+mln_canvas_labeling_all_SOURCES = mln_canvas_labeling_all.cc
+mln_canvas_labeling_blobs_SOURCES = mln_canvas_labeling_blobs.cc
+mln_canvas_labeling_essential_SOURCES = mln_canvas_labeling_essential.cc
+mln_canvas_labeling_generic_SOURCES = mln_canvas_labeling_generic.cc
+mln_canvas_labeling_internal_find_root_fastest_SOURCES =
mln_canvas_labeling_internal_find_root_fastest.cc
+mln_canvas_labeling_internal_tests_SOURCES = mln_canvas_labeling_internal_tests.cc
+mln_canvas_labeling_sorted_SOURCES = mln_canvas_labeling_sorted.cc
+mln_canvas_labeling_video_SOURCES = mln_canvas_labeling_video.cc
mln_canvas_morpho_all_SOURCES = mln_canvas_morpho_all.cc
mln_canvas_morpho_attribute_filter_SOURCES = mln_canvas_morpho_attribute_filter.cc
mln_canvas_morpho_essential_SOURCES = mln_canvas_morpho_essential.cc
@@ -1518,6 +1539,8 @@ mln_core_image_dmorph_unproject_image_SOURCES =
mln_core_image_dmorph_unproject_
mln_core_image_edge_image_SOURCES = mln_core_image_edge_image.cc
mln_core_image_essential_SOURCES = mln_core_image_essential.cc
mln_core_image_flat_image_SOURCES = mln_core_image_flat_image.cc
+mln_core_image_graph_elt_mixed_neighborhood_SOURCES =
mln_core_image_graph_elt_mixed_neighborhood.cc
+mln_core_image_graph_elt_mixed_window_SOURCES = mln_core_image_graph_elt_mixed_window.cc
mln_core_image_graph_elt_neighborhood_SOURCES = mln_core_image_graph_elt_neighborhood.cc
mln_core_image_graph_elt_neighborhood_if_SOURCES =
mln_core_image_graph_elt_neighborhood_if.cc
mln_core_image_graph_elt_window_SOURCES = mln_core_image_graph_elt_window.cc
@@ -1565,6 +1588,8 @@ mln_core_internal_image_primary_SOURCES =
mln_core_internal_image_primary.cc
mln_core_internal_image_value_morpher_SOURCES = mln_core_internal_image_value_morpher.cc
mln_core_internal_is_masked_impl_selector_SOURCES =
mln_core_internal_is_masked_impl_selector.cc
mln_core_internal_morpher_lvalue_SOURCES = mln_core_internal_morpher_lvalue.cc
+mln_core_internal_neighb_base_SOURCES = mln_core_internal_neighb_base.cc
+mln_core_internal_neighb_niter_base_SOURCES = mln_core_internal_neighb_niter_base.cc
mln_core_internal_neighb_niter_impl_SOURCES = mln_core_internal_neighb_niter_impl.cc
mln_core_internal_neighborhood_base_SOURCES = mln_core_internal_neighborhood_base.cc
mln_core_internal_p_complex_piter_base_SOURCES =
mln_core_internal_p_complex_piter_base.cc
@@ -1583,6 +1608,7 @@ mln_core_internal_site_set_iterator_base_SOURCES =
mln_core_internal_site_set_it
mln_core_internal_weighted_window_base_SOURCES =
mln_core_internal_weighted_window_base.cc
mln_core_internal_window_base_SOURCES = mln_core_internal_window_base.cc
mln_core_macros_SOURCES = mln_core_macros.cc
+mln_core_mixed_neighb_SOURCES = mln_core_mixed_neighb.cc
mln_core_neighb_SOURCES = mln_core_neighb.cc
mln_core_pixel_SOURCES = mln_core_pixel.cc
mln_core_pixter1d_SOURCES = mln_core_pixter1d.cc
@@ -1942,6 +1968,7 @@ mln_io_txt_save_SOURCES = mln_io_txt_save.cc
mln_labeling_all_SOURCES = mln_labeling_all.cc
mln_labeling_background_SOURCES = mln_labeling_background.cc
mln_labeling_blobs_SOURCES = mln_labeling_blobs.cc
+mln_labeling_blobs_and_compute_SOURCES = mln_labeling_blobs_and_compute.cc
mln_labeling_colorize_SOURCES = mln_labeling_colorize.cc
mln_labeling_compute_SOURCES = mln_labeling_compute.cc
mln_labeling_compute_image_SOURCES = mln_labeling_compute_image.cc
@@ -1955,6 +1982,7 @@ mln_labeling_pack_SOURCES = mln_labeling_pack.cc
mln_labeling_regional_maxima_SOURCES = mln_labeling_regional_maxima.cc
mln_labeling_regional_minima_SOURCES = mln_labeling_regional_minima.cc
mln_labeling_relabel_SOURCES = mln_labeling_relabel.cc
+mln_labeling_superpose_SOURCES = mln_labeling_superpose.cc
mln_labeling_value_SOURCES = mln_labeling_value.cc
mln_labeling_wrap_SOURCES = mln_labeling_wrap.cc
mln_linear_all_SOURCES = mln_linear_all.cc
--
1.5.6.5