[Olena-patches] last-svn-commit-883-g0d80a70 Correct a bug in the compononent outlining algorithm.

* scribo/util/component_outline.hh: Here. --- scribo/ChangeLog | 6 ++++++ scribo/scribo/util/component_outline.hh | 21 +++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bfe43b2..9fd4e5e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -14,6 +14,12 @@ * src/primitive/extract/lines_thick_and_thin.cc: Be less severe on parameters. +2011-05-20 Coddy Levi &lt;levi(a)lrde.epita.fr&gt; + + Correct a bug in the compononent outlining algorithm. + + * scribo/util/component_outline.hh: Here. + 2011-05-18 Julien Marquegnies &lt;marquegnies(a)lrde.epita.fr&gt; Improve paragraph grouping for historical documents. diff --git a/scribo/scribo/util/component_outline.hh b/scribo/scribo/util/component_outline.hh index 85ab4a7..ea2f61f 100644 --- a/scribo/scribo/util/component_outline.hh +++ b/scribo/scribo/util/component_outline.hh @@ -264,13 +264,16 @@ namespace scribo mln::point2d node = find_farthest(ima, begin, end, precision); if (node != begin) - { - split_rec(ima, begin, node, l, precision); + { + if (find_farthest(ima, begin, node, precision) != end) + split_rec(ima, begin, node, l, precision); - l.append(node); + l.append(node); + + if (find_farthest(ima, node, end, precision) != begin) + split_rec(ima, node, end, l, precision); + } - split_rec(ima, node, end, l, precision); - } } /// Init the spliting procedure on both side of the line. @@ -318,9 +321,11 @@ namespace scribo get_initials(const I& ima) { mln::point2d begin(mln::geom::min_row(ima), - mln::geom::min_col(ima)); + mln::geom::max_col(ima) + - ima.ncols() / 2); mln::point2d end(mln::geom::max_row(ima), - mln::geom::max_col(ima)); + mln::geom::max_col(ima) + - ima.ncols() / 2); while (ima(begin) == mln::literal::zero) begin[0]++; @@ -346,7 +351,7 @@ namespace scribo mln_precondition(ima.is_valid()); - mln::accu::shape::bbox<point2d> ab; + mln::accu::shape::bbox<mln::point2d> ab; mln_piter(I) p(ima.domain()); for_all(p) ab.take(p); -- 1.5.6.5