[Olena-patches] last-svn-commit-897-g7415119 scribo/util/component_precise_outline.hh: Fix namespace ambiguity.

--- scribo/ChangeLog | 5 +++++ scribo/scribo/util/component_precise_outline.hh | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 47b8473..6f44931 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-05-26 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * scribo/util/component_precise_outline.hh: Fix namespace + ambiguity. + +2011-05-26 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Improve XML output. * scribo/io/img/internal/debug_img_visitor.hh, diff --git a/scribo/scribo/util/component_precise_outline.hh b/scribo/scribo/util/component_precise_outline.hh index 3c6e523..6637dc9 100644 --- a/scribo/scribo/util/component_precise_outline.hh +++ b/scribo/scribo/util/component_precise_outline.hh @@ -81,9 +81,11 @@ namespace scribo find_first_point(const I& input, point2d& p) { - const def::coord mid_row = geom::min_row(input) + (geom::nrows(input) >> 1); + const mln::def::coord + mid_row = geom::min_row(input) + (geom::nrows(input) >> 1); - for (def::coord i = geom::min_col(input); i <= geom::max_col(input); ++i) + for (mln::def::coord i = geom::min_col(input); + i <= geom::max_col(input); ++i) { if (opt::at(input, mid_row, i)) { @@ -285,7 +287,8 @@ namespace scribo const std::vector<point2d>& vec_points = points.hook_std_vector_(); - if (std::find(vec_points.begin(), vec_points.end(), cur_pt) == vec_points.end()) + if (std::find(vec_points.begin(), + vec_points.end(), cur_pt) == vec_points.end()) { points.append(cur_pt); -- 1.5.6.5