Commit effa1b75 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Fix namespace ambiguities.

	* scribo/make/text_components_image.hh,
	* scribo/primitive/extract/non_text.hh: Here.
parent 8587fe0a
2013-03-08 Guillaume Lazzara <z@lrde.epita.fr>
Fix namespace ambiguities.
* scribo/make/text_components_image.hh,
* scribo/primitive/extract/non_text.hh: Here.
2013-03-08 Guillaume Lazzara <z@lrde.epita.fr>
* scribo/table/internal/align_lines.hh: Update use of math::round.
......
// 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)
......
// 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());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment