* scribo/filter/object_groups_with_holes.hh (scribo::filter::impl::generic::object_groups_with_holes) * scribo/primitive/regroup/from_single_left_link.hh (regroup::from_single_left_link(const object_groups<L>&, unsigned)): Here. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/filter/object_groups_with_holes.hh | 2 +- scribo/scribo/primitive/regroup/from_single_left_link.hh | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0ea8ef9..16349b1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2013-07-30 Roland Levillain <roland@lrde.epita.fr> + Add missing `mln' namespace qualifiers. + + * scribo/filter/object_groups_with_holes.hh + (scribo::filter::impl::generic::object_groups_with_holes) + * scribo/primitive/regroup/from_single_left_link.hh + (regroup::from_single_left_link(const object_groups<L>&, unsigned)): + Here. + +2013-07-30 Roland Levillain <roland@lrde.epita.fr> + Move to-be-installed header files from src/ to scribo/. * src/afp/components.hh, diff --git a/scribo/scribo/filter/object_groups_with_holes.hh b/scribo/scribo/filter/object_groups_with_holes.hh index 40e0209..d2347bb 100644 --- a/scribo/scribo/filter/object_groups_with_holes.hh +++ b/scribo/scribo/filter/object_groups_with_holes.hh @@ -185,7 +185,7 @@ namespace scribo // Will 'True' if a group has at least two background // components. - fun::i2v::array<bool> + mln::fun::i2v::array<bool> to_keep(value::next(components.nelements()), false); const L& lbl = components.labeled_image(); diff --git a/scribo/scribo/primitive/regroup/from_single_left_link.hh b/scribo/scribo/primitive/regroup/from_single_left_link.hh index a333ea2..0712182 100644 --- a/scribo/scribo/primitive/regroup/from_single_left_link.hh +++ b/scribo/scribo/primitive/regroup/from_single_left_link.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -106,7 +106,7 @@ namespace scribo object_groups<L> output = groups.duplicate(); - fun::i2v::array<mln_value(L)> relabel_fun; + mln::fun::i2v::array<mln_value(L)> relabel_fun; component_set<L> components = primitive::group::apply(groups, relabel_fun); -- 1.7.10.4