May 2011 - Olena-patches

last-svn-commit-885-g02ab025 Deep modifications and clean correction of the previous bug.
by Coddy Levi 25 May '11

25 May '11

* scribo/util/component_outline.hh: Here. --- scribo/ChangeLog | 6 + scribo/scribo/util/component_outline.hh | 190 +++++++++++++++---------------- 2 files changed, 99 insertions(+), 97 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 034f2c4..4fc8c54 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2011-05-25 Coddy Levi <levi(a)lrde.epita.fr> + + Deep modifications and clean correction of the previous bug. + + * scribo/util/component_outline.hh: Here. + 2011-05-24 Coddy Levi <levi(a)lrde.epita.fr> Further correction of the component outlining bug. diff --git a/scribo/scribo/util/component_outline.hh b/scribo/scribo/util/component_outline.hh index 6870755..99a9101 100644 --- a/scribo/scribo/util/component_outline.hh +++ b/scribo/scribo/util/component_outline.hh @@ -177,7 +177,7 @@ namespace scribo return (dir); } - /// Give the next point in the contour + /// find the next point in the contour of the image template <typename I> static mln::point2d @@ -201,53 +201,86 @@ namespace scribo return cur; } + /// Give an array of the pixels on the contour + /// Ordered so that two consecutive indexes correspond + /// to two adjacent points. + template <typename I> + mln::p_array<mln::point2d> + get_contour(const I&ima, + const mln::point2d& first) + { + mln::p_array<mln::point2d> contour; + mln::point2d current; + + e_dir dir = find_first_dir(ima, first); + + contour.append(first); + + current = next_pt_in_contour(ima, first, &dir); + + while (current != first) + { + contour.append(current); + current = next_pt_in_contour(ima, current, &dir); + } + + return contour; + } + + /// Give the next point in the contour array + inline + unsigned + get_next(mln::p_array<mln::point2d>& contour, + unsigned i) + { + if (i + 1 == contour.nsites()) + return 0; + else + return i + 1; + } + /// Give The farthest point from line (begin, end) or NULL /// if that distance is inferior to the given precision. (bottleneck) - template <typename I> - static inline - mln::point2d - find_farthest(const I& ima, - const mln::point2d& begin, - const mln::point2d& end, - float precision, - int* nb) + inline + unsigned + find_farthest(mln::p_array<mln::point2d>& contour, + unsigned begin, + unsigned end, + float precision) { float d = 0.; - float dmax = -1.; - e_dir dir = find_first_dir(ima, begin); + float dmax = 0.; - float a = end[1] - begin[1]; - float b = begin[0] - end[0]; - float c = begin[1] * end[0] - begin[0] * end[1]; + float a = contour[end][1] - contour[begin][1]; + float b = contour[begin][0] - contour[end][0]; + float c = contour[begin][1] * contour[end][0] + - contour[begin][0] * contour[end][1]; float norm = sqrt ((a * a) + (b * b)); - mln::point2d max; - mln::point2d cur; - mln::point2d old; + unsigned max; + unsigned cur; + unsigned old; cur = begin; max = cur; while (cur != end) - { - if (nb != NULL) - (*nb)++; - old = cur; - cur = next_pt_in_contour(ima, cur, &dir); - - d = a * cur[0] + cur[1] * b + c; - - if (d < 0) - d = -d; - - if (d >= dmax) { - dmax = d; - max = cur; - } - - } + old = cur; + cur = get_next(contour, cur); + d = a * contour[cur][0] + contour[cur][1] * b + c; + + if (d < 0) + d = -d; + + if (d >= dmax) + { + dmax = d; + max = cur; + } + } + if (dmax >= precision * norm) return max; else @@ -256,71 +289,24 @@ namespace scribo /// Split the line (begin, end) at the farthest point on the curve /// and apply itself recursively. - template <typename I> void - split_rec(const I& ima, - const mln::point2d& begin, - const mln::point2d& end, + split_rec(unsigned begin, + unsigned end, mln::p_array<mln::point2d>& l, + mln::p_array<mln::point2d>& contour, float precision) { - int nb = 0; - mln::point2d node = find_farthest(ima, begin, end, precision, &nb); - int nb_old = nb; + unsigned node = find_farthest(contour, begin, end, precision); if (node != begin) { - nb = 0; - mln::point2d test_left = find_farthest(ima, begin, node, precision, &nb); - if ((test_left != end) && (test_left != begin) && (nb_old > nb)) - split_rec(ima, begin, node, l, precision); - - l.append(node); - - nb = 0; - mln::point2d test_right = find_farthest(ima, node, end, precision, &nb); - if ((test_right != begin) && (test_right != end) && (nb_old > nb)) - split_rec(ima, node, end, l, precision); - } - - } - - /// Init the spliting procedure on both side of the line. - template <typename I> - void - split(const I& ima, - const mln::point2d& begin, - const mln::point2d& end, - mln::p_array<mln::point2d>& l, - float precision) - { - mln::point2d node; - - node = find_farthest(ima, begin, end, precision, NULL); - - l.append(begin); - - if (node != begin) - { - split_rec(ima, begin, node, l, precision); - - l.append(node); - - split_rec(ima, node, end, l, precision); - } - - l.append(end); - - node = find_farthest(ima, end, begin, precision, NULL); + split_rec(begin, node, l, contour, precision); - if (node != end) - { - split_rec(ima, end, node, l, precision); + l.append(contour[node]); - l.append(node); + split_rec(node, end, l, contour, precision); + } - split_rec(ima, node, begin, l, precision); - } } /// Find (simply) 2 points on the contour of the component @@ -367,21 +353,31 @@ namespace scribo std::cout << ab.to_result() << std::endl; - mln::p_array<mln::point2d> contour; + mln::p_array<mln::point2d> approx_contour; std::pair<mln::point2d, mln::point2d> initials = internal::get_initials(ima); - std::cout << " - " << initials.first << " - " << initials.first << std::endl; + mln::p_array<mln::point2d> contour; + + contour = internal::get_contour(ima, initials.first); + + std::cout << " - " << initials.first + << " - " << initials.first << std::endl; - internal::split(ima, - initials.first, - initials.second, - contour, - precision); + internal::split_rec(0, + contour.nsites() / 2, + approx_contour, + contour, + precision); + internal::split_rec(contour.nsites() / 2, + 0, + approx_contour, + contour, + precision); mln::trace::exiting("scribo::component_outline"); - return contour; + return approx_contour; } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

last-svn-commit-885-g118f203 2011-05-25 Coddy Levi <levi@lrde.epita.fr>
by Coddy Levi 25 May '11

25 May '11

Deep modifications and clean correction of the previous bug. * scribo/util/component_outline.hh: Here. --- scribo/ChangeLog | 6 + scribo/scribo/util/component_outline.hh | 190 +++++++++++++++---------------- 2 files changed, 99 insertions(+), 97 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 034f2c4..4fc8c54 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2011-05-25 Coddy Levi <levi(a)lrde.epita.fr> + + Deep modifications and clean correction of the previous bug. + + * scribo/util/component_outline.hh: Here. + 2011-05-24 Coddy Levi <levi(a)lrde.epita.fr> Further correction of the component outlining bug. diff --git a/scribo/scribo/util/component_outline.hh b/scribo/scribo/util/component_outline.hh index 6870755..99a9101 100644 --- a/scribo/scribo/util/component_outline.hh +++ b/scribo/scribo/util/component_outline.hh @@ -177,7 +177,7 @@ namespace scribo return (dir); } - /// Give the next point in the contour + /// find the next point in the contour of the image template <typename I> static mln::point2d @@ -201,53 +201,86 @@ namespace scribo return cur; } + /// Give an array of the pixels on the contour + /// Ordered so that two consecutive indexes correspond + /// to two adjacent points. + template <typename I> + mln::p_array<mln::point2d> + get_contour(const I&ima, + const mln::point2d& first) + { + mln::p_array<mln::point2d> contour; + mln::point2d current; + + e_dir dir = find_first_dir(ima, first); + + contour.append(first); + + current = next_pt_in_contour(ima, first, &dir); + + while (current != first) + { + contour.append(current); + current = next_pt_in_contour(ima, current, &dir); + } + + return contour; + } + + /// Give the next point in the contour array + inline + unsigned + get_next(mln::p_array<mln::point2d>& contour, + unsigned i) + { + if (i + 1 == contour.nsites()) + return 0; + else + return i + 1; + } + /// Give The farthest point from line (begin, end) or NULL /// if that distance is inferior to the given precision. (bottleneck) - template <typename I> - static inline - mln::point2d - find_farthest(const I& ima, - const mln::point2d& begin, - const mln::point2d& end, - float precision, - int* nb) + inline + unsigned + find_farthest(mln::p_array<mln::point2d>& contour, + unsigned begin, + unsigned end, + float precision) { float d = 0.; - float dmax = -1.; - e_dir dir = find_first_dir(ima, begin); + float dmax = 0.; - float a = end[1] - begin[1]; - float b = begin[0] - end[0]; - float c = begin[1] * end[0] - begin[0] * end[1]; + float a = contour[end][1] - contour[begin][1]; + float b = contour[begin][0] - contour[end][0]; + float c = contour[begin][1] * contour[end][0] + - contour[begin][0] * contour[end][1]; float norm = sqrt ((a * a) + (b * b)); - mln::point2d max; - mln::point2d cur; - mln::point2d old; + unsigned max; + unsigned cur; + unsigned old; cur = begin; max = cur; while (cur != end) - { - if (nb != NULL) - (*nb)++; - old = cur; - cur = next_pt_in_contour(ima, cur, &dir); - - d = a * cur[0] + cur[1] * b + c; - - if (d < 0) - d = -d; - - if (d >= dmax) { - dmax = d; - max = cur; - } - - } + old = cur; + cur = get_next(contour, cur); + d = a * contour[cur][0] + contour[cur][1] * b + c; + + if (d < 0) + d = -d; + + if (d >= dmax) + { + dmax = d; + max = cur; + } + } + if (dmax >= precision * norm) return max; else @@ -256,71 +289,24 @@ namespace scribo /// Split the line (begin, end) at the farthest point on the curve /// and apply itself recursively. - template <typename I> void - split_rec(const I& ima, - const mln::point2d& begin, - const mln::point2d& end, + split_rec(unsigned begin, + unsigned end, mln::p_array<mln::point2d>& l, + mln::p_array<mln::point2d>& contour, float precision) { - int nb = 0; - mln::point2d node = find_farthest(ima, begin, end, precision, &nb); - int nb_old = nb; + unsigned node = find_farthest(contour, begin, end, precision); if (node != begin) { - nb = 0; - mln::point2d test_left = find_farthest(ima, begin, node, precision, &nb); - if ((test_left != end) && (test_left != begin) && (nb_old > nb)) - split_rec(ima, begin, node, l, precision); - - l.append(node); - - nb = 0; - mln::point2d test_right = find_farthest(ima, node, end, precision, &nb); - if ((test_right != begin) && (test_right != end) && (nb_old > nb)) - split_rec(ima, node, end, l, precision); - } - - } - - /// Init the spliting procedure on both side of the line. - template <typename I> - void - split(const I& ima, - const mln::point2d& begin, - const mln::point2d& end, - mln::p_array<mln::point2d>& l, - float precision) - { - mln::point2d node; - - node = find_farthest(ima, begin, end, precision, NULL); - - l.append(begin); - - if (node != begin) - { - split_rec(ima, begin, node, l, precision); - - l.append(node); - - split_rec(ima, node, end, l, precision); - } - - l.append(end); - - node = find_farthest(ima, end, begin, precision, NULL); + split_rec(begin, node, l, contour, precision); - if (node != end) - { - split_rec(ima, end, node, l, precision); + l.append(contour[node]); - l.append(node); + split_rec(node, end, l, contour, precision); + } - split_rec(ima, node, begin, l, precision); - } } /// Find (simply) 2 points on the contour of the component @@ -367,21 +353,31 @@ namespace scribo std::cout << ab.to_result() << std::endl; - mln::p_array<mln::point2d> contour; + mln::p_array<mln::point2d> approx_contour; std::pair<mln::point2d, mln::point2d> initials = internal::get_initials(ima); - std::cout << " - " << initials.first << " - " << initials.first << std::endl; + mln::p_array<mln::point2d> contour; + + contour = internal::get_contour(ima, initials.first); + + std::cout << " - " << initials.first + << " - " << initials.first << std::endl; - internal::split(ima, - initials.first, - initials.second, - contour, - precision); + internal::split_rec(0, + contour.nsites() / 2, + approx_contour, + contour, + precision); + internal::split_rec(contour.nsites() / 2, + 0, + approx_contour, + contour, + precision); mln::trace::exiting("scribo::component_outline"); - return contour; + return approx_contour; } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

branch coddy updated: last-svn-commit-830-g9a57687
by git＠lrde.epita.fr 25 May '11

25 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch coddy has been updated via 9a5768720038f180173bc7c600fdf6b77bbfe7ab (commit) from f78df6e36baadcfbce50bb22a0cf84fa86ed750f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 9a57687 2011-05-25 Coddy Levi <levi(a)lrde.epita.fr> ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 6 + scribo/scribo/inverse_video/handle_collisions.hh | 196 ++++++++++++++++++++++ 2 files changed, 202 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/inverse_video/handle_collisions.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-830-g9a57687 2011-05-25 Coddy Levi <levi@lrde.epita.fr>
by Coddy Levi 25 May '11

25 May '11

New algorithm to detect superpositions between two line sets. * scribo/inverse_video/handle_collisions.hh: New. --- scribo/ChangeLog | 6 + scribo/scribo/inverse_video/handle_collisions.hh | 196 ++++++++++++++++++++++ 2 files changed, 202 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/inverse_video/handle_collisions.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 048a289..e868468 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2011-05-25 Coddy Levi <levi(a)lrde.epita.fr> + + New algorithm to detect superpositions between two line sets. + + * scribo/inverse_video/handle_collisions.hh: New. + 2011-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/viewer/xml_widget.cc: Fix a warning. diff --git a/scribo/scribo/inverse_video/handle_collisions.hh b/scribo/scribo/inverse_video/handle_collisions.hh new file mode 100644 index 0000000..54e585c --- /dev/null +++ b/scribo/scribo/inverse_video/handle_collisions.hh @@ -0,0 +1,196 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_INVERSE_VIDEO_HANDLE_COLLISIONS_HH +# define SCRIBO_INVERSE_VIDEO_HANDLE_COLLISIONS_HH + +# include <set> +# include <vector> +# include <iostream> + +# include <mln/data/fill.hh> +# include <mln/core/image/image2d.hh> +# include <mln/util/array.hh> +# include <scribo/core/line_set.hh> +# include <mln/draw/box.hh> +# include <mln/literal/colors.hh> + +namespace scribo +{ + + namespace inverse_video + { + + template <typename I, + typename L, + typename F> + void + handle_collisions(const image2d<I>& input, + scribo::line_set<L>& ls1, + scribo::line_set<L>& ls2, + F choose); + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + template <typename L> + struct order_2_lines_id + { + order_2_lines_id(const scribo::line_set<L>& ls1, + const scribo::line_set<L>& ls2) + : ls1_(ls1), + ls2_(ls2) + { + ls1_size_ = ls1_.nelements(); + } + + bool operator()(const scribo::line_id_t& a, + const scribo::line_id_t& b) + { + const scribo::line_info<L>& la = + (a > ls1_size_ ? ls2_(a - ls1_size_ + 1) : ls1_(a)); + const scribo::line_info<L>& lb = + (b > ls1_size_ ? ls2_(b - ls1_size_ + 1) : ls1_(b)); + + return la.bbox().nsites() < lb.bbox().nsites(); + } + + unsigned ls1_size_; + const scribo::line_set<L>& ls1_; + const scribo::line_set<L>& ls2_; + }; + } // end of namespace scribo::text::internal + + // Facade + template <typename I, + typename L, + typename F> + void + handle_collisions(image2d<I>& input, + scribo::line_set<L>& ls1, + scribo::line_set<L>& ls2, + F choose) + { + mln::trace::entering("scribo::inverse_video::handle_collisions"); + + mln::image2d<unsigned> billboard(input.domain()); + mln::data::fill(billboard, 0); + + internal::order_2_lines_id<L> func(ls1, ls2); + + std::vector<scribo::line_id_t> v; + + unsigned ls1_size = ls1.nelements(); + unsigned n = ls1_size + ls2.nelements(); + v.reserve(n); + + for (unsigned i = 1; i < n; ++i) + v.push_back(i); + + std::sort(v.begin(), v.end(), func); + + for (int i = v.size() - 1; i > 0; --i) + { + bool inverse_video = (v[i] > ls1_size); + + scribo::line_set<L>& ls = (inverse_video) ? ls2 : ls1; + scribo::line_id_t l = (inverse_video) ? + (scribo::line_id_t) (v[i] - ls1_size + 1) + : v[i]; + + if (!scribo::text::internal::looks_like_a_text_line(ls(l)) + || !ls(l).is_valid()) + continue; + + unsigned tl, tr, bl, br; + + box2d b = ls(l).bbox(); + + tl = billboard(b.pmin()); + tr = billboard.at_(b.pmin().row(), b.pmax().col()); + bl = billboard.at_(b.pmax().row(), b.pmin().col()); + br = billboard(b.pmax()); + + std::set<unsigned> labels; + labels.insert(tl); + labels.insert(tl); + labels.insert(bl); + labels.insert(br); + + bool chosen = true; + for (std::set<unsigned>::const_iterator it = labels.begin(); + it != labels.end(); + ++it) + { + if (*it == 0) + continue; + + bool inverse_video_tested = (*it > ls1_size); + + const scribo::line_info<L>& l_tested = + (inverse_video_tested ? ls2(*it - ls1_size + 1) : ls1(*it)); + + if (!scribo::text::internal::looks_like_a_text_line(l_tested) + || !l_tested.is_valid()) + continue; + + chosen = choose(ls(l), l_tested); + /* + if (inverse_video != inverse_video_tested) + { + if (inverse_video_tested) + mln::draw::box(input, + l_tested.bbox(), + mln::literal::blue); + else + mln::draw::box(input, + l_tested.bbox(), + mln::literal::green); + + if (inverse_video) + mln::draw::box(input, + ls(l).bbox(), + mln::literal::blue); + else + mln::draw::box(input, + ls(l).bbox(), + mln::literal::green); + }*/ + } + + scribo::text::internal::draw_box(billboard, b, v[i]); + } + + mln::trace::exiting("scribo::inverse_video::handle_collisions"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::inverse_video + +} // end of namespace scribo + +#endif // ! SCRIBO_INVERSE_VIDEO_HANDLE_COLLISIONS_HH -- 1.5.6.5

1 0

last-svn-commit-884-g12da563 2011-05-24 Coddy Levi <levi@lrde.epita.fr>
by Coddy Levi 24 May '11

24 May '11

Further correction of the component outlining bug. * scribo/util/component_outline.hh: Here. --- scribo/ChangeLog | 8 +++++++- scribo/scribo/util/component_outline.hh | 29 +++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9fd4e5e..034f2c4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2011-05-24 Coddy Levi <levi(a)lrde.epita.fr> + + Further correction of the component outlining bug. + + * scribo/util/component_outline.hh: Here. + 2011-05-19 Guillaume Lazzara <z(a)lrde.epita.fr> Improve results. @@ -42,7 +48,7 @@ * tests/filter/Makefile.am, * tests/util/Makefile.am: Add new targets. - * tests/filter/objects_on_border.cc, +v * tests/filter/objects_on_border.cc, * tests/util/component_outline.cc: New. * tests/img/comp_on_borders.pbm, diff --git a/scribo/scribo/util/component_outline.hh b/scribo/scribo/util/component_outline.hh index ea2f61f..6870755 100644 --- a/scribo/scribo/util/component_outline.hh +++ b/scribo/scribo/util/component_outline.hh @@ -209,10 +209,11 @@ namespace scribo find_farthest(const I& ima, const mln::point2d& begin, const mln::point2d& end, - float precision) + float precision, + int* nb) { float d = 0.; - float dmax = 0.; + float dmax = -1.; e_dir dir = find_first_dir(ima, begin); float a = end[1] - begin[1]; @@ -229,6 +230,8 @@ namespace scribo while (cur != end) { + if (nb != NULL) + (*nb)++; old = cur; cur = next_pt_in_contour(ima, cur, &dir); @@ -237,7 +240,7 @@ namespace scribo if (d < 0) d = -d; - if (d > dmax) + if (d >= dmax) { dmax = d; max = cur; @@ -245,7 +248,7 @@ namespace scribo } - if (dmax > precision * norm) + if (dmax >= precision * norm) return max; else return begin; @@ -261,16 +264,22 @@ namespace scribo mln::p_array<mln::point2d>& l, float precision) { - mln::point2d node = find_farthest(ima, begin, end, precision); + int nb = 0; + mln::point2d node = find_farthest(ima, begin, end, precision, &nb); + int nb_old = nb; if (node != begin) { - if (find_farthest(ima, begin, node, precision) != end) + nb = 0; + mln::point2d test_left = find_farthest(ima, begin, node, precision, &nb); + if ((test_left != end) && (test_left != begin) && (nb_old > nb)) split_rec(ima, begin, node, l, precision); l.append(node); - if (find_farthest(ima, node, end, precision) != begin) + nb = 0; + mln::point2d test_right = find_farthest(ima, node, end, precision, &nb); + if ((test_right != begin) && (test_right != end) && (nb_old > nb)) split_rec(ima, node, end, l, precision); } @@ -287,7 +296,7 @@ namespace scribo { mln::point2d node; - node = find_farthest(ima, begin, end, precision); + node = find_farthest(ima, begin, end, precision, NULL); l.append(begin); @@ -302,7 +311,7 @@ namespace scribo l.append(end); - node = find_farthest(ima, end, begin, precision); + node = find_farthest(ima, end, begin, precision, NULL); if (node != end) { @@ -362,7 +371,7 @@ namespace scribo std::pair<mln::point2d, mln::point2d> initials = internal::get_initials(ima); - std::cout << " - " << initials.first << " - " << initials.second << std::endl; + std::cout << " - " << initials.first << " - " << initials.first << std::endl; internal::split(ima, initials.first, -- 1.5.6.5

2 1

branch icdar/hdlac2011 updated: last-svn-commit-884-g12da563
by git＠lrde.epita.fr 24 May '11

24 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch icdar/hdlac2011 has been updated via 12da563c7ea1fba00e47b8cdb9adf526421218d2 (commit) from ebfb6d5d15d50abe54ce41cb88b243c7b03b1935 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 12da563 2011-05-24 Coddy Levi <levi(a)lrde.epita.fr> ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 8 +++++++- scribo/scribo/util/component_outline.hh | 29 +++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-884-gefa07ad Further correction of the component outlining bug.
by Coddy Levi 24 May '11

24 May '11

* scribo/util/component_outline.hh: Here. --- scribo/ChangeLog | 8 +++++++- scribo/scribo/util/component_outline.hh | 29 +++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9fd4e5e..034f2c4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2011-05-24 Coddy Levi <levi(a)lrde.epita.fr> + + Further correction of the component outlining bug. + + * scribo/util/component_outline.hh: Here. + 2011-05-19 Guillaume Lazzara <z(a)lrde.epita.fr> Improve results. @@ -42,7 +48,7 @@ * tests/filter/Makefile.am, * tests/util/Makefile.am: Add new targets. - * tests/filter/objects_on_border.cc, +v * tests/filter/objects_on_border.cc, * tests/util/component_outline.cc: New. * tests/img/comp_on_borders.pbm, diff --git a/scribo/scribo/util/component_outline.hh b/scribo/scribo/util/component_outline.hh index ea2f61f..6870755 100644 --- a/scribo/scribo/util/component_outline.hh +++ b/scribo/scribo/util/component_outline.hh @@ -209,10 +209,11 @@ namespace scribo find_farthest(const I& ima, const mln::point2d& begin, const mln::point2d& end, - float precision) + float precision, + int* nb) { float d = 0.; - float dmax = 0.; + float dmax = -1.; e_dir dir = find_first_dir(ima, begin); float a = end[1] - begin[1]; @@ -229,6 +230,8 @@ namespace scribo while (cur != end) { + if (nb != NULL) + (*nb)++; old = cur; cur = next_pt_in_contour(ima, cur, &dir); @@ -237,7 +240,7 @@ namespace scribo if (d < 0) d = -d; - if (d > dmax) + if (d >= dmax) { dmax = d; max = cur; @@ -245,7 +248,7 @@ namespace scribo } - if (dmax > precision * norm) + if (dmax >= precision * norm) return max; else return begin; @@ -261,16 +264,22 @@ namespace scribo mln::p_array<mln::point2d>& l, float precision) { - mln::point2d node = find_farthest(ima, begin, end, precision); + int nb = 0; + mln::point2d node = find_farthest(ima, begin, end, precision, &nb); + int nb_old = nb; if (node != begin) { - if (find_farthest(ima, begin, node, precision) != end) + nb = 0; + mln::point2d test_left = find_farthest(ima, begin, node, precision, &nb); + if ((test_left != end) && (test_left != begin) && (nb_old > nb)) split_rec(ima, begin, node, l, precision); l.append(node); - if (find_farthest(ima, node, end, precision) != begin) + nb = 0; + mln::point2d test_right = find_farthest(ima, node, end, precision, &nb); + if ((test_right != begin) && (test_right != end) && (nb_old > nb)) split_rec(ima, node, end, l, precision); } @@ -287,7 +296,7 @@ namespace scribo { mln::point2d node; - node = find_farthest(ima, begin, end, precision); + node = find_farthest(ima, begin, end, precision, NULL); l.append(begin); @@ -302,7 +311,7 @@ namespace scribo l.append(end); - node = find_farthest(ima, end, begin, precision); + node = find_farthest(ima, end, begin, precision, NULL); if (node != end) { @@ -362,7 +371,7 @@ namespace scribo std::pair<mln::point2d, mln::point2d> initials = internal::get_initials(ima); - std::cout << " - " << initials.first << " - " << initials.second << std::endl; + std::cout << " - " << initials.first << " - " << initials.first << std::endl; internal::split(ima, initials.first, -- 1.5.6.5

1 0

branch icdar/hdlac2011 updated: last-svn-commit-883-gebfb6d5
by git＠lrde.epita.fr 20 May '11

20 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch icdar/hdlac2011 has been updated via ebfb6d5d15d50abe54ce41cb88b243c7b03b1935 (commit) from f8dae9bab9ea4273a4fc426d7a7bbb3a24c4be93 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ebfb6d5 2011-05-20 Coddy Levi <levi(a)lrde.epita.fr> ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 6 ++++++ scribo/scribo/util/component_outline.hh | 21 +++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch master updated: last-svn-commit-1-g3c76d36
by theo＠lrde.epita.fr 20 May '11

20 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch master has been updated via 3c76d368389afeb0ef7cab77dbe1901b1bf6ff69 (commit) from c9b6114cfa70fc440835c55a665a67feca0a1cfa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 3c76d36 Replace img/lena.pgm by "standard" version. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/img/lena.pgm | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch icdar/hdlac2011 updated: last-svn-commit-882-gf8dae9b
by lazzara＠lrde.epita.fr 19 May '11

19 May '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch icdar/hdlac2011 has been updated via f8dae9bab9ea4273a4fc426d7a7bbb3a24c4be93 (commit) from 973e5ac6bd3ecea14c6df71aa03a2dd78811b9ea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- f8dae9b Improve results. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 16 +++++++ .../primitive/extract/lines_h_thick_and_thin.hh | 15 ++++++- scribo/scribo/primitive/extract/non_text_hdoc.hh | 4 ++ scribo/scribo/text/paragraphs.hh | 44 ++++++++++--------- .../toolchain/internal/content_in_hdoc_functor.hh | 15 ++++--- scribo/src/content_in_hdoc.cc | 2 +- .../src/primitive/extract/lines_thick_and_thin.cc | 2 +- 7 files changed, 67 insertions(+), 31 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0