[Olena-patches] olena-2.0-384-geffa1b7 Fix namespace ambiguities.

* scribo/make/text_components_image.hh, * scribo/primitive/extract/non_text.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/make/text_components_image.hh | 5 +++-- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index aff1b17..81b1d34 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2013-03-08 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix namespace ambiguities. + + * scribo/make/text_components_image.hh, + * scribo/primitive/extract/non_text.hh: Here. + +2013-03-08 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * scribo/table/internal/align_lines.hh: Update use of math::round. 2013-03-08 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; diff --git a/scribo/scribo/make/text_components_image.hh b/scribo/scribo/make/text_components_image.hh index 1a30a04..fc0243c 100644 --- a/scribo/scribo/make/text_components_image.hh +++ b/scribo/scribo/make/text_components_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -77,7 +78,7 @@ namespace scribo for_all_lines(l, doc.lines()) if (lines(l).is_textline()) { - const util::array<component_id_t>& + const mln::util::array<component_id_t>& comp_ids = lines(l).component_ids(); const L& lbl = lines.components().labeled_image(); for_all_elements(c, comp_ids) diff --git a/scribo/scribo/primitive/extract/non_text.hh b/scribo/scribo/primitive/extract/non_text.hh index 4c6d69e..2e19bc0 100644 --- a/scribo/scribo/primitive/extract/non_text.hh +++ b/scribo/scribo/primitive/extract/non_text.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -306,7 +306,7 @@ namespace scribo trace::entering("scribo::primitive::extract::non_text"); - util::timer t; + mln::util::timer t; t.start(); mln_precondition(doc.is_valid()); -- 1.7.2.5