Olena-patches May 2011

olena-patches@lrde.epita.fr

9 participants
171 discussions

last-svn-commit-832-g9d2089b Added a choose function, to be used with handle_collisions.

by Sylvain Lobry

--- scribo/ChangeLog | 9 ++ scribo/scribo/inverse_video/choose.hh | 118 ++++++++++++++++++++++ scribo/scribo/inverse_video/handle_collisions.hh | 15 ++-- scribo/scribo/inverse_video/nb_comps.hh | 103 +++++++++++++++++++ scribo/scribo/inverse_video/ratio_area.hh | 93 +++++++++++++++++ 5 files changed, 331 insertions(+), 7 deletions(-) create mode 100644 scribo/scribo/inverse_video/choose.hh create mode 100644 scribo/scribo/inverse_video/nb_comps.hh create mode 100644 scribo/scribo/inverse_video/ratio_area.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0c7b65f..3fbee9e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2011-05-27 Sylvain Lobry <lobry(a)lrde.epita.fr> + + Added a choose function, to be used with handle_collisions. + + * scribo/inverse_video/handle_collisions.hh: Prototype fixed. + * scribo/inverse_video/choose.hh, + * scribo/inverse_video/nb_comps.hh, + * scribo/inverse_video/ratio_area.hh: New. + 2011-05-26 Coddy Levi <levi(a)lrde.epita.fr> Bug corrected, several improvements, interface modified. diff --git a/scribo/scribo/inverse_video/choose.hh b/scribo/scribo/inverse_video/choose.hh new file mode 100644 index 0000000..9b0d46e --- /dev/null +++ b/scribo/scribo/inverse_video/choose.hh @@ -0,0 +1,118 @@ +// Copyright (C) 2011 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_CHOOSE_HH +# define SCRIBO_INVERSE_VIDEO_CHOOSE_HH + +/// \file +/// +/// \brief Choose beetwen two lines. + +# include <scribo/core/line_set.hh> +# include <scribo/inverse_video/nb_comps.hh> +# include <scribo/inverse_video/ratio_area.hh> +# include <iostream> + +namespace scribo +{ + + namespace inverse_video + { + /// Choose the most meaningful line between two. + /*! + ** \param[in] input The input image. + ** \param[in] line The first line. + ** \param[in] line_inverse The second line + ** + ** \return void + */ + template <typename L, typename I> + static inline + void + choose (mln::image2d& input, + scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse); + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + template <typename I, typename L> + static inline + void + handle_score (double score, + I& image, + scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse) + { + if (score > 0.5) + { + mln::draw::box(image, line.bbox(), mln::literal::green); + mln::draw::box(image, line_inverse.bbox(), mln::literal::red); + line_inverse.update_tag(scribo::line::Ignored); + line_inverse.set_hidden(true); + std::cout << "normal choosed" << std::endl; + } + else + { + mln::draw::box(image, line_inverse.bbox(), mln::literal::green); + mln::draw::box(image, line.bbox(), mln::literal::red); + line.update_tag(scribo::line::Ignored); + line.set_hidden(true); + std::cout << "inverse choosed" << std::endl; + } + } + } // end of namespace scribo::text::internal + + template <typename L, typename I> + static inline + void + choose (mln::image2d& input, + scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse) + { + mln::trace::entering("scribo::inverse_video::choose"); + + double score = 0; + + double score_nb_comps = scribo::inverse_video::nb_comps(line, line_inverse); + double score_ratio_area = scribo::inverse_video::ratio_area(line, line_inverse); + + score = + score_nb_comps * 0.5 + + score_ratio_area * 0.5; + + scribo::inverse_video::internal::handle_score (score, input, line, line_inverse); + + mln::trace::exiting("scribo::inverse_video::choose"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::inverse_video + +} // end of namespace scribo + +#endif // ! SCRIBO_INVERSE_VIDEO_CHOOSE_HH diff --git a/scribo/scribo/inverse_video/handle_collisions.hh b/scribo/scribo/inverse_video/handle_collisions.hh index 4a772c3..3d27599 100644 --- a/scribo/scribo/inverse_video/handle_collisions.hh +++ b/scribo/scribo/inverse_video/handle_collisions.hh @@ -44,14 +44,14 @@ namespace scribo { template <typename I, - typename L, - typename F> + typename L> void - handle_collisions(const image2d& input, + handle_collisions(image2d& input, scribo::line_set<L>& ls1, scribo::line_set<L>& ls2, - F choose); - + void (*choose)(image2d&, + scribo::line_info<L>&, + scribo::line_info<L>&)); # ifndef MLN_INCLUDE_ONLY namespace internal @@ -90,7 +90,8 @@ namespace scribo handle_collisions(image2d& input, scribo::line_set<L>& ls1, scribo::line_set<L>& ls2, - void (*choose)(scribo::line_info<L>&, + void (*choose)(image2d&, + scribo::line_info<L>&, scribo::line_info<L>&)) { mln::trace::entering("scribo::inverse_video::handle_collisions"); @@ -158,7 +159,7 @@ namespace scribo || !l_tested.is_valid() || l_tested.is_hidden()) continue; - choose(ls(l), l_tested); + choose(input, ls(l), l_tested); if (ls(l).is_hidden()) break; diff --git a/scribo/scribo/inverse_video/nb_comps.hh b/scribo/scribo/inverse_video/nb_comps.hh new file mode 100644 index 0000000..e067d1a --- /dev/null +++ b/scribo/scribo/inverse_video/nb_comps.hh @@ -0,0 +1,103 @@ +// Copyright (C) 2011 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_NB_COMPS_HH +# define SCRIBO_INVERSE_VIDEO_NB_COMPS_HH + +/// \file +/// +/// \brief Choose beetwen two lines according to the number of +/// components they have. + +# include <scribo/core/line_set.hh> + +namespace scribo +{ + + namespace inverse_video + { + /// Count the number of big enough components in each line and + /// choose the one which have the most. + /*! + ** \param[in] line The first line. + ** \param[in] line_inverse The second line + ** + ** \return A double : if it is close to 0, it means the second line is + ** more likely to be the right one. As opposite, if it is closer + ** to 1, it means the first one should be the good one. + */ + template <typename L> + double + nb_comps (scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse); + +# ifndef MLN_INCLUDE_ONLY + + template <typename L> + double + nb_comps (scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse) + { + mln::trace::entering("scribo::inverse_video::nb_comps"); + unsigned max_normal = 0; + unsigned nb_comps_normal = 0; + unsigned max_inverse = 0; + unsigned nb_comps_inverse = 0; + + + const scribo::component_set<L> comps_normal = line.holder ().components (); + const scribo::component_set<L> comps_inverse = line_inverse.holder ().components (); + + + for (unsigned i = 0; i < line.component_ids().nelements(); ++i) + if (comps_normal((line.component_ids())[i]).bbox().nsites() > max_normal) + max_normal = comps_normal((line.component_ids())[i]).bbox().nsites(); + + for (unsigned i = 0; i < line_inverse.component_ids().nelements(); ++i) + if (comps_inverse((line_inverse.component_ids())[i]).bbox().nsites() > max_inverse) + max_inverse = comps_inverse((line_inverse.component_ids())[i]).bbox().nsites(); + + + + for (unsigned i = 0; i < line.component_ids().nelements(); ++i) + if (comps_normal((line.component_ids())[i]).bbox().nsites() > max_normal / 30) + ++nb_comps_normal; + + for (unsigned i = 0; i < line_inverse.component_ids().nelements(); ++i) + if (comps_inverse((line_inverse.component_ids())[i]).bbox().nsites() > max_inverse / 30) + ++nb_comps_inverse; + + + mln::trace::exiting("scribo::inverse_video::nb_comps"); + return (double)(nb_comps_normal) / (double)((nb_comps_normal + nb_comps_inverse)); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::inverse_video + +} // end of namespace scribo + +#endif // ! SCRIBO_INVERSE_VIDEO_NB_COMPS_HH diff --git a/scribo/scribo/inverse_video/ratio_area.hh b/scribo/scribo/inverse_video/ratio_area.hh new file mode 100644 index 0000000..db39f36 --- /dev/null +++ b/scribo/scribo/inverse_video/ratio_area.hh @@ -0,0 +1,93 @@ +// Copyright (C) 2011 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_RATIO_AREA_HH +# define SCRIBO_INVERSE_VIDEO_RATIO_AREA_HH + +/// \file +/// +/// \brief Choose beetwen two lines according to the ratio of +/// components area on the total area. + +# include <scribo/core/line_set.hh> + +namespace scribo +{ + + namespace inverse_video + { + /// Choose the line where the ratio of components area is the highest + /*! + ** \param[in] line The first line. + ** \param[in] line_inverse The second line + ** + ** \return A double : if it is close to 0, it means the second line is + ** more likely to be the right one. As opposite, if it is closer + ** to 1, it means the first one should be the good one. + */ + template <typename L> + double + ratio_area (scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse); + +# ifndef MLN_INCLUDE_ONLY + + template <typename L> + double + ratio_area (scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse) + { + mln::trace::entering("scribo::inverse_video::ratio_area"); + + double area_comps_normal = 0; + double area_comps_inverse = 0; + + const scribo::component_set<L> comps_normal = line.holder ().components (); + const scribo::component_set<L> comps_inverse = line_inverse.holder ().components (); + + const mln::util::array<scribo::component_id_t>& comps_id_normal = line.component_ids(); + const mln::util::array<scribo::component_id_t>& comps_id_inverse = line_inverse.component_ids(); + + for (unsigned i = 0; i < comps_id_normal.nelements(); ++i) + area_comps_normal += comps_normal(comps_id_normal[i]).bbox().nsites(); + + for (unsigned i = 0; i < comps_id_inverse.nelements(); ++i) + area_comps_inverse += comps_inverse(comps_id_inverse[i]).bbox().nsites(); + + area_comps_inverse /= line_inverse.bbox().nsites(); + area_comps_normal /= line.bbox().nsites(); + + mln::trace::exiting("scribo::inverse_video::ratio_area"); + + return (area_comps_normal / (area_comps_normal + area_comps_inverse)); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::inverse_video + +} // end of namespace scribo + +#endif // ! SCRIBO_INVERSE_VIDEO_RATIO_AREA_HH -- 1.5.6.5

12 years, 11 months

branch coddy updated: last-svn-commit-831-g48ee1a9

by git＠lrde.epita.fr

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 48ee1a9e41f4ae7bbea18551d5cf69bc88e82ac0 (commit) from 9a5768720038f180173bc7c600fdf6b77bbfe7ab (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 ----------------------------------------------------------------- 48ee1a9 Bug corrected, several improvements, interface modified. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 6 +++ scribo/scribo/inverse_video/handle_collisions.hh | 50 +++++++-------------- 2 files changed, 23 insertions(+), 33 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 11 months

last-svn-commit-831-g48ee1a9 Bug corrected, several improvements, interface modified.

by Coddy Levi

* scribo/inverse_video/handle_collisions.hh: Here. --- scribo/ChangeLog | 6 +++ scribo/scribo/inverse_video/handle_collisions.hh | 50 +++++++-------------- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e868468..0c7b65f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2011-05-26 Coddy Levi <levi(a)lrde.epita.fr> + + Bug corrected, several improvements, interface modified. + + * scribo/inverse_video/handle_collisions.hh: Here. + 2011-05-25 Coddy Levi <levi(a)lrde.epita.fr> New algorithm to detect superpositions between two line sets. diff --git a/scribo/scribo/inverse_video/handle_collisions.hh b/scribo/scribo/inverse_video/handle_collisions.hh index 54e585c..4a772c3 100644 --- a/scribo/scribo/inverse_video/handle_collisions.hh +++ b/scribo/scribo/inverse_video/handle_collisions.hh @@ -81,18 +81,17 @@ namespace scribo 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> + template <typename I, typename L> void handle_collisions(image2d& input, scribo::line_set<L>& ls1, scribo::line_set<L>& ls2, - F choose) + void (*choose)(scribo::line_info<L>&, + scribo::line_info<L>&)) { mln::trace::entering("scribo::inverse_video::handle_collisions"); @@ -122,7 +121,7 @@ namespace scribo : v[i]; if (!scribo::text::internal::looks_like_a_text_line(ls(l)) - || !ls(l).is_valid()) + || !ls(l).is_valid() || ls(l).is_hidden()) continue; unsigned tl, tr, bl, br; @@ -136,11 +135,10 @@ namespace scribo std::set<unsigned> labels; labels.insert(tl); - labels.insert(tl); + labels.insert(tr); labels.insert(bl); labels.insert(br); - bool chosen = true; for (std::set<unsigned>::const_iterator it = labels.begin(); it != labels.end(); ++it) @@ -150,38 +148,24 @@ namespace scribo bool inverse_video_tested = (*it > ls1_size); - const scribo::line_info<L>& l_tested = + if (inverse_video_tested == inverse_video) + break; + + 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()) + || !l_tested.is_valid() || l_tested.is_hidden()) 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); - }*/ + choose(ls(l), l_tested); + + if (ls(l).is_hidden()) + break; } - scribo::text::internal::draw_box(billboard, b, v[i]); + if (!ls(l).is_hidden()) + scribo::text::internal::draw_box(billboard, b, v[i]); } mln::trace::exiting("scribo::inverse_video::handle_collisions"); -- 1.5.6.5

12 years, 11 months

branch icdar/hdlac2011 updated: last-svn-commit-898-gd777dff

by git＠lrde.epita.fr

12 years, 11 months

last-svn-commit-898-gd777dff Paragraphs closing

by Julien Marquegnies

--- scribo/scribo/core/line_info.hh | 2 - scribo/scribo/core/paragraph_info.hh | 18 +++ scribo/scribo/core/paragraph_set.hh | 84 +++++++++++- scribo/scribo/core/stats.hh | 40 ++++-- scribo/scribo/draw/line_components.hh | 113 ++++++++++++++++ scribo/scribo/text/paragraphs.hh | 65 +--------- scribo/scribo/text/paragraphs_closing.hh | 208 ++++++++++++++++++++++++++++++ 7 files changed, 443 insertions(+), 87 deletions(-) create mode 100644 scribo/scribo/draw/line_components.hh create mode 100644 scribo/scribo/text/paragraphs_closing.hh diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 9017174..9320416 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -61,8 +61,6 @@ # include <scribo/core/internal/sort_comp_ids.hh> # include <scribo/core/concept/serializable.hh> -// DEBUG - # include <scribo/core/stats.hh> namespace scribo diff --git a/scribo/scribo/core/paragraph_info.hh b/scribo/scribo/core/paragraph_info.hh index af619dd..90db7da 100644 --- a/scribo/scribo/core/paragraph_info.hh +++ b/scribo/scribo/core/paragraph_info.hh @@ -76,6 +76,9 @@ namespace scribo bool needs_stats_update() const; void force_stats_update(); + void set_delta_baseline(const int delta_baseline); + int delta_baseline() const; + private: mln::util::array<line_id_t> line_ids_; mln::accu::shape::bbox<mln_site(L)> bbox_; @@ -84,6 +87,7 @@ namespace scribo mln::value::rgb8 color_; float color_reliability_; + int delta_baseline_; bool needs_stats_update_; bool is_valid_; }; @@ -259,6 +263,20 @@ namespace scribo } template <typename L> + void + paragraph_info<L>::set_delta_baseline(const int delta_baseline) + { + delta_baseline_ = delta_baseline; + } + + template <typename L> + int + paragraph_info<L>::delta_baseline() const + { + return delta_baseline_; + } + + template <typename L> bool operator==(const paragraph_info<L>& lhs, const paragraph_info<L>& rhs) { diff --git a/scribo/scribo/core/paragraph_set.hh b/scribo/scribo/core/paragraph_set.hh index 65e17c6..9214f20 100644 --- a/scribo/scribo/core/paragraph_set.hh +++ b/scribo/scribo/core/paragraph_set.hh @@ -33,6 +33,7 @@ # include <scribo/core/line_links.hh> # include <scribo/core/line_set.hh> # include <scribo/core/paragraph_info.hh> +# include <scribo/core/stats.hh> # include <scribo/core/concept/serializable.hh> # include <scribo/core/tag/paragraph.hh> @@ -106,7 +107,8 @@ namespace scribo /// \brief Construct a paragraph set from line links information. template <typename L> scribo::paragraph_set<L> - paragraph(const line_links<L>& llinks); + paragraph(const line_links<L>& llinks, + const line_links<L>& rlinks); /// \brief Construct a paragraph set from line set information. template <typename L> @@ -267,24 +269,62 @@ namespace scribo unsigned find_root(line_links<L>& parent, unsigned x) { - if (parent(x) == x) - return x; - else - return parent(x) = find_root(parent, parent(x)); + unsigned tmp_x = x; + + while (parent(tmp_x) != tmp_x) + tmp_x = parent(tmp_x); + + while (parent(x) != x) + { + const unsigned tmp = parent(x); + x = parent(x); + parent(tmp) = tmp_x; + } + + return x; + } + + template <typename L> + inline + void + set_root(line_links<L>& parent, unsigned x, const unsigned root) + { + while (parent(x) != x && parent(x) != root) + { + const unsigned tmp = parent(x); + x = parent(x); + parent(tmp) = root; + } + + parent(x) = root; } + } // end of namespace scribo::make::internal // FIXME: move that code into paragraph_set constructor? template <typename L> scribo::paragraph_set<L> - paragraph(const line_links<L>& llinks) + paragraph(const line_links<L>& llinks, + const line_links<L>& rlinks) { line_links<L> links = llinks.duplicate(); for_all_links(l, links) + { + const line_id_t current_neighbor = llinks(l); links(l) = internal::find_root(links, l); + const line_id_t root_index = links(l); + + for (unsigned j = 0; j < rlinks.nelements(); ++j) + { + if (l != j && + current_neighbor != l && + rlinks(j) == l) + internal::set_root(links, j, root_index); + } + } unsigned npars; mln::fun::i2v::array<unsigned> @@ -301,7 +341,37 @@ namespace scribo } for_all_paragraphs(p, parset) - parset(p).force_stats_update(); + { + paragraph_info<L>& current_par = parset(p); + stats< float > delta(current_par.nlines()); + + // Update stats + current_par.force_stats_update(); + + // Compute paragraph's delta baseline + const mln::util::array<line_id_t>& line_ids = current_par.line_ids(); + const unsigned nelements = line_ids.nelements(); + + for (unsigned i = 0; i < nelements; ++i) + { + const line_id_t& current_id = line_ids(i); + + if (llinks(current_id) != current_id) + { + const line_info<L>& current_line = lines(current_id); + const line_info<L>& left_line = lines(llinks(current_id)); + + delta.take(left_line.baseline() - current_line.baseline()); + } + } + + int median = delta.median(); + + if (!median) + median = lines(current_par.line_ids()(0)).x_height(); + + current_par.set_delta_baseline(median); + } return parset; } diff --git a/scribo/scribo/core/stats.hh b/scribo/scribo/core/stats.hh index ea00da9..0fcb983 100644 --- a/scribo/scribo/core/stats.hh +++ b/scribo/scribo/core/stats.hh @@ -79,10 +79,13 @@ public: { mean_ = 0; - for (unsigned i = 0; i < size_; ++i) - mean_ += data_[i]; + if (size_ > 0) + { + for (unsigned i = 0; i < size_; ++i) + mean_ += data_[i]; - mean_ /= size_; + mean_ /= size_; + } mean_needs_update_ = false; } @@ -93,10 +96,16 @@ public: { if (median_needs_update_) { - std::vector< T >& data = data_.hook_std_vector_(); - std::sort(data.begin(), data.end(), compare_values< T >()); + median_ = 0; + + if (size_ > 0) + { + std::vector< T >& data = data_.hook_std_vector_(); + std::sort(data.begin(), data.end(), compare_values< T >()); + + median_ = data[(size_ - 1) >> 1]; + } - median_ = data[(size_ - 1) >> 1]; median_needs_update_ = false; } @@ -110,15 +119,18 @@ public: mean(); variance_ = 0; - for (unsigned i = 0; i < size_; ++i) + if (size_ > 0) { - const T tmp = mean_ - data_[i]; + for (unsigned i = 0; i < size_; ++i) + { + const T tmp = mean_ - data_[i]; - variance_ += (tmp * tmp); - } + variance_ += (tmp * tmp); + } - variance_ /= size_; - std_ = sqrt(variance_); + variance_ /= size_; + std_ = sqrt(variance_); + } variance_needs_update_ = false; std_needs_update_ = false; @@ -135,8 +147,8 @@ public: return std_; } - T min() { return min_; } - T max() { return max_; } + T min() { return (size_ > 0) ? min_ : 0; } + T max() { return (size_ > 0) ? max_ : 0; } void sort() { diff --git a/scribo/scribo/draw/line_components.hh b/scribo/scribo/draw/line_components.hh new file mode 100644 index 0000000..878b2c1 --- /dev/null +++ b/scribo/scribo/draw/line_components.hh @@ -0,0 +1,113 @@ +// Copyright (C) 2009, 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_DRAW_LINE_COMPONENTS_HH +# define SCRIBO_DRAW_LINE_COMPONENTS_HH + +/// \file +/// +/// Draw the components of a line +# include <mln/util/object_id.hh> + +# include <scribo/core/line_set.hh> +# include <scribo/core/component_set.hh> + + +namespace scribo +{ + namespace draw + { + + using namespace mln; + + template <typename L, typename I> + void + line_components(Image& input_, + const line_info<L>& line, + const mln_value(I)& value); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L, typename I> + void + line_components(Image& input_, + const line_info<L>& line, + const mln_value(I)& value) + { + trace::entering("scribo::draw::line_components"); + + I& input = exact(input_); + + mln_precondition(input.is_valid()); + + const line_set<L>& holder = line.holder(); + const component_set<L>& comp_set = holder.components(); + const L& labeled_image = holder.components().labeled_image(); + + const mln::util::array<component_id_t>& component_ids = line.component_ids(); + + for_all_elements(i, component_ids) + { + const unsigned c = component_ids(i); + const mln_value(L) v = c; + const box2d& bbox = comp_set(c).bbox(); + + const unsigned index = labeled_image.index_of_point(bbox.pmin()); + const unsigned index2 = input.index_of_point(bbox.pmin()); + const mln_value(L)* ptr_in = &(labeled_image.element(index)); + mln_value(I)* ptr_out = &(input.element(index2)); + const unsigned nrows = bbox.height(); + const unsigned ncols = bbox.width(); + const int delta = labeled_image.delta_index(dpoint2d(+1, -ncols)); + const int delta2 = input.delta_index(dpoint2d(+1, -ncols)); + + for (unsigned k = 0; k < nrows; ++k) + { + for (unsigned j = 0; j < ncols; ++j) + { + if (*ptr_in == v) + *ptr_out = value; + ++ptr_out; + ++ptr_in; + } + + ptr_out += delta2; + ptr_in += delta; + } + } + + trace::exiting("scribo::draw::line_components"); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::draw +} // end of namespace scribo + +#endif // ! SCRIBO_DRAW_LINE_COMPONENTS_HH diff --git a/scribo/scribo/text/paragraphs.hh b/scribo/scribo/text/paragraphs.hh index 37817af..620faa7 100644 --- a/scribo/scribo/text/paragraphs.hh +++ b/scribo/scribo/text/paragraphs.hh @@ -23,50 +23,6 @@ using namespace mln; namespace scribo { - - namespace internal - { - -//------------------------------------- -// Extracting root of links -//------------------------------------- - template <typename L> - inline - unsigned - find_root(line_links<L>& parent, unsigned x) - { - unsigned tmp_x = x; - - while (parent(tmp_x) != tmp_x) - tmp_x = parent(tmp_x); - - while (parent(x) != x) - { - const unsigned tmp = parent(x); - x = parent(x); - parent(tmp) = tmp_x; - } - - return x; - } - - template <typename L> - inline - void - set_root(line_links<L>& parent, unsigned x, const unsigned root) - { - while (parent(x) != x && parent(x) != root) - { - const unsigned tmp = parent(x); - x = parent(x); - parent(tmp) = root; - } - - parent(x) = root; - } - - } - namespace filter { @@ -799,25 +755,6 @@ namespace scribo } } - // Post link processing - - const line_links<L> backup = output.duplicate(); - for (unsigned i = 0; i < output.nelements(); ++i) - { - const line_id_t current_neighbor = backup(i); - output(i) = scribo::internal::find_root(output, i); - const line_id_t root_index = output(i); - - for (unsigned j = 0; j < right.nelements(); ++j) - { - if (i != j && - current_neighbor != i && - right(j) == i) - scribo::internal::set_root(output, j, root_index); - } - } - - // Only debug // { // image2d<value::rgb8> debug = data::convert(value::rgb8(), input); @@ -1352,7 +1289,7 @@ namespace scribo // std::cout << "Extracting paragraphs" << std::endl; filter::paragraph_links(left, right, output, lines); - paragraph_set<L> par_set = make::paragraph(output); + paragraph_set<L> par_set = make::paragraph(output, right); return par_set; } } diff --git a/scribo/scribo/text/paragraphs_closing.hh b/scribo/scribo/text/paragraphs_closing.hh new file mode 100644 index 0000000..ec1d5c8 --- /dev/null +++ b/scribo/scribo/text/paragraphs_closing.hh @@ -0,0 +1,208 @@ +// Copyright (C) 2009, 2010, 2011 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_TEXT_PARAGRAPHS_CLOSING_HH +# define SCRIBO_TEXT_PARAGRAPHS_CLOSING_HH + +/// \file +/// +/// Paragraphs closing using CRLA. + +namespace scribo +{ + + namespace text + { + + using namespace mln; + + template< typename L, typename V > + void + paragraphs_closing(image2d<V>& output, + const paragraph_set<L>& par_set, + const box2d& domain); + +# ifndef MLN_INCLUDE_ONLY + + template< typename V > + inline + void horizontal_CRLA(const image2d<V>& input, + image2d<V>& output, + const mln::util::array<int>& deltas) + { + mln_piter(image2d<V>) p(input.domain()); + int count = 0; + unsigned nrows = input.nrows(); + unsigned ncols = input.ncols(); + V last_pixel_value = 0; + + for (unsigned i = 0; i < nrows; ++i) + { + for (unsigned j = 0; j < ncols; ++j) + { + const V& current_pixel = input.at_(i, j); + + if (!current_pixel) + { + if (last_pixel_value) + { + unsigned k = j + 1; + for (; !input.at_(i, k) && (k < ncols); ++k); + + count = k - j; + const int threshold = deltas(last_pixel_value - 1); + + if (last_pixel_value == input.at_(i, k) && count < threshold) + for (unsigned l = j; l <= k; ++l) + output.at_(i, l) = last_pixel_value; + + j = k; + last_pixel_value = 0; + } + } + else + { + output.at_(i, j) = current_pixel; + last_pixel_value = current_pixel; + } + } + } + } + + template< typename V > + inline + void vertical_CRLA(const image2d<V>& input, + image2d<V>& output, + const mln::util::array<int>& deltas) + { + mln_piter(image2d<V>) p(input.domain()); + int count = 0; + unsigned nrows = input.nrows(); + unsigned ncols = input.ncols(); + V last_pixel_value = 0; + + for (unsigned j = 0; j < ncols; ++j) + { + for (unsigned i = 0; i < nrows; ++i) + { + const V& current_pixel = input.at_(i, j); + + if (!current_pixel) + { + if (last_pixel_value) + { + unsigned k = i + 1; + for (; !input.at_(k, j) && (k < nrows); ++k); + + count = k - i; + const int threshold = deltas(last_pixel_value - 1); + + if (last_pixel_value == input.at_(k, j) + && count < threshold) + for (unsigned l = i; l <= k; ++l) + output.at_(l, j) = last_pixel_value; + + i = k; + last_pixel_value = 0; + } + } + else + { + output.at_(i, j) = current_pixel; + last_pixel_value = current_pixel; + } + } + } + } + + template< typename V > + inline + void CRLA(const image2d<V>& input, + image2d<V>& output, + const mln::util::array<int>& deltas, + const mln::util::array<int>& deltas_factor) + { + horizontal_CRLA(input, output, deltas_factor); + vertical_CRLA(output, output, deltas); + horizontal_CRLA(output, output, deltas_factor); + } + + template< typename L, typename V > + void + paragraphs_closing(image2d<V>& output, + const paragraph_set<L>& par_set, + const box2d& domain) + { + trace::entering("scribo::text::paragraphs_closing"); + + image2d<V> debug(domain); + + mln::util::array<int> deltas; + deltas.reserve(par_set.nelements()); + mln::util::array<int> deltas_factor; + deltas_factor.reserve(par_set.nelements()); + + data::fill(debug, 0); + data::fill(output, 0); + + const line_set<L>& lines = par_set.lines(); + + for_all_paragraphs(p, par_set) + { + const paragraph_info<L>& current_par = par_set(p); + const mln::util::array<line_id_t>& line_ids = current_par.line_ids(); + const unsigned nelements = line_ids.nelements(); + + for (unsigned i = 0; i < nelements; ++i) + { + const line_id_t& line_id = line_ids(i); + const line_info<L>& current_line = lines(line_id); + + draw::line_components(debug, current_line, p); + } + + int delta_baseline = current_par.delta_baseline(); + + if (delta_baseline % 2 == 0) + --delta_baseline; + + deltas.append(delta_baseline); + deltas_factor.append(3 * delta_baseline); + } + CRLA(debug, output, deltas, deltas_factor); + + trace::exiting("scribo::draw::line_components"); + } + +# endif + + } // end of namespace scribo::text + +} // end of namespace scribo + + +#endif // ! SCRIBO_TEXT_PARAGRAPHS_CLOSING_HH + -- 1.5.6.5

12 years, 11 months

branch icdar/hdlac2011 updated: last-svn-commit-897-g7415119

by lazzara＠lrde.epita.fr

12 years, 11 months

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

by Guillaume Lazzara

--- 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 <z(a)lrde.epita.fr> + * scribo/util/component_precise_outline.hh: Fix namespace + ambiguity. + +2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + 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

12 years, 11 months

branch icdar/hdlac2011 updated: last-svn-commit-896-g58b6a66

by lazzara＠lrde.epita.fr

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 discards 118f203ff8c90a367f78502c3b5ecc1883180f86 (commit) discards 12da563c7ea1fba00e47b8cdb9adf526421218d2 (commit) discards ebfb6d5d15d50abe54ce41cb88b243c7b03b1935 (commit) via 58b6a662ab8baecf54514930cebe761fbd9e0e32 (commit) via 46636f57bf3f360ae661412a50f2b2a808e14f90 (commit) via 3a15c0260477b4d491a594cc852f8994dd1eef1d (commit) via 532805f671d39082c9c62414be4c3266e03609bf (commit) via 9f7843c9c01df078d600f898bf0ea5d2398aebd1 (commit) via 0a594b3dad7545235b2997ea4ba4547363f4c1ab (commit) via eb7b2bd077b0fc4256545e37e19af37ed9c4d25e (commit) via e32f2ebf7a08cee79f727ac55ea902dbd58cd515 (commit) via 1d411c7c9dd03993cf3e45f9e2835bba1d1b6e5d (commit) via e06be54cf5ffe080b2268704caf56e2962ff4d2c (commit) via f28dd55983ff67c868ef37ddecfc7a29da91c61f (commit) via 02ab025088bb3639de1f2d934900311915267254 (commit) via efa07ad7381d92b81cc58e2b0acb780f3922be6e (commit) via 0d80a703e96d8c16a09f592f4dfa2846eadd696e (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (118f203ff8c90a367f78502c3b5ecc1883180f86) \ N -- N -- N (58b6a662ab8baecf54514930cebe761fbd9e0e32) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 58b6a66 Improve XML output. 46636f5 Improve and cleanup Results in hdoc toolchain. 3a15c02 scribo/primitive/extract/lines_h_thick_and_thin.hh: Improve result quality. 532805f Add new hooks in toolchain functors. 9f7843c scribo/util/component_precise_outline.hh: New. Precise component outline extraction. 0a594b3 Add new element filters. eb7b2bd Add util::box_intersection. e32f2eb mln/draw/site_set.hh: new. 1d411c7 Various small fixes in Scribo. e06be54 Introduce paragraph_id_t type. f28dd55 Share document structure data. 02ab025 Deep modifications and clean correction of the previous bug. efa07ad Further correction of the component outlining bug. 0d80a70 Correct a bug in the compononent outlining algorithm. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 + milena/mln/draw/site_set.hh | 88 ++++++ scribo/ChangeLog | 104 +++++++ scribo/scribo/core/document.hh | 171 +++++++---- scribo/scribo/core/paragraph_info.hh | 15 +- scribo/scribo/core/paragraph_set.hh | 49 +++- scribo/scribo/core/tag/line.hh | 2 +- scribo/scribo/core/tag/paragraph.hh | 43 +++ scribo/scribo/debug/line_info_image.hh | 5 +- scribo/scribo/filter/images_in_paragraph.hh | 119 ++++++++ scribo/scribo/filter/object_links_bbox_overlap.hh | 25 +-- scribo/scribo/filter/paragraphs_bbox_overlap.hh | 176 +++++++++++ scribo/scribo/filter/paragraphs_in_image.hh | 129 ++++++++ scribo/scribo/filter/separators_in_element.hh | 151 ++++++++++ scribo/scribo/filter/separators_in_paragraph.hh | 151 ++++++++++ scribo/scribo/io/img/internal/debug_img_visitor.hh | 130 +++++---- scribo/scribo/io/img/internal/full_img_visitor.hh | 42 ++-- .../io/xml/internal/extended_page_xml_visitor.hh | 81 +++--- scribo/scribo/io/xml/internal/full_xml_visitor.hh | 79 +++--- scribo/scribo/io/xml/internal/page_xml_visitor.hh | 58 ++-- scribo/scribo/primitive/extract/alignments.hh | 12 +- .../primitive/extract/lines_h_thick_and_thin.hh | 16 +- scribo/scribo/primitive/extract/lines_pattern.hh | 2 +- scribo/scribo/primitive/extract/non_text_hdoc.hh | 34 ++- .../primitive/extract/separators_nonvisible.hh | 6 +- .../scribo/primitive/group/from_double_link_any.hh | 7 +- scribo/scribo/text/link_lines.hh | 2 +- scribo/scribo/text/merging.hh | 37 ++- scribo/scribo/text/paragraphs.hh | 18 +- .../toolchain/internal/content_in_doc_functor.hh | 4 + .../toolchain/internal/content_in_hdoc_functor.hh | 201 +++++++------- .../toolchain/internal/text_in_doc_functor.hh | 4 + .../internal/text_in_doc_preprocess_functor.hh | 53 ++++- .../scribo/toolchain/internal/toolchain_functor.hh | 28 ++- scribo/scribo/util/box_intersection.hh | 85 ++++++ scribo/scribo/util/component_precise_outline.hh | 309 ++++++++++++++++++++ .../primitive/extract/lines_h_thick_and_thin.cc | 1 + scribo/tests/primitive/extract/Makefile.am | 2 +- 38 files changed, 2007 insertions(+), 436 deletions(-) create mode 100644 milena/mln/draw/site_set.hh create mode 100644 scribo/scribo/core/tag/paragraph.hh create mode 100644 scribo/scribo/filter/images_in_paragraph.hh create mode 100644 scribo/scribo/filter/paragraphs_bbox_overlap.hh create mode 100644 scribo/scribo/filter/paragraphs_in_image.hh create mode 100644 scribo/scribo/filter/separators_in_element.hh create mode 100644 scribo/scribo/filter/separators_in_paragraph.hh create mode 100644 scribo/scribo/util/box_intersection.hh create mode 100644 scribo/scribo/util/component_precise_outline.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 11 months

last-svn-commit-896-g58b6a66 Improve XML output.

by Guillaume Lazzara

* scribo/io/img/internal/debug_img_visitor.hh, * scribo/io/img/internal/full_img_visitor.hh, * scribo/io/xml/internal/page_xml_visitor.hh: Save element outlines and do not save invalid elements. --- scribo/ChangeLog | 9 ++ scribo/scribo/io/img/internal/debug_img_visitor.hh | 130 ++++++++++---------- scribo/scribo/io/img/internal/full_img_visitor.hh | 42 ++++--- scribo/scribo/io/xml/internal/page_xml_visitor.hh | 7 +- 4 files changed, 103 insertions(+), 85 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ecece77..47b8473 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve XML output. + + * scribo/io/img/internal/debug_img_visitor.hh, + * scribo/io/img/internal/full_img_visitor.hh, + * scribo/io/xml/internal/page_xml_visitor.hh: Save element + outlines and do not save invalid elements. + +2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve and cleanup Results in hdoc toolchain. * scribo/primitive/extract/non_text_hdoc.hh: Make parameters diff --git a/scribo/scribo/io/img/internal/debug_img_visitor.hh b/scribo/scribo/io/img/internal/debug_img_visitor.hh index 7d1d3d7..a4715f5 100644 --- a/scribo/scribo/io/img/internal/debug_img_visitor.hh +++ b/scribo/scribo/io/img/internal/debug_img_visitor.hh @@ -34,7 +34,7 @@ # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> -# include <mln/draw/box.hh> +# include <mln/draw/site_set.hh> # include <mln/subsampling/antialiased.hh> # include <mln/morpho/elementary/gradient_external.hh> @@ -43,8 +43,11 @@ # include <scribo/core/paragraph_set.hh> # include <scribo/core/line_info.hh> +# include <scribo/util/component_precise_outline.hh> # include <scribo/io/img/internal/draw_edges.hh> + + namespace scribo { @@ -82,8 +85,8 @@ namespace scribo mln::image2d<value::rgb8>& output; unsigned output_ratio; - mutable image2d<scribo::def::lbl_type> elt_edge; - + // FIXME: we would like its type to be L. + mutable image2d<scribo::def::lbl_type> lbl_sub; private: // Methods box2d compute_bbox(const box2d& b) const; @@ -130,51 +133,57 @@ namespace scribo { // Prepare element edges - L lbl = duplicate(doc.elements().labeled_image()); - for_all_comps(c, doc.elements()) - if (! doc.elements()(c).is_valid()) - data::fill(((lbl | doc.elements()(c).bbox()).rw() - | (pw::value(lbl) == pw::cst(c))).rw(), 0); + // L lbl = duplicate(doc.elements().labeled_image()); + // for_all_comps(c, doc.elements()) + // if (! doc.elements()(c).is_valid()) + // data::fill(((lbl | doc.elements()(c).bbox()).rw() + // | (pw::value(lbl) == pw::cst(c))).rw(), 0); - // FIXME: UGLY! Too slow! - scribo::def::lbl_type nlabels; - component_set<L> elts = primitive::extract::components( - data::convert(bool(), mln::subsampling::antialiased(lbl, output_ratio)), - c8(), - nlabels); + // const L& lbl = doc.lines().components().labeled_image(); + // lbl_sub = mln::subsampling::antialiased(lbl, output_ratio); - // Preserving elements tags - if (doc.elements().nelements() != elts.nelements()) - { - std::cerr << "Warnig: could not preserve element type in " - << "img debug output." << std::endl; - std::cerr << "The number of non text element has changed while " - << "subsampling images : " - << doc.elements().nelements() << " vs " - << elts.nelements() << std::endl; - } - else - for_all_comps(c, doc.elements()) - { - elts(c).update_type(doc.elements()(c).type()); - elts(c).update_tag(doc.elements()(c).tag()); - } + // mln::io::pgm::save(data::wrap(value::int_u8(), lbl), "lbl.pgm"); + // mln::io::pgm::save(data::wrap(value::int_u8(), lbl_sub), "lbl_sub.pgm"); - elt_edge = morpho::elementary::gradient_external(elts.labeled_image(), c8()); + // // FIXME: UGLY! Too slow! + // scribo::def::lbl_type nlabels; + // component_set<L> elts = primitive::extract::components( + // data::convert(bool(), lbl_sub), + // c8(), + // nlabels); - for_all_comps(e, elts) - if (elts(e).is_valid()) - elts(e).accept(*this); + // Preserving elements tags + // if (doc.elements().nelements() != elts.nelements()) + // { + // std::cerr << "Warnig: could not preserve element type in " + // << "img debug output." << std::endl; + // std::cerr << "The number of non text element has changed while " + // << "subsampling images : " + // << doc.elements().nelements() << " vs " + // << elts.nelements() << std::endl; + // } + // else + // for_all_comps(c, doc.elements()) + // { + // elts(c).update_type(doc.elements()(c).type()); + // elts(c).update_tag(doc.elements()(c).tag()); + // } + + for_all_comps(e, doc.elements()) + if (doc.elements()(e).is_valid()) + doc.elements()(e).accept(*this); } // line seraparators if (doc.has_vline_seps()) for_all_comps(c, doc.vline_seps_comps()) - doc.vline_seps_comps()(c).accept(*this); + if (doc.vline_seps_comps()(c).is_valid()) + doc.vline_seps_comps()(c).accept(*this); if (doc.has_hline_seps()) for_all_comps(c, doc.hline_seps_comps()) - doc.hline_seps_comps()(c).accept(*this); + if (doc.hline_seps_comps()(c).is_valid()) + doc.hline_seps_comps()(c).accept(*this); } @@ -185,13 +194,19 @@ namespace scribo void debug_img_visitor::visit(const component_info<L>& info) const { + // Getting component outline + scribo::def::lbl_type id = (scribo::def::lbl_type)info.id().to_equiv(); + const L& lbl = info.holder().labeled_image(); + p_array<point2d> + par = scribo::util::component_precise_outline( + extend((lbl | info.bbox()) | (pw::value(lbl) == pw::cst(id)), 0)); + switch (info.type()) { case component::HorizontalLineSeparator: case component::VerticalLineSeparator: { - mln::draw::box(output, compute_bbox(info.bbox()), - literal::cyan); + mln::draw::site_set(output, par, literal::cyan, output_ratio); } break; @@ -199,19 +214,7 @@ namespace scribo default: case component::Image: { - // The bbox does not need to be reajusted to the - // subsampled domain since it has been recomputed while - // computing the edge image. - // - // However, the bbox must be enlarged since only the - // _external_ edge is computed. - box2d b = info.bbox(); - b.enlarge(1); - b.crop_wrt(output.domain()); - data::fill(((output | b).rw() - | (pw::value(elt_edge) - == pw::cst((scribo::def::lbl_type)info.id().to_equiv()))).rw(), - literal::orange); + mln::draw::site_set(output, par, literal::orange, output_ratio); } break; } @@ -226,20 +229,21 @@ namespace scribo const line_set<L>& lines = parset.lines(); for_all_paragraphs(p, parset) - { - const mln::util::array<line_id_t>& line_ids = parset(p).line_ids(); - - for_all_paragraph_lines(lid, line_ids) + if (parset(p).is_valid()) { - line_id_t l = line_ids(lid); - lines(l).accept(*this); - } + const mln::util::array<line_id_t>& line_ids = parset(p).line_ids(); - box2d b = compute_bbox(parset(p).bbox()); - b.enlarge(1); - b.crop_wrt(output.domain()); - mln::draw::box(output, b, literal::blue); - } + for_all_paragraph_lines(lid, line_ids) + { + line_id_t l = line_ids(lid); + lines(l).accept(*this); + } + + box2d b = compute_bbox(parset(p).bbox()); + b.enlarge(1); + b.crop_wrt(output.domain()); + mln::draw::box(output, b, literal::blue); + } } diff --git a/scribo/scribo/io/img/internal/full_img_visitor.hh b/scribo/scribo/io/img/internal/full_img_visitor.hh index 662d8d1..f2c0f5c 100644 --- a/scribo/scribo/io/img/internal/full_img_visitor.hh +++ b/scribo/scribo/io/img/internal/full_img_visitor.hh @@ -34,6 +34,7 @@ # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> +# include <mln/draw/site_set.hh> # include <mln/draw/box.hh> # include <scribo/core/internal/doc_serializer.hh> @@ -42,6 +43,7 @@ # include <scribo/core/line_info.hh> # include <scribo/io/img/internal/draw_edges.hh> +# include <scribo/util/component_precise_outline.hh> namespace scribo { @@ -77,8 +79,6 @@ namespace scribo private: // Attributes mln::image2d<value::rgb8>& output; - - mutable image2d<scribo::def::lbl_type> elt_edge; }; @@ -107,9 +107,6 @@ namespace scribo // Page elements (Pictures, ...) if (doc.has_elements()) { - // Prepare element edges - elt_edge = morpho::elementary::gradient_external(doc.elements().labeled_image(), c8()); - const component_set<L>& elts = doc.elements(); for_all_comps(e, elts) if (elts(e).is_valid()) @@ -120,10 +117,12 @@ namespace scribo // line seraparators if (doc.has_vline_seps()) for_all_comps(c, doc.vline_seps_comps()) - doc.vline_seps_comps()(c).accept(*this); + if (doc.vline_seps_comps()(c).is_valid()) + doc.vline_seps_comps()(c).accept(*this); if (doc.has_hline_seps()) for_all_comps(c, doc.hline_seps_comps()) - doc.hline_seps_comps()(c).accept(*this); + if (doc.hline_seps_comps()(c).is_valid()) + doc.hline_seps_comps()(c).accept(*this); } @@ -134,12 +133,18 @@ namespace scribo void full_img_visitor::visit(const component_info<L>& info) const { + // Getting component outline + scribo::def::lbl_type id = (scribo::def::lbl_type)info.id().to_equiv(); + const L& lbl = info.holder().labeled_image(); + p_array<point2d> + par = scribo::util::component_precise_outline((lbl | info.bbox()) | (pw::value(lbl) == pw::cst(id))); + switch (info.type()) { case component::HorizontalLineSeparator: case component::VerticalLineSeparator: { - mln::draw::box(output, info.bbox(), literal::cyan); + mln::draw::site_set(output, par, literal::cyan); } break; @@ -147,7 +152,7 @@ namespace scribo default: case component::Image: { - draw_edges(info, output, literal::orange, elt_edge); + mln::draw::site_set(output, par, literal::orange); } break; } @@ -162,17 +167,18 @@ namespace scribo const line_set<L>& lines = parset.lines(); for_all_paragraphs(p, parset) - { - const mln::util::array<line_id_t>& line_ids = parset(p).line_ids(); - - for_all_paragraph_lines(lid, line_ids) + if (parset(p).is_valid()) { - line_id_t l = line_ids(lid); - lines(l).accept(*this); - } + const mln::util::array<line_id_t>& line_ids = parset(p).line_ids(); - mln::draw::box(output, parset(p).bbox(), literal::blue); - } + for_all_paragraph_lines(lid, line_ids) + { + line_id_t l = line_ids(lid); + lines(l).accept(*this); + } + + mln::draw::box(output, parset(p).bbox(), literal::blue); + } } diff --git a/scribo/scribo/io/xml/internal/page_xml_visitor.hh b/scribo/scribo/io/xml/internal/page_xml_visitor.hh index 66ba21f..1659a85 100644 --- a/scribo/scribo/io/xml/internal/page_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/page_xml_visitor.hh @@ -35,7 +35,7 @@ # include <scribo/core/internal/doc_serializer.hh> # include <scribo/convert/to_base64.hh> -# include <scribo/util/component_outline.hh> +# include <scribo/util/component_precise_outline.hh> # include <scribo/io/xml/internal/print_box_coords.hh> # include <scribo/io/xml/internal/print_page_preambule.hh> @@ -160,9 +160,8 @@ namespace scribo scribo::def::lbl_type id = (scribo::def::lbl_type)info.id().to_equiv(); const L& lbl = info.holder().labeled_image(); p_array<point2d> - par = util::component_outline(((lbl | info.bbox()) - | (pw::value(lbl) == pw::cst(id))), - 1); + par = scribo::util::component_precise_outline( + extend((lbl | info.bbox()) | (pw::value(lbl) == pw::cst(id)), 0)); switch (info.type()) { -- 1.5.6.5

12 years, 11 months

last-svn-commit-895-g46636f5 Improve and cleanup Results in hdoc toolchain.

by Guillaume Lazzara

* scribo/primitive/extract/non_text_hdoc.hh: Make parameters depend on the image size. * scribo/toolchain/internal/content_in_hdoc_functor.hh: Add new filters. --- scribo/ChangeLog | 10 ++ scribo/scribo/primitive/extract/non_text_hdoc.hh | 34 ++++- .../toolchain/internal/content_in_hdoc_functor.hh | 148 +++++++------------- 3 files changed, 86 insertions(+), 106 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b1be73d..ecece77 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve and cleanup Results in hdoc toolchain. + + * scribo/primitive/extract/non_text_hdoc.hh: Make parameters + depend on the image size. + + * scribo/toolchain/internal/content_in_hdoc_functor.hh: Add new + filters. + +2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/lines_h_thick_and_thin.hh: Improve result quality. diff --git a/scribo/scribo/primitive/extract/non_text_hdoc.hh b/scribo/scribo/primitive/extract/non_text_hdoc.hh index 97e1f0e..b851bde 100644 --- a/scribo/scribo/primitive/extract/non_text_hdoc.hh +++ b/scribo/scribo/primitive/extract/non_text_hdoc.hh @@ -98,27 +98,47 @@ namespace scribo mln_ch_value(L,bool) element_image = duplicate(doc.binary_image_wo_seps()); - for_all_lines(l, doc.lines()) - if (doc.lines()(l).is_textline()) - mln::draw::box_plain(element_image, doc.lines()(l).bbox(), false); + // Mask text areas. + const paragraph_set<L>& parset = doc.paragraphs(); + for_all_paragraphs(p, parset) + if (parset(p).is_valid()) + for_all_paragraph_lines(l, parset(p).line_ids()) + { + line_id_t lid = parset(p).line_ids()(l); + mln::draw::box_plain(element_image, doc.lines()(lid).bbox(), false); + } element_image = morpho::closing::structural(element_image, win::rectangle2d(closing_size, closing_size)); + // Debug + { + debug::logger().log_image(debug::AuxiliaryResults, + element_image, + "non_text_hdoc_element_image"); + } + mln_value(L) ncomps; + + // FIXME: we should not tag elements as image here since we + // just don't know! component_set<L> elements = primitive::extract::components(element_image, - c8(), ncomps); + c8(), ncomps, + component::Image); elements = scribo::filter::components_small(elements, 200); elements = scribo::filter::components_on_border(elements); - elements = scribo::filter::objects_v_thin(elements, 100); - elements = scribo::filter::objects_h_thin(elements, 100); + + elements = scribo::filter::objects_v_thin(elements, + 0.03 * doc.image().domain().height()); + elements = scribo::filter::objects_h_thin(elements, + 0.03 * doc.image().domain().width()); // Debug { - debug::logger().log_image(debug::Special, + debug::logger().log_image(debug::Results, elements.labeled_image(), "non_text_hdoc_components"); } diff --git a/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh index ef33b31..e0c5b50 100644 --- a/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh @@ -27,6 +27,10 @@ #ifndef SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_HDOC_FUNCTOR_HH # define SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_HDOC_FUNCTOR_HH +# ifndef SCRIBO_NDEBUG +# include <mln/util/timer.hh> +# endif // ! SCRIBO_NDEBUG + # include <scribo/core/def/lbl_type.hh> # include <scribo/core/document.hh> # include <scribo/core/line_set.hh> @@ -34,9 +38,6 @@ # include <scribo/primitive/extract/non_text_hdoc.hh> # include <scribo/primitive/extract/components.hh> -// # include <scribo/primitive/extract/separators.hh> -// # include <scribo/primitive/extract/vertical_separators.hh> -// # include <scribo/primitive/extract/horizontal_separators.hh> # include <scribo/primitive/extract/lines_h_thick_and_thin.hh> # include <scribo/primitive/extract/alignments.hh> @@ -50,6 +51,11 @@ # include <scribo/filter/line_links_x_height.hh> # include <scribo/filter/object_links_bbox_h_ratio.hh> # include <scribo/filter/objects_small.hh> +# include <scribo/filter/paragraphs_bbox_overlap.hh> +# include <scribo/filter/paragraphs_in_image.hh> +# include <scribo/filter/separators_in_element.hh> +# include <scribo/filter/separators_in_paragraph.hh> +# include <scribo/filter/images_in_paragraph.hh> # include <scribo/primitive/group/from_single_link.hh> @@ -198,7 +204,7 @@ namespace scribo mln_ch_value(I,bool) vseparators = preprocessing::rotate_90( primitive::extract::lines_h_thick_and_thin( - preprocessing::rotate_90(processed_image), 101, 3, 0.2, 0.6, 1), false), + preprocessing::rotate_90(processed_image), 101, 3, 0.2, 0.6, 10), false), hseparators = primitive::extract::lines_h_thick_and_thin( processed_image, 101, 3); @@ -226,27 +232,31 @@ namespace scribo // Debug if (enable_line_seps) { - debug::logger().log_image(debug::Special, + debug::logger().log_image(debug::AuxiliaryResults, doc.vline_seps(), "vseparators"); - debug::logger().log_image(debug::Special, + debug::logger().log_image(debug::AuxiliaryResults, doc.hline_seps(), "hseparators"); - debug::logger().log_image(debug::Special, + debug::logger().log_image(debug::AuxiliaryResults, input_cleaned, "input_wo_separators"); } # endif // ! SCRIBO_NDEBUG + unsigned min_area = std::min(0.005 * doc.image().domain().width(), + 0.005 * doc.image().domain().height()); // Denoise if (enable_denoising) { on_new_progress_label("Denoise..."); - input_cleaned = preprocessing::denoise_fg(input_cleaned, c8(), 10); + std::cout << ">> min_area = " << min_area << std::endl; + + input_cleaned = preprocessing::denoise_fg(input_cleaned, c8(), min_area); // Debug # ifndef SCRIBO_NDEBUG @@ -286,7 +296,7 @@ namespace scribo on_new_progress_label("Filtering components"); - components = scribo::filter::components_small(components, 10); + components = scribo::filter::components_small(components, min_area); on_progress(); @@ -297,6 +307,7 @@ namespace scribo object_links<L> left_link = primitive::link::with_single_left_link_dmax_ratio( components, +// primitive::link::internal::dmax_width_and_height(1), primitive::link::internal::dmax_default(1), anchor::MassCenter); @@ -304,6 +315,7 @@ namespace scribo object_links<L> right_link = primitive::link::with_single_right_link_dmax_ratio( components, +// primitive::link::internal::dmax_width_and_height(1), primitive::link::internal::dmax_default(1), anchor::MassCenter); @@ -398,7 +410,7 @@ namespace scribo if (debug::logger().is_enabled()) { if (enable_whitespace_seps) - debug::logger().log_image(debug::Special, + debug::logger().log_image(debug::AuxiliaryResults, whitespaces, "whitespaces"); // Bboxes image. @@ -428,7 +440,7 @@ namespace scribo # endif // ! SCRIBO_NDEBUG //===== END OF DEBUG ===== - + on_new_progress_label("Merging segmented lines"); lines = scribo::text::merging(lines); @@ -488,96 +500,17 @@ namespace scribo on_progress(); } -// // Link text lines -// on_new_progress_label("Linking text lines"); -// line_links<L> llinks = scribo::text::link_lines(lines); - - -// //===== DEBUG ===== -// # ifndef SCRIBO_NDEBUG -// if (debug::logger().is_enabled()) -// { -// image2d<value::rgb8> -// debug = data::convert(value::rgb8(), original_image); -// for_all_lines(l, lines) -// { -// if (! lines(l).is_textline()) -// continue; - -// mln::draw::box(debug, lines(l).bbox(), literal::blue); -// mln::draw::line(debug, lines(l).bbox().pcenter(), -// lines(llinks(l)).bbox().pcenter(), literal::green); -// } - -// debug::logger().log_image(debug::AuxiliaryResults, -// debug, "links_raw"); -// } -// # endif // ! SCRIBO_NDEBUG -// //===== END OF DEBUG ===== - -// on_progress(); - - -// // Filter line links. -// on_new_progress_label("Filter line links"); -// llinks = scribo::filter::line_links_x_height(llinks); - -// //===== DEBUG ===== -// # ifndef SCRIBO_NDEBUG -// if (debug::logger().is_enabled()) -// { -// image2d<value::rgb8> -// debug = data::convert(value::rgb8(), original_image); -// for_all_links(i, llinks) -// if (llinks(i) && llinks(i) != i) -// mln::draw::line(debug, lines(i).bbox().pcenter(), -// lines(llinks(i)).bbox().pcenter(), literal::red); - -// debug::logger().log_image(debug::AuxiliaryResults, -// debug, "links"); - -// for (unsigned i = 1; i < llinks.nelements(); ++i) -// llinks(i) = scribo::make::internal::find_root(llinks, i); - -// debug = data::convert(value::rgb8(), original_image); -// mln::util::array<accu::shape::bbox<point2d> > -// nbbox(llinks.nelements()); - -// for_all_lines(i, lines) -// { -// if (! lines(i).is_textline()) -// continue; - -// mln::draw::box(debug, lines(i).bbox(), literal::red); -// nbbox(llinks(i)).take(lines(i).bbox()); -// } - -// for (unsigned i = 1; i < nbbox.nelements(); ++i) -// if (nbbox(i).is_valid()) -// { -// box2d b = nbbox(i).to_result(); -// mln::draw::box(debug, b, literal::green); -// b.enlarge(1); -// mln::draw::box(debug, b, literal::green); -// b.enlarge(1); -// mln::draw::box(debug, b, literal::green); -// } - -// debug::logger().log_image(debug::AuxiliaryResults, -// debug, "par"); -// } -// # endif // ! SCRIBO_NDEBUG -// //===== END OF DEBUG ===== - -// on_progress(); - - -// // Construct paragraphs -// on_new_progress_label("Constructing paragraphs"); -// scribo::paragraph_set<L> parset = scribo::make::paragraph(llinks); + on_new_progress_label("Extracting paragraphs"); scribo::paragraph_set<L> parset = extract_paragraphs(lines, doc.binary_image()); + + on_progress(); + + on_new_progress_label("Filtering paragraphs"); + + parset = filter::paragraphs_bbox_overlap(parset); + doc.set_paragraphs(parset); on_progress(); @@ -585,8 +518,16 @@ namespace scribo // Extract other Elements on_new_progress_label("Extracting Elements"); + + unsigned closing_size = std::min(0.01 * doc.image().domain().width(), + 0.01 * doc.image().domain().height()); + if (!(closing_size % 2)) + closing_size += 1; + + std::cout << ">> CLosing size = " << closing_size << std::endl; + component_set<L> - elements = scribo::primitive::extract::non_text_hdoc(doc, 31); + elements = scribo::primitive::extract::non_text_hdoc(doc, closing_size); on_progress(); @@ -599,6 +540,15 @@ namespace scribo on_progress(); + on_new_progress_label("Cleanup miscellaneous false positive"); + + filter::separators_in_element(doc); + filter::separators_in_paragraph(doc); + filter::paragraphs_in_image(doc); + filter::images_in_paragraph(doc); + + on_progress(); + // Saving results -- 1.5.6.5

12 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches May 2011