URL: https://svn.lrde.epita.fr/svn/oln/trunk/scribo ChangeLog: 2009-06-12 Edwin Carlinet <carlinet@lrde.epita.fr> Fixes about accumulator includes and calls. * extract/lines_discontinued.hh, * extract/primitive/cells.hh, * extract/primitive/objects.hh, * filter/thin_objects.hh, * make/text.hh, * text/extract_lines.hh, * text/grouping/group_from_double_link.hh, * text/grouping/group_from_graph.hh, * text/grouping/group_from_single_link.hh: Replace accu::accu_name by accu::new_dir::accu_name, accu::meta::accu_name by accu::meta::new_dir::accu_name, accu/accu_name by accu/new_dir/accu_name. --- extract/lines_discontinued.hh | 4 ++-- extract/primitive/cells.hh | 4 ++-- extract/primitive/objects.hh | 2 +- filter/thin_objects.hh | 2 +- make/text.hh | 4 ++-- text/extract_lines.hh | 2 +- text/grouping/group_from_double_link.hh | 2 +- text/grouping/group_from_graph.hh | 2 +- text/grouping/group_from_single_link.hh | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) Index: trunk/scribo/text/extract_lines.hh =================================================================== --- trunk/scribo/text/extract_lines.hh (revision 4120) +++ trunk/scribo/text/extract_lines.hh (revision 4121) @@ -36,7 +36,7 @@ # include <mln/data/fill.hh> -# include <mln/accu/bbox.hh> +# include <mln/accu/shape/bbox.hh> # include <mln/draw/box.hh> Index: trunk/scribo/text/grouping/group_from_double_link.hh =================================================================== --- trunk/scribo/text/grouping/group_from_double_link.hh (revision 4120) +++ trunk/scribo/text/grouping/group_from_double_link.hh (revision 4121) @@ -36,7 +36,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/site_set/box.hh> -# include <mln/accu/bbox.hh> +# include <mln/accu/shape/bbox.hh> # include <mln/util/array.hh> Index: trunk/scribo/text/grouping/group_from_single_link.hh =================================================================== --- trunk/scribo/text/grouping/group_from_single_link.hh (revision 4120) +++ trunk/scribo/text/grouping/group_from_single_link.hh (revision 4121) @@ -34,7 +34,7 @@ # include <mln/core/site_set/box.hh> # include <mln/fun/i2v/array.hh> -# include <mln/accu/bbox.hh> +# include <mln/accu/shape/bbox.hh> # include <mln/util/array.hh> Index: trunk/scribo/text/grouping/group_from_graph.hh =================================================================== --- trunk/scribo/text/grouping/group_from_graph.hh (revision 4120) +++ trunk/scribo/text/grouping/group_from_graph.hh (revision 4121) @@ -37,7 +37,7 @@ # include <mln/canvas/browsing/depth_first_search.hh> -# include <mln/accu/bbox.hh> +# include <mln/accu/shape/bbox.hh> # include <mln/pw/all.hh> Index: trunk/scribo/filter/thin_objects.hh =================================================================== --- trunk/scribo/filter/thin_objects.hh (revision 4120) +++ trunk/scribo/filter/thin_objects.hh (revision 4121) @@ -89,7 +89,7 @@ struct thin_objects_filter : Function_v2b< thin_objects_filter<L> > { - typedef accu::bbox<mln_psite(L)> box_accu_t; + typedef accu::shape::bbox<mln_psite(L)> box_accu_t; /// Constructor /// Index: trunk/scribo/extract/lines_discontinued.hh =================================================================== --- trunk/scribo/extract/lines_discontinued.hh (revision 4120) +++ trunk/scribo/extract/lines_discontinued.hh (revision 4121) @@ -42,7 +42,7 @@ # include <mln/morpho/rank_filter.hh> # include <mln/morpho/dilation.hh> -# include <mln/accu/bbox.hh> +# include <mln/accu/shape/bbox.hh> # include <mln/util/array.hh> # include <mln/util/couple.hh> @@ -168,7 +168,7 @@ mln_ch_value(I,V) output = lines_discontinued(input, nbh, nlines, win, rank_k); - line_bboxes = labeling::compute(accu::meta::bbox(), output, nlines); + line_bboxes = labeling::compute(accu::meta::shape::bbox(), output, nlines); mln_postcondition(line_bboxes.nelements() == nlines.next()); //FIXME: is it correct? Index: trunk/scribo/extract/primitive/cells.hh =================================================================== --- trunk/scribo/extract/primitive/cells.hh (revision 4120) +++ trunk/scribo/extract/primitive/cells.hh (revision 4121) @@ -34,7 +34,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/box.hh> -# include <mln/accu/bbox.hh> +# include <mln/accu/shape/bbox.hh> # include <mln/util/couple.hh> # include <mln/util/array.hh> @@ -109,7 +109,7 @@ cells = scribo::table::rebuild(input, mln::make::couple(vlines,hlines), 30, ncells).first(); mln::util::array<box<mln_site(I)> > - cellbboxes = labeling::compute(accu::meta::bbox(), cells, ncells); + cellbboxes = labeling::compute(accu::meta::shape::bbox(), cells, ncells); trace::exiting("scribo::primitive::cells"); return cellbboxes; Index: trunk/scribo/extract/primitive/objects.hh =================================================================== --- trunk/scribo/extract/primitive/objects.hh (revision 4120) +++ trunk/scribo/extract/primitive/objects.hh (revision 4121) @@ -43,7 +43,7 @@ # include <scribo/core/object_image.hh> -#include <mln/accu/bbox.hh> +#include <mln/accu/shape/bbox.hh> #include <mln/accu/center.hh> Index: trunk/scribo/make/text.hh =================================================================== --- trunk/scribo/make/text.hh (revision 4120) +++ trunk/scribo/make/text.hh (revision 4121) @@ -129,7 +129,7 @@ mln_ch_value(I,V) lbl = labeling::blobs(input, nbh, nbboxes); - boxes_t cboxes = labeling::compute(accu::meta::bbox(), lbl, nbboxes); + boxes_t cboxes = labeling::compute(accu::meta::shape::bbox(), lbl, nbboxes); trace::exiting("scribo::make::text"); return make::text(cboxes, lbl, nbboxes); @@ -152,7 +152,7 @@ L lbl = labeling::relabel(text.label_image(), text.nbboxes(), fv2v); - mln::util::array< accu::bbox<mln_site(L)> > tboxes(new_nbboxes.next()); + mln::util::array< accu::shape::bbox<mln_site(L)> > tboxes(new_nbboxes.next()); mln::util::array< accu::center<mln_site(L)> > tcenters(new_nbboxes.next()); for_all_components(i, text.bboxes()) {