Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-888-g1d411c7 Various small fixes in Scribo.

by Guillaume Lazzara

* scribo/core/paragraph_info.hh: Add validity information. * scribo/core/tag/line.hh: Fix guard. * scribo/debug/line_info_image.hh: Use is_textline(). * scribo/io/xml/internal/extended_page_xml_visitor.hh, * scribo/io/xml/internal/full_xml_visitor.hh, * scribo/io/xml/internal/page_xml_visitor.hh: Check paragraph validity. * scribo/primitive/extract/alignments.hh, * scribo/primitive/extract/lines_pattern.hh, * scribo/primitive/extract/separators_nonvisible.hh, * scribo/primitive/group/from_double_link_any.hh, * scribo/text/link_lines.hh, * scribo/text/paragraphs.hh: Fix namespace ambiguity. * scribo/text/merging.hh: Add missing SCRIBO_NDEBUG guards. * src/primitive/extract/lines_h_thick_and_thin.cc: Add a missing include. * tests/primitive/extract/Makefile.am: Do not override an existing variable. --- scribo/ChangeLog | 30 +++++++ scribo/scribo/core/paragraph_info.hh | 15 +++- scribo/scribo/core/tag/line.hh | 2 +- scribo/scribo/debug/line_info_image.hh | 5 +- .../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 | 51 ++++++------ scribo/scribo/primitive/extract/alignments.hh | 12 +--- scribo/scribo/primitive/extract/lines_pattern.hh | 2 +- .../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 ++-- .../primitive/extract/lines_h_thick_and_thin.cc | 1 + scribo/tests/primitive/extract/Makefile.am | 2 +- 16 files changed, 204 insertions(+), 146 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c1e1ff8..3c70e89 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,35 @@ 2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small fixes in Scribo. + + * scribo/core/paragraph_info.hh: Add validity information. + + * scribo/core/tag/line.hh: Fix guard. + + * scribo/debug/line_info_image.hh: Use is_textline(). + + * scribo/io/xml/internal/extended_page_xml_visitor.hh, + * scribo/io/xml/internal/full_xml_visitor.hh, + * scribo/io/xml/internal/page_xml_visitor.hh: Check paragraph + validity. + + * scribo/primitive/extract/alignments.hh, + * scribo/primitive/extract/lines_pattern.hh, + * scribo/primitive/extract/separators_nonvisible.hh, + * scribo/primitive/group/from_double_link_any.hh, + * scribo/text/link_lines.hh, + * scribo/text/paragraphs.hh: Fix namespace ambiguity. + + * scribo/text/merging.hh: Add missing SCRIBO_NDEBUG guards. + + * src/primitive/extract/lines_h_thick_and_thin.cc: Add a missing + include. + + * tests/primitive/extract/Makefile.am: Do not override an existing + variable. + +2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce paragraph_id_t type. * scribo/core/paragraph_set.hh: Make use of this new type. diff --git a/scribo/scribo/core/paragraph_info.hh b/scribo/scribo/core/paragraph_info.hh index 52068a7..af619dd 100644 --- a/scribo/scribo/core/paragraph_info.hh +++ b/scribo/scribo/core/paragraph_info.hh @@ -71,6 +71,7 @@ namespace scribo void set_color_reliability_(float v); bool is_valid() const; + void invalidate(); bool needs_stats_update() const; void force_stats_update(); @@ -84,6 +85,7 @@ namespace scribo float color_reliability_; bool needs_stats_update_; + bool is_valid_; }; template <typename L> @@ -97,13 +99,13 @@ namespace scribo template <typename L> paragraph_info<L>::paragraph_info() - : needs_stats_update_(false) + : needs_stats_update_(false), is_valid_(false) { } template <typename L> paragraph_info<L>::paragraph_info(const line_links<L>& llinks) - : llinks_(llinks), needs_stats_update_(false) + : llinks_(llinks), needs_stats_update_(false), is_valid_(true) { } @@ -186,7 +188,14 @@ namespace scribo bool paragraph_info<L>::is_valid() const { - return llinks_.is_valid(); + return llinks_.is_valid() && is_valid_; + } + + template <typename L> + void + paragraph_info<L>::invalidate() + { + is_valid_ = false; } template <typename L> diff --git a/scribo/scribo/core/tag/line.hh b/scribo/scribo/core/tag/line.hh index 12b3246..d8972a7 100644 --- a/scribo/scribo/core/tag/line.hh +++ b/scribo/scribo/core/tag/line.hh @@ -255,4 +255,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_CORE_TAG_COMP_HH +#endif // ! SCRIBO_CORE_TAG_LINE_HH diff --git a/scribo/scribo/debug/line_info_image.hh b/scribo/scribo/debug/line_info_image.hh index 1b6532b..f3d7ddf 100644 --- a/scribo/scribo/debug/line_info_image.hh +++ b/scribo/scribo/debug/line_info_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -70,7 +71,7 @@ namespace scribo for_all_lines(l, line) { - if (! line(l).is_valid() || line(l).is_hidden()) + if (! line(l).is_textline()) continue; // Bounding box. diff --git a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh index 2611d4a..d109827 100644 --- a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh @@ -255,48 +255,49 @@ 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(); - - // FIXME: compute that information on the whole paragraph - // and use them here. - line_id_t fid = line_ids(0); - output << " <text_region id=\"" << p - << "\" txt_orientation=\"" << lines(fid).orientation() - << "\" txt_reading_orientation=\"" << lines(fid).reading_orientation() - << "\" txt_reading_direction=\"" << lines(fid).reading_direction() - << "\" txt_text_type=\"" << lines(fid).type() - << "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false") - << "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false") - << "\" txt_text_colour=\"" << internal::compute_text_colour(parset(p).color()) - << "\" kerning=\"" << lines(fid).char_space(); - - // EXTENSIONS - Not officially supported - // FIXME: add boldness? - output << "\" color=\"" << scribo::util::color_to_hex(parset(p).color()) - << "\" color_reliability=\"" << parset(p).color_reliability() - << "\" baseline=\"" << lines(fid).baseline() - << "\" meanline=\"" << lines(fid).meanline() - << "\" x_height=\"" << lines(fid).x_height() - << "\" d_height=\"" << lines(fid).d_height() - << "\" a_height=\"" << lines(fid).a_height() - << "\" char_width=\"" << lines(fid).char_width(); - // End of EXTENSIONS - output << "\">" - << std::endl; - - internal::print_box_coords(output, parset(p).bbox(), " "); - - // EXTENSIONS - Not officially supported - 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(); + + // FIXME: compute that information on the whole paragraph + // and use them here. + line_id_t fid = line_ids(0); + output << " <text_region id=\"" << p + << "\" txt_orientation=\"" << lines(fid).orientation() + << "\" txt_reading_orientation=\"" << lines(fid).reading_orientation() + << "\" txt_reading_direction=\"" << lines(fid).reading_direction() + << "\" txt_text_type=\"" << lines(fid).type() + << "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false") + << "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false") + << "\" txt_text_colour=\"" << internal::compute_text_colour(parset(p).color()) + << "\" kerning=\"" << lines(fid).char_space(); + + // EXTENSIONS - Not officially supported + // FIXME: add boldness? + output << "\" color=\"" << scribo::util::color_to_hex(parset(p).color()) + << "\" color_reliability=\"" << parset(p).color_reliability() + << "\" baseline=\"" << lines(fid).baseline() + << "\" meanline=\"" << lines(fid).meanline() + << "\" x_height=\"" << lines(fid).x_height() + << "\" d_height=\"" << lines(fid).d_height() + << "\" a_height=\"" << lines(fid).a_height() + << "\" char_width=\"" << lines(fid).char_width(); + // End of EXTENSIONS + output << "\">" + << std::endl; + + internal::print_box_coords(output, parset(p).bbox(), " "); + + // EXTENSIONS - Not officially supported + for_all_paragraph_lines(lid, line_ids) + { + line_id_t l = line_ids(lid); + lines(l).accept(*this); + } + // End of EXTENSIONS + + output << " </text_region>" << std::endl; } - // End of EXTENSIONS - - output << " </text_region>" << std::endl; - } } diff --git a/scribo/scribo/io/xml/internal/full_xml_visitor.hh b/scribo/scribo/io/xml/internal/full_xml_visitor.hh index 614c473..c6109ee 100644 --- a/scribo/scribo/io/xml/internal/full_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/full_xml_visitor.hh @@ -441,48 +441,49 @@ 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(); - - // FIXME: compute that information on the whole paragraph - // and use them here. - line_id_t fid = line_ids(0); - output << " <text_region id=\"" << p - << "\" txt_orientation=\"" << lines(fid).orientation() - << "\" txt_reading_orientation=\"" << lines(fid).reading_orientation() - << "\" txt_reading_direction=\"" << lines(fid).reading_direction() - << "\" txt_text_type=\"" << lines(fid).type() - << "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false") - << "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false") - << "\" txt_text_colour=\"" << internal::compute_text_colour(parset(p).color()) - << "\" kerning=\"" << lines(fid).char_space(); - - // EXTENSIONS - Not officially supported - output << "\" baseline=\"" << lines(fid).baseline() - << "\" meanline=\"" << lines(fid).meanline() - << "\" x_height=\"" << lines(fid).x_height() - << "\" d_height=\"" << lines(fid).d_height() - << "\" a_height=\"" << lines(fid).a_height() - << "\" char_width=\"" << lines(fid).char_width() - << "\" color=\"" << scribo::util::color_to_hex(parset(p).color()) - << "\" color_reliability=\"" << parset(p).color_reliability(); - // End of EXTENSIONS - output << "\">" - << std::endl; - - internal::print_box_coords(output, parset(p).bbox(), " "); - - - // EXTENSIONS - Not officially supported - for_all_paragraph_lines(lid, line_ids) + if (parset(p).is_valid()) { - line_id_t l = line_ids(lid); + const mln::util::array<line_id_t>& line_ids = parset(p).line_ids(); + + // FIXME: compute that information on the whole paragraph + // and use them here. + line_id_t fid = line_ids(0); + output << " <text_region id=\"" << p + << "\" txt_orientation=\"" << lines(fid).orientation() + << "\" txt_reading_orientation=\"" << lines(fid).reading_orientation() + << "\" txt_reading_direction=\"" << lines(fid).reading_direction() + << "\" txt_text_type=\"" << lines(fid).type() + << "\" txt_reverse_video=\"" << (lines(fid).reverse_video() ? "true" : "false") + << "\" txt_indented=\"" << (lines(fid).indented() ? "true" : "false") + << "\" txt_text_colour=\"" << internal::compute_text_colour(parset(p).color()) + << "\" kerning=\"" << lines(fid).char_space(); + + // EXTENSIONS - Not officially supported + output << "\" baseline=\"" << lines(fid).baseline() + << "\" meanline=\"" << lines(fid).meanline() + << "\" x_height=\"" << lines(fid).x_height() + << "\" d_height=\"" << lines(fid).d_height() + << "\" a_height=\"" << lines(fid).a_height() + << "\" char_width=\"" << lines(fid).char_width() + << "\" color=\"" << scribo::util::color_to_hex(parset(p).color()) + << "\" color_reliability=\"" << parset(p).color_reliability(); + // End of EXTENSIONS + output << "\">" + << std::endl; + + internal::print_box_coords(output, parset(p).bbox(), " "); + + + // EXTENSIONS - Not officially supported + for_all_paragraph_lines(lid, line_ids) + { + line_id_t l = line_ids(lid); - lines(l).accept(*this); - } + lines(l).accept(*this); + } - output << " </text_region>" << std::endl; - } + output << " </text_region>" << std::endl; + } } diff --git a/scribo/scribo/io/xml/internal/page_xml_visitor.hh b/scribo/scribo/io/xml/internal/page_xml_visitor.hh index b807dbb..66ba21f 100644 --- a/scribo/scribo/io/xml/internal/page_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/page_xml_visitor.hh @@ -218,37 +218,38 @@ 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(); - - // FIXME: compute that information on the whole paragraph - // and use them here. - line_id_t fid = line_ids(0); - output << " <TextRegion id=\"r" << p - << "\" orientation=\"" << lines(fid).orientation() - << "\" readingOrientation=\"" << lines(fid).reading_orientation() - << "\" readingDirection=\"" << lines(fid).reading_direction() - << "\" type=\"" << ((lines(fid).type() == line::Text) ? "paragraph" : line::type2str(lines(fid).type())) - << "\" reverseVideo=\"" << (lines(fid).reverse_video() ? "true" : "false") - << "\" indented=\"" << (lines(fid).indented() ? "true" : "false") - << "\" kerning=\"" << lines(fid).char_space() - << "\" textColour=\"" << compute_text_colour(lines(fid).color()) + if (parset(p).is_valid()) + { + const mln::util::array<line_id_t>& line_ids = parset(p).line_ids(); + + // FIXME: compute that information on the whole paragraph + // and use them here. + line_id_t fid = line_ids(0); + output << " <TextRegion id=\"r" << p + << "\" orientation=\"" << lines(fid).orientation() + << "\" readingOrientation=\"" << lines(fid).reading_orientation() + << "\" readingDirection=\"" << lines(fid).reading_direction() + << "\" type=\"" << ((lines(fid).type() == line::Text) ? "paragraph" : line::type2str(lines(fid).type())) + << "\" reverseVideo=\"" << (lines(fid).reverse_video() ? "true" : "false") + << "\" indented=\"" << (lines(fid).indented() ? "true" : "false") + << "\" kerning=\"" << lines(fid).char_space() + << "\" textColour=\"" << compute_text_colour(lines(fid).color()) // << "\" bgColour=\"" << compute_text_color(lines(fid).bgcolor()) // << "\" fontSize=\"" << compute_text_color(lines(fid).x_height()) // << "\" leading=\"" << compute_text_color(lines(fid).leading()) - << "\">" - << std::endl; + << "\">" + << std::endl; - // Add support for text recognition - // <TextEquiv> - // <PlainText></PlainText> - // <Unicode></Unicode> - // </TextEquiv> + // Add support for text recognition + // <TextEquiv> + // <PlainText></PlainText> + // <Unicode></Unicode> + // </TextEquiv> - internal::print_box_coords(output, parset(p).bbox(), " "); + internal::print_box_coords(output, parset(p).bbox(), " "); - output << " </TextRegion>" << std::endl; - } + output << " </TextRegion>" << std::endl; + } } diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 7dbf683..b2c7c0c 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -43,8 +43,6 @@ # include <mln/io/pbm/load.hh> -# include <mln/labeling/colorize.hh> - # include <mln/util/couple.hh> # include <scribo/core/def/lbl_type.hh> @@ -61,7 +59,6 @@ # include <scribo/debug/usage.hh> # include <scribo/debug/links_image.hh> - # include <scribo/core/document.hh> # include <scribo/core/component_set.hh> # include <scribo/core/line_set.hh> @@ -76,11 +73,6 @@ # include <scribo/preprocessing/rotate_90.hh> # include <scribo/filter/object_links_bbox_h_ratio.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/separators_nonvisible.hh> - namespace scribo { @@ -710,7 +702,7 @@ namespace scribo // 2.1.2. Check TOP whitespaces { - util::array<accu::shape::bbox<point2d> > + mln::util::array<accu::shape::bbox<point2d> > group_bbox(top_groups.nelements()); // Compute group bboxes @@ -941,7 +933,7 @@ namespace scribo // 2.2.2. Check BOTTOM whitespaces { - util::array<accu::shape::bbox<point2d> > + mln::util::array<accu::shape::bbox<point2d> > group_bbox(bot_groups.nelements()); // Compute group bboxes diff --git a/scribo/scribo/primitive/extract/lines_pattern.hh b/scribo/scribo/primitive/extract/lines_pattern.hh index 85bdbe4..ec24d4f 100644 --- a/scribo/scribo/primitive/extract/lines_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_pattern.hh @@ -166,7 +166,7 @@ namespace scribo mln_concrete(I) output; initialize(output, input); - util::array<int> + mln::util::array<int> q_arr = offsets_wrt(output, win); bool is_foreground; diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 5c26285..3f36880 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -124,8 +124,8 @@ namespace scribo max_angle = 5, min_card = 3; - util::timer t; - util::timer gt; + mln::util::timer t; + mln::util::timer gt; gt.start(); @@ -395,7 +395,7 @@ namespace scribo t.restart(); - util::array<bool> relbl(unsigned(nlabels) + 1, true); + mln::util::array<bool> relbl(unsigned(nlabels) + 1, true); relbl(0) = false; unsigned invalid_ratio = unsigned(length * 0.30f); diff --git a/scribo/scribo/primitive/group/from_double_link_any.hh b/scribo/scribo/primitive/group/from_double_link_any.hh index 7ed15e2..9e315a3 100644 --- a/scribo/scribo/primitive/group/from_double_link_any.hh +++ b/scribo/scribo/primitive/group/from_double_link_any.hh @@ -79,7 +79,7 @@ namespace scribo { template <typename L> - util::array<unsigned> make_parent(const object_links<L>& link) + mln::util::array<unsigned> make_parent(const object_links<L>& link) { mln::util::array<unsigned> parent = link.comp_to_link(); for_all_links(l, link) @@ -102,8 +102,9 @@ namespace scribo object_links<L> merged_link(left_link.components()); merged_link.init(); - util::array<unsigned> lparent = internal::make_parent(left_link); - util::array<unsigned> rparent = internal::make_parent(right_link); + mln::util::array<unsigned> + lparent = internal::make_parent(left_link), + rparent = internal::make_parent(right_link); for_all_links(i, merged_link) { diff --git a/scribo/scribo/text/link_lines.hh b/scribo/scribo/text/link_lines.hh index 6c985f5..4eab43d 100644 --- a/scribo/scribo/text/link_lines.hh +++ b/scribo/scribo/text/link_lines.hh @@ -72,7 +72,7 @@ namespace scribo mln::data::fill(blocks, literal::zero); // Construct a list of rotated bboxes for each lines. - util::array<mln_box(L)> rbbox(1); + mln::util::array<mln_box(L)> rbbox(1); rbbox.reserve(lines.nelements()); for_all_lines(l, lines) diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index 2763882..f1135ed 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -181,10 +181,7 @@ namespace scribo l1 = my_find_root(parent, l1); l2 = my_find_root(parent, l2); if (l1 == l2) - { - std::cerr << "what! in'do_union': already merged!!!" << std::endl; - return l1; - } + return l1; swap_ordering(l1, l2); parent[l2] = l1; // The smallest label value is root. @@ -625,8 +622,10 @@ namespace scribo image2d<unsigned> billboard(domain); data::fill(billboard, 0); +# ifndef SCRIBO_NDEBUG image2d<value::int_u8> log(domain); data::fill(log, 0); +# endif // ! SCRIBO_NDEBUG const unsigned n = v.size(); unsigned l_; @@ -765,9 +764,10 @@ namespace scribo // l_ = do_union(lines, mc, l, parent); // draw_box(billboard, lines(l_).ebbox(), l_); +# ifndef SCRIBO_NDEBUG // Log: draw_box(log, b, 126); - +# endif // ! SCRIBO_NDEBUG } else // FIXME: Remove! since included in a non-text-line, so not drawn, so inclusion impossible!!!!!!!!!! @@ -777,8 +777,11 @@ namespace scribo // a non-text-line (probably a drawing or a frame) includes a text line draw_box(billboard, lines(l).ebbox(), l); + +# ifndef SCRIBO_NDEBUG // Log: draw_box(log, b, 100); +# endif // ! SCRIBO_NDEBUG } } @@ -817,8 +820,10 @@ namespace scribo // it may change of label (take the one of the included line). draw_box(billboard, lines(l_).ebbox(), l_); +# ifndef SCRIBO_NDEBUG // Log: draw_box(log, b, 128); +# endif // ! SCRIBO_NDEBUG } } } @@ -831,11 +836,15 @@ namespace scribo { ++count_new_txtline; draw_box(billboard, lines(l).ebbox(), l); +# ifndef SCRIBO_NDEBUG // Log: draw_box(log, b, 127); +# endif // ! SCRIBO_NDEBUG } +# ifndef SCRIBO_NDEBUG else - draw_box(log, b, 1); + draw_box(log, b, 1); +# endif // ! SCRIBO_NDEBUG } } else @@ -852,8 +861,8 @@ namespace scribo if (lcand == 0) // Skip background. continue; - if (lines(lcand).type() != line::Text) - std::cerr << "again!" << std::endl; + // if (lines(lcand).type() != line::Text) + // std::cerr << "again!" << std::endl; if (lines(l_).type() == line::Text) @@ -865,15 +874,22 @@ namespace scribo l_ = do_union(lines, l_, lcand, parent); draw_box(billboard, lines(l_).ebbox(), l_); + +# ifndef SCRIBO_NDEBUG // Log: draw_box(log, b, 151); +# endif // ! SCRIBO_NDEBUG + continue; } else { ++count_WTF; + +# ifndef SCRIBO_NDEBUG // Log: draw_box(log, b, 255); +# endif // ! SCRIBO_NDEBUG // (*) SEE BELOW draw_box(billboard, lines(l_).ebbox(), l_); @@ -890,15 +906,20 @@ namespace scribo l_ = do_union(lines, l_, lcand, parent); draw_box(billboard, lines(l_).ebbox(), l_); +# ifndef SCRIBO_NDEBUG // Log: draw_box(log, b, 169); +# endif // ! SCRIBO_NDEBUG + continue; } +# ifndef SCRIBO_NDEBUG else { // Log: draw_box(log, b, 254); } +# endif // ! SCRIBO_NDEBUG } diff --git a/scribo/scribo/text/paragraphs.hh b/scribo/scribo/text/paragraphs.hh index af01581..37817af 100644 --- a/scribo/scribo/text/paragraphs.hh +++ b/scribo/scribo/text/paragraphs.hh @@ -864,7 +864,7 @@ namespace scribo void prepare_lines(const box2d& domain, const line_set<L>& lines, L& blocks, - util::array<box2d>& rbbox) + mln::util::array<box2d>& rbbox) { std::map< int, std::vector< const box2d* > > drawn_lines; // const unsigned nlines = lines.nelements(); @@ -989,7 +989,7 @@ namespace scribo inline void process_left_link(L& blocks, - const util::array<box2d>& rbbox, + const mln::util::array<box2d>& rbbox, const line_set<L>& lines, line_links<L>& left) { @@ -1133,7 +1133,7 @@ namespace scribo inline void process_right_link(L& blocks, - const util::array<box2d>& rbbox, + const mln::util::array<box2d>& rbbox, const line_set<L>& lines, line_links<L>& right) { @@ -1328,7 +1328,7 @@ namespace scribo // } /// const unsigned nlines = lines_info.nelemnts(); - util::array<box2d> rbbox; + mln::util::array<box2d> rbbox; line_links<L> left(lines); left(0) = 0; line_links<L> right(lines); @@ -1338,18 +1338,18 @@ namespace scribo rbbox.resize(lines.nelements() + 1); - std::cout << "Preparing lines" << std::endl; +// std::cout << "Preparing lines" << std::endl; prepare_lines(input.domain(), lines , blocks, rbbox); // io::pgm::save(blocks, "blocks.pgm"); - std::cout << "Linking left" << std::endl; +// std::cout << "Linking left" << std::endl; process_left_link(blocks, rbbox, lines , left); - std::cout << "Linking right" << std::endl; +// std::cout << "Linking right" << std::endl; process_right_link(blocks, rbbox, lines , right); - std::cout << "Finalizing links" << std::endl; +// std::cout << "Finalizing links" << std::endl; finalize_links(left, right, lines ); // std::cout << "Finalizing merging" << std::endl; // finalize_line_merging(left, right, lines); - std::cout << "Extracting paragraphs" << std::endl; +// std::cout << "Extracting paragraphs" << std::endl; filter::paragraph_links(left, right, output, lines); paragraph_set<L> par_set = make::paragraph(output); diff --git a/scribo/src/primitive/extract/lines_h_thick_and_thin.cc b/scribo/src/primitive/extract/lines_h_thick_and_thin.cc index 2942002..1161f2a 100644 --- a/scribo/src/primitive/extract/lines_h_thick_and_thin.cc +++ b/scribo/src/primitive/extract/lines_h_thick_and_thin.cc @@ -25,6 +25,7 @@ #include <scribo/primitive/extract/lines_h_thick_and_thin.hh> +#include <scribo/debug/usage.hh> const char *args_desc[][2] = { diff --git a/scribo/tests/primitive/extract/Makefile.am b/scribo/tests/primitive/extract/Makefile.am index 33d3a96..b622b15 100644 --- a/scribo/tests/primitive/extract/Makefile.am +++ b/scribo/tests/primitive/extract/Makefile.am @@ -26,7 +26,7 @@ check_PROGRAMS = if HAVE_MAGICKXX -check_PROGRAMS = alignments +check_PROGRAMS += alignments alignments_SOURCES = alignments.cc alignments_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ -- 1.5.6.5

13 years, 7 months

last-svn-commit-887-ge06be54 Introduce paragraph_id_t type.

by Guillaume Lazzara

* scribo/core/paragraph_set.hh: Make use of this new type. * scribo/core/tag/paragraph.hh: New. --- scribo/ChangeLog | 8 +++ scribo/scribo/core/paragraph_set.hh | 49 +++++++++++++++++--- .../core/{def/color_type.hh => tag/paragraph.hh} | 19 +++----- 3 files changed, 57 insertions(+), 19 deletions(-) copy scribo/scribo/core/{def/color_type.hh => tag/paragraph.hh} (83%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5340656..c1e1ff8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce paragraph_id_t type. + + * scribo/core/paragraph_set.hh: Make use of this new type. + + * scribo/core/tag/paragraph.hh: New. + +2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Share document structure data. * scribo/core/document.hh: Here. diff --git a/scribo/scribo/core/paragraph_set.hh b/scribo/scribo/core/paragraph_set.hh index 242501d..65e17c6 100644 --- a/scribo/scribo/core/paragraph_set.hh +++ b/scribo/scribo/core/paragraph_set.hh @@ -29,15 +29,19 @@ # include <mln/util/array.hh> # include <mln/make/relabelfun.hh> # include <mln/value/int_u16.hh> +# include <mln/core/concept/function.hh> # include <scribo/core/line_links.hh> # include <scribo/core/line_set.hh> # include <scribo/core/paragraph_info.hh> # include <scribo/core/concept/serializable.hh> +# include <scribo/core/tag/paragraph.hh> namespace scribo { + typedef mln::util::object_id<scribo::ParagraphId, unsigned> paragraph_id_t; + namespace internal { @@ -56,7 +60,6 @@ namespace scribo } // end of namespace scribo::internal - /*! \brief Paragraph container. Paragraph ids start from 1. @@ -65,6 +68,8 @@ namespace scribo template <typename L> class paragraph_set : public Serializable<paragraph_set<L> > { + typedef internal::paragraph_set_data<L> data_t; + public: paragraph_set(); paragraph_set(internal::paragraph_set_data<L>* data); @@ -72,15 +77,21 @@ namespace scribo unsigned nelements() const; - paragraph_info<L>& operator()(unsigned i); - const paragraph_info<L>& operator()(unsigned i) const; + paragraph_info<L>& operator()(const paragraph_id_t& i); + const paragraph_info<L>& operator()(const paragraph_id_t& i) const; bool is_valid() const; + // Massively invalidate paragraphs. + template <typename F> + void invalidate(const Function_v2b<F>& f); + const line_set<L>& lines() const; const line_links<L>& links() const; + paragraph_set<L> duplicate() const; + private: mln::util::tracked_ptr< internal::paragraph_set_data<L> > data_; }; @@ -161,7 +172,7 @@ namespace scribo template <typename L> paragraph_info<L>& - paragraph_set<L>::operator()(unsigned i) + paragraph_set<L>::operator()(const paragraph_id_t& i) { mln_precondition(data_ != 0); return data_->pars_[i]; @@ -169,7 +180,7 @@ namespace scribo template <typename L> const paragraph_info<L>& - paragraph_set<L>::operator()(unsigned i) const + paragraph_set<L>::operator()(const paragraph_id_t& i) const { mln_precondition(data_ != 0); return data_->pars_[i]; @@ -183,6 +194,17 @@ namespace scribo return data_ && !data_->pars_.is_empty(); } + template <typename L> + template <typename F> + void + paragraph_set<L>::invalidate(const Function_v2b<F>& f_) + { + const F& f = exact(f_); + + for_all_paragraphs(p, (*this)) + if (!f(p)) + (*this)(p).invalidate(); + } template <typename L> const line_set<L>& @@ -203,6 +225,19 @@ namespace scribo template <typename L> + inline + paragraph_set<L> + paragraph_set<L>::duplicate() const + { + paragraph_set<L> output; + output.data_ = new data_t(); + + *(output.data_.ptr_) = *(data_.ptr_); + return output; + } + + + template <typename L> bool operator==(const paragraph_set<L>& lhs, const paragraph_set<L>& rhs) { if (! (lhs.lines() == rhs.lines() && lhs.nelements() == rhs.nelements())) @@ -248,8 +283,8 @@ namespace scribo { line_links<L> links = llinks.duplicate(); - for (unsigned i = 1; i < links.nelements(); ++i) - links(i) = internal::find_root(links, i); + for_all_links(l, links) + links(l) = internal::find_root(links, l); unsigned npars; mln::fun::i2v::array<unsigned> diff --git a/scribo/scribo/core/def/color_type.hh b/scribo/scribo/core/tag/paragraph.hh similarity index 83% copy from scribo/scribo/core/def/color_type.hh copy to scribo/scribo/core/tag/paragraph.hh index 7acd334..14dd579 100644 --- a/scribo/scribo/core/def/color_type.hh +++ b/scribo/scribo/core/tag/paragraph.hh @@ -23,26 +23,21 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_CORE_COLOR_TYPE_HH -# define SCRIBO_CORE_COLOR_TYPE_HH +#ifndef SCRIBO_CORE_TAG_PARAGRAPH_HH +# define SCRIBO_CORE_TAG_PARAGRAPH_HH /// \file /// -/// Global type definition for labels. - -# include <mln/value/rgb8.hh> - +/// \brief Paragraph tags. namespace scribo { - namespace def - { + // Paragraph id tag. + struct ParagraphId; - typedef mln::value::rgb8 color_type; - - } // end of namespace scribo::def } // end of namespace scribo -#endif // ! SCRIBO_CORE_DEF_HH + +#endif // ! SCRIBO_CORE_TAG_PARAGRAPH_HH -- 1.5.6.5

13 years, 8 months

last-svn-commit-886-gf28dd55 Share document structure data.

by Guillaume Lazzara

* scribo/core/document.hh: Here. --- scribo/ChangeLog | 6 ++ scribo/scribo/core/document.hh | 171 +++++++++++++++++++++++++-------------- 2 files changed, 115 insertions(+), 62 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4fc8c54..5340656 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2011-05-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Share document structure data. + + * scribo/core/document.hh: Here. + 2011-05-25 Coddy Levi <levi(a)lrde.epita.fr> Deep modifications and clean correction of the previous bug. diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index 98c438d..cc885e4 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -47,9 +47,44 @@ namespace scribo { + namespace internal + { + /// Data structure for \c scribo::document<L>. + template <typename L> + struct document_data + { + document_data(); + document_data(const char *filename); + document_data(const char *filename, + const mln::image2d<mln::value::rgb8>& input); + + std::string filename_; + mln::image2d<mln::value::rgb8> image_; + mln::image2d<bool> binary_image_; + mln::image2d<bool> binary_image_wo_seps_; + + paragraph_set<L> parset_; + component_set<L> elements_; + + mln::image2d<bool> whitespace_seps_; + component_set<L> whitespace_seps_comps_; + + mln::image2d<bool> hline_seps_; + component_set<L> hline_seps_comps_; + + mln::image2d<bool> vline_seps_; + component_set<L> vline_seps_comps_; + }; + + } // end of namespace scribo::internal + + + template <typename L> struct document : public Serializable<document<L> > { + typedef internal::document_data<L> data_t; + public: document(); @@ -121,22 +156,7 @@ namespace scribo private: - std::string filename_; - mln::image2d<mln::value::rgb8> image_; - mln::image2d<bool> binary_image_; - mln::image2d<bool> binary_image_wo_seps_; - - paragraph_set<L> parset_; - component_set<L> elements_; - - mln::image2d<bool> whitespace_seps_; - component_set<L> whitespace_seps_comps_; - - mln::image2d<bool> hline_seps_; - component_set<L> hline_seps_comps_; - - mln::image2d<bool> vline_seps_; - component_set<L> vline_seps_comps_; + mln::util::tracked_ptr<data_t> data_; }; @@ -146,6 +166,32 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + namespace internal + { + + template <typename L> + document_data<L>::document_data() + { + } + + template <typename L> + document_data<L>::document_data(const char *filename, + const mln::image2d<mln::value::rgb8>& input) + : filename_(filename), + image_(input) + { + } + + template <typename L> + document_data<L>::document_data(const char *filename) + : filename_(filename) + { + } + + + } // end of namespace scribo::internal + + template <typename L> document<L>::document() @@ -155,17 +201,16 @@ namespace scribo template <typename L> document<L>::document(const char *filename) - : filename_(filename) { + data_ = new internal::document_data<L>(filename); } template <typename L> document<L>::document(const char *filename, const mln::image2d<mln::value::rgb8>& input) - : filename_(filename), - image_(input) { + data_ = new internal::document_data<L>(filename, input); } @@ -173,7 +218,7 @@ namespace scribo const char * document<L>::filename() const { - return filename_.c_str(); + return data_->filename_.c_str(); } @@ -181,7 +226,7 @@ namespace scribo void document<L>::set_filename(const char *filename) { - filename_ = filename; + data_->filename_ = filename; } @@ -190,7 +235,7 @@ namespace scribo document<L>::open() { Magick::InitializeMagick(0); - mln::io::magick::load(image_, filename_); + mln::io::magick::load(data_->image_, data_->filename_); } @@ -198,7 +243,7 @@ namespace scribo bool document<L>::is_open() const { - return image_.is_valid(); + return data_->image_.is_valid(); } @@ -206,7 +251,7 @@ namespace scribo bool document<L>::is_valid() const { - return image_.is_valid(); + return data_->image_.is_valid(); } @@ -214,7 +259,7 @@ namespace scribo mln::def::coord document<L>::width() const { - return image_.ncols(); + return data_->image_.ncols(); } @@ -222,7 +267,7 @@ namespace scribo mln::def::coord document<L>::height() const { - return image_.nrows(); + return data_->image_.nrows(); } @@ -230,7 +275,7 @@ namespace scribo bool document<L>::has_text() const { - return parset_.is_valid(); + return data_->parset_.is_valid(); } @@ -238,14 +283,14 @@ namespace scribo const line_set<L>& document<L>::lines() const { - return parset_.lines(); + return data_->parset_.lines(); } template <typename L> const paragraph_set<L>& document<L>::paragraphs() const { - return parset_; + return data_->parset_; } @@ -253,7 +298,7 @@ namespace scribo void document<L>::set_paragraphs(const paragraph_set<L>& parset) { - parset_ = parset; + data_->parset_ = parset; } @@ -261,7 +306,7 @@ namespace scribo const component_set<L>& document<L>::elements() const { - return elements_; + return data_->elements_; } @@ -269,7 +314,7 @@ namespace scribo bool document<L>::has_elements() const { - return elements_.is_valid(); + return data_->elements_.is_valid(); } @@ -277,14 +322,14 @@ namespace scribo void document<L>::set_elements(const component_set<L>& elements) { - elements_ = elements; + data_->elements_ = elements; } template <typename L> bool document<L>::has_whitespace_seps() const { - return whitespace_seps_.is_valid(); + return data_->whitespace_seps_.is_valid(); } @@ -292,7 +337,7 @@ namespace scribo const mln::image2d<bool>& document<L>::whitespace_seps() const { - return whitespace_seps_; + return data_->whitespace_seps_; } @@ -300,7 +345,7 @@ namespace scribo const component_set<L>& document<L>::whitespace_seps_comps() const { - return whitespace_seps_comps_; + return data_->whitespace_seps_comps_; } @@ -309,8 +354,8 @@ namespace scribo document<L>::set_whitespace_separators(const image2d<bool>& whitespace_seps, const component_set<L>& whitespace_seps_comps) { - whitespace_seps_ = whitespace_seps; - whitespace_seps_comps_ = whitespace_seps_comps; + data_->whitespace_seps_ = whitespace_seps; + data_->whitespace_seps_comps_ = whitespace_seps_comps; } @@ -318,7 +363,7 @@ namespace scribo bool document<L>::has_hline_seps() const { - return hline_seps_.is_valid(); + return data_->hline_seps_.is_valid(); } @@ -326,7 +371,7 @@ namespace scribo const mln::image2d<bool>& document<L>::hline_seps() const { - return hline_seps_; + return data_->hline_seps_; } @@ -334,7 +379,7 @@ namespace scribo const component_set<L>& document<L>::hline_seps_comps() const { - return hline_seps_comps_; + return data_->hline_seps_comps_; } @@ -342,12 +387,13 @@ namespace scribo void document<L>::set_hline_separators(const image2d<bool>& hline_seps) { - hline_seps_ = hline_seps; + data_->hline_seps_ = hline_seps; mln_value(L) ncomps; - hline_seps_comps_ = primitive::extract::components(hline_seps, - mln::c8(), ncomps, - component::HorizontalLineSeparator); + data_->hline_seps_comps_ = primitive::extract::components( + hline_seps, + mln::c8(), ncomps, + component::HorizontalLineSeparator); } @@ -356,8 +402,8 @@ namespace scribo document<L>::set_hline_separators(const image2d<bool>& hline_seps, const component_set<L>& hline_seps_comps) { - hline_seps_ = hline_seps; - hline_seps_comps_ = hline_seps_comps; + data_->hline_seps_ = hline_seps; + data_->hline_seps_comps_ = hline_seps_comps; } @@ -365,7 +411,7 @@ namespace scribo bool document<L>::has_vline_seps() const { - return vline_seps_.is_valid(); + return data_->vline_seps_.is_valid(); } @@ -373,7 +419,7 @@ namespace scribo const mln::image2d<bool>& document<L>::vline_seps() const { - return vline_seps_; + return data_->vline_seps_; } @@ -381,7 +427,7 @@ namespace scribo const component_set<L>& document<L>::vline_seps_comps() const { - return vline_seps_comps_; + return data_->vline_seps_comps_; } @@ -389,12 +435,13 @@ namespace scribo void document<L>::set_vline_separators(const image2d<bool>& vline_seps) { - vline_seps_ = vline_seps; + data_->vline_seps_ = vline_seps; mln_value(L) ncomps; - vline_seps_comps_ = primitive::extract::components(vline_seps, - mln::c8(), ncomps, - component::VerticalLineSeparator); + data_->vline_seps_comps_ = primitive::extract::components( + vline_seps, + mln::c8(), ncomps, + component::VerticalLineSeparator); } @@ -403,8 +450,8 @@ namespace scribo document<L>::set_vline_separators(const image2d<bool>& vline_seps, const component_set<L>& vline_seps_comps) { - vline_seps_ = vline_seps; - vline_seps_comps_ = vline_seps_comps; + data_->vline_seps_ = vline_seps; + data_->vline_seps_comps_ = vline_seps_comps; } @@ -412,7 +459,7 @@ namespace scribo const mln::image2d<value::rgb8>& document<L>::image() const { - return image_; + return data_->image_; } @@ -420,7 +467,7 @@ namespace scribo void document<L>::set_image(const mln::image2d<value::rgb8>& image) { - image_ = image; + data_->image_ = image; } @@ -428,7 +475,7 @@ namespace scribo const mln::image2d<bool>& document<L>::binary_image() const { - return binary_image_; + return data_->binary_image_; } @@ -436,7 +483,7 @@ namespace scribo void document<L>::set_binary_image(const mln::image2d<bool>& binary_image) { - binary_image_ = binary_image; + data_->binary_image_ = binary_image; } @@ -444,7 +491,7 @@ namespace scribo const mln::image2d<bool>& document<L>::binary_image_wo_seps() const { - return binary_image_wo_seps_; + return data_->binary_image_wo_seps_; } @@ -453,7 +500,7 @@ namespace scribo document<L>::set_binary_image_wo_seps( const mln::image2d<bool>& binary_image_wo_seps) { - binary_image_wo_seps_ = binary_image_wo_seps; + data_->binary_image_wo_seps_ = binary_image_wo_seps; } -- 1.5.6.5

13 years, 8 months

branch icdar/hdlac2011 updated: last-svn-commit-885-g118f203

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 icdar/hdlac2011 has been updated via 118f203ff8c90a367f78502c3b5ecc1883180f86 (commit) from 12da563c7ea1fba00e47b8cdb9adf526421218d2 (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 ----------------------------------------------------------------- 118f203 2011-05-25 Coddy Levi <levi(a)lrde.epita.fr> ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 6 + scribo/scribo/util/component_outline.hh | 190 +++++++++++++++---------------- 2 files changed, 99 insertions(+), 97 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 8 months

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

by Coddy Levi

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

13 years, 8 months

last-svn-commit-885-g02ab025 Deep modifications and clean correction of the previous bug.

by Coddy Levi

* 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

13 years, 8 months

branch coddy updated: last-svn-commit-830-g9a57687

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 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

13 years, 8 months

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

by Coddy Levi

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

13 years, 8 months

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

by Coddy Levi

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

13 years, 8 months

branch icdar/hdlac2011 updated: last-svn-commit-884-g12da563

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 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

13 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches