* scribo/make/text.hh, * scribo/text/grouping/group_from_graph.hh, * scribo/text/grouping/group_from_single_link.hh: use i2v::array. * scribo/text/grouping/group_from_double_link.hh: remove useless include. --- milena/sandbox/ChangeLog | 12 ++++++++++++ milena/sandbox/scribo/make/text.hh | 4 +++- .../scribo/text/grouping/group_from_double_link.hh | 2 -- .../scribo/text/grouping/group_from_graph.hh | 2 +- .../scribo/text/grouping/group_from_single_link.hh | 3 ++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 803f948..fc9c0ff 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,15 @@ +2009-04-15 Guillaume Lazzara <lazzara@lrde.epita.fr> + + Replace the use of l2l::relabel with i2v::array in Scribo. + + * scribo/make/text.hh, + * scribo/text/grouping/group_from_graph.hh, + * scribo/text/grouping/group_from_single_link.hh: use + i2v::array. + + * scribo/text/grouping/group_from_double_link.hh: remove + useless include. + 2009-04-15 Etienne FOLIO <folio@lrde.epita.fr> Compute histograms on 3d and generic images. Still not fully working. diff --git a/milena/sandbox/scribo/make/text.hh b/milena/sandbox/scribo/make/text.hh index b9e4776..f46def8 100644 --- a/milena/sandbox/scribo/make/text.hh +++ b/milena/sandbox/scribo/make/text.hh @@ -35,9 +35,11 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/box.hh> +# include <mln/fun/i2v/array.hh> # include <mln/labeling/blobs.hh> # include <mln/labeling/compute.hh> # include <mln/util/array.hh> + # include <scribo/util/text.hh> @@ -131,7 +133,7 @@ namespace scribo // mln_precondition(text.is_valid()); // // mln_value(L) new_nbboxes; -// mln::fun::l2l::relabel<mln_value(L)> fl2l +// mln::fun::i2v::array<mln_value(L)> fl2l // = mln::make::relabelfun(f, text.nbboxes(), new_nbboxes); // lbl_ = labeling::relabel(text.label_image(), text.nbboxes(), l2l); // text.nbboxes() = new_nbboxes; diff --git a/milena/sandbox/scribo/text/grouping/group_from_double_link.hh b/milena/sandbox/scribo/text/grouping/group_from_double_link.hh index c77b7d2..3ce5521 100644 --- a/milena/sandbox/scribo/text/grouping/group_from_double_link.hh +++ b/milena/sandbox/scribo/text/grouping/group_from_double_link.hh @@ -41,8 +41,6 @@ # include <mln/util/array.hh> -# include <mln/fun/l2l/relabel.hh> - # include <scribo/core/macros.hh> # include <scribo/util/text.hh> diff --git a/milena/sandbox/scribo/text/grouping/group_from_graph.hh b/milena/sandbox/scribo/text/grouping/group_from_graph.hh index a0df22f..774ed6b 100644 --- a/milena/sandbox/scribo/text/grouping/group_from_graph.hh +++ b/milena/sandbox/scribo/text/grouping/group_from_graph.hh @@ -128,7 +128,7 @@ namespace scribo unsigned ncomp; /// Map a verted id to its component id. - fun::l2l::relabel<V> vertextocomp; + fun::i2v::array<V> vertextocomp; }; } // end of namespace scribo::text::grouping::internal diff --git a/milena/sandbox/scribo/text/grouping/group_from_single_link.hh b/milena/sandbox/scribo/text/grouping/group_from_single_link.hh index 9428711..aa2d606 100644 --- a/milena/sandbox/scribo/text/grouping/group_from_single_link.hh +++ b/milena/sandbox/scribo/text/grouping/group_from_single_link.hh @@ -36,6 +36,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/site_set/box.hh> +# include <mln/fun/i2v/array.hh> # include <mln/accu/bbox.hh> @@ -99,7 +100,7 @@ namespace scribo result.append(tboxes[i]); I lbl = labeling::relabel(text.label_image(), text.nbboxes(), - convert::to<fun::l2l::relabel<mln_value(I)> >(parent_array)); + convert::to<fun::i2v::array<mln_value(I)> >(parent_array)); mln_value(I) new_nbboxes = result.nelements() - 1; trace::exiting("scribo::text::grouping::group_from_single_link"); -- 1.5.6.5