- Olena-patches

olena-2.0-400-g023cbf5 Build the set of detected columns during table recognition.
by Roland Levillain 23 Mar '13

23 Mar '13

* scribo/sandbox/icdar_13_table/src/new.cc: Here. * scribo/sandbox/icdar_13_table/src/disjoint_set.hh: New. --- scribo/sandbox/icdar_13_table/src/disjoint_set.hh | 54 +++++++++++++++++++++ scribo/sandbox/icdar_13_table/src/new.cc | 36 ++++++++++++++ 2 files changed, 90 insertions(+), 0 deletions(-) create mode 100644 scribo/sandbox/icdar_13_table/src/disjoint_set.hh diff --git a/scribo/sandbox/icdar_13_table/src/disjoint_set.hh b/scribo/sandbox/icdar_13_table/src/disjoint_set.hh new file mode 100644 index 0000000..b8ae409 --- /dev/null +++ b/scribo/sandbox/icdar_13_table/src/disjoint_set.hh @@ -0,0 +1,54 @@ +#ifndef DISJOINT_SET_HH +# define DISJOINT_SET_HH + +/// \file +/// Implementation of a disjoint-set forest. + +# include <limits> +# include <vector> + +template <typename T> +struct disjoint_set +{ + disjoint_set(size_t size) + // The maximum value of T is considered an ``invalid value''. + : parent(size, std::numeric_limits<T>::max()) + { + for (unsigned i = 0; i < parent.size(); ++i) + make_set(i); + } + + /// Create initial sets (singletons). + void make_set(T x) + { + parent[x] = x; + } + + bool is_root(T x) + { + return parent[x] == x; + } + + /// Find the root of the set containing \a x. + T find(T x) + { + if (!is_root(x)) + // Path compression. + parent[x] = find(parent[x]); + return parent[x]; + } + + /// Merge the set containing \a y into the set containing \a x. + void make_union(T x, T y) + { + T x_root = find(x); + T y_root = find(y); + parent[y_root] = x_root; + } + + /// Parent relationship. A node with is its own parent is a + /// root (representative of a component). + std::vector<T> parent; +}; + +#endif // ! DISJOINT_SET_HH diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 2c41e31..bcf127e 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -54,6 +54,8 @@ #include <scribo/text/extract_paragraphs.hh> #include <scribo/text/merging.hh> +#include "disjoint_set.hh" + using namespace mln; // Draw weighted boxes (red < orange < cyan < green) @@ -558,6 +560,39 @@ int main(int argc, char** argv) } } + // Build the columns. + // First pass. + disjoint_set<node_id> columns_set(groups.nelements()); + for (unsigned i = 0; i < groups.nelements(); ++i) + { + const group_set& successors = nodes_below[i]; + for (group_set::const_iterator j = successors.begin(); + j != successors.end(); ++j) + columns_set.make_union(i, *j); + } + // Second pass: assign labels. Label 0 is unused and means + // ``default''. + std::vector<group_set> descendants(groups.nelements()); + for (unsigned i = 0; i < groups.nelements(); ++i) + { + // Process groups in reverse order. + unsigned j = groups.nelements() - 1 - i; + if (!columns_set.is_root(j)) + descendants[columns_set.find(j)].insert(j); + } + + // Visualization: columns. + image2d<value::rgb8> ima_columns = data::convert(value::rgb8(), bin_merged); + for (unsigned i = 0; i < groups.nelements(); ++i) + if (!descendants[i].empty()) + { + box2d column_box = groups(i).bbox(); + for (group_set::const_iterator j = descendants[i].begin(); + j != descendants[i].end(); ++j) + column_box.merge(groups(*j).bbox()); + draw::box(ima_columns, column_box, literal::red); + } + // Write images and close XML std::ostringstream path; unsigned number = 0; @@ -572,6 +607,7 @@ int main(int argc, char** argv) write_image(ima_links, "components", page, number, path); write_image(ima_groups, "groups", page, number, path); write_image(ima_valid, "valid", page, number, path); + write_image(ima_columns, "columns", page, number, path); } delete xml; -- 1.7.2.5

1 0

olena-2.0-399-g51f7eab Build spatial relations between text boxes as directed graphs.
by Roland Levillain 23 Mar '13

23 Mar '13

* scribo/sandbox/icdar_13_table/src/new.cc: Here. --- scribo/sandbox/icdar_13_table/src/new.cc | 89 ++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 02e7594..2c41e31 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -469,6 +469,95 @@ int main(int argc, char** argv) draw_links_rl(groups, ima_groups, balance, vlines); draw_adjacency_boxes(balance, ima_valid, groups); + /* FIXME: The code below duplicates some of the code in the + draw_links_* routines. Factor. */ + // Adjacencies between nodes. Of course, an actual digraph data + // structure would be better. + typedef unsigned node_id; + typedef std::set<node_id> group_set; + typedef std::vector<group_set> adjacencies; + adjacencies nodes_below(groups.nelements()); + adjacencies nodes_above(groups.nelements()); + adjacencies nodes_right(groups.nelements()); + adjacencies nodes_left(groups.nelements()); + + // Draw vertical links (red) + for (unsigned i = 1; i < groups.nelements(); ++i) + { + for (unsigned j = i + 1; j < groups.nelements(); ++j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + const point2d& p1 = b1.pcenter(); + const point2d& p2 = b2.pcenter(); + + unsigned max_height = std::max(b1.height(), b2.height()); + unsigned min_height = std::min(b1.height(), b2.height()); + + if (/* p1[0] < p2[0] // Avoid redundancy + && */ + max_height * 2 < bin_merged.ncols() + && min_height + 3 >= max_height // Same heights + && b1.width() < 2 * average_width && b2.width() < 2 * average_width // Regular width + && (b1.pmin()[1] == b2.pmin()[1] + || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) + || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned + && abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap + && abs(p1[1] - p2[1]) < 20) // Vertical proximity + { + // Build the above/below adjacencies. + node_id top_node, bottom_node; + if (p1.row() < p2.col()) + { + top_node = i; + bottom_node = j; + } + else + { + top_node = j; + bottom_node = i; + } + nodes_below[top_node].insert(bottom_node); + nodes_above[bottom_node].insert(top_node); + } + } + } + + // Draw horizontal links (green) + for (unsigned i = 1; i < groups.nelements(); ++i) + { + for (unsigned j = i + 1; j < groups.nelements(); ++j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + const point2d& p1 = b1.pcenter(); + const point2d& p2 = b2.pcenter(); + + if (/* p1[1] < p2[1] // Avoid redundancy + && */ + (b1.pmin()[0] == b2.pmin()[0] + || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) + || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned + && abs(p1[0] - p2[0]) < 10) // Reduced gap + { + // Build the right/left adjacencies. + node_id left_node, right_node; + if (p1.col() < p2.col()) + { + left_node = i; + right_node = j; + } + else + { + left_node = j; + right_node = i; + } + nodes_right[left_node].insert(right_node); + nodes_left[right_node].insert(left_node); + } + } + } + // Write images and close XML std::ostringstream path; unsigned number = 0; -- 1.7.2.5

1 0

olena-2.0-398-gbbdd9a7 Fix various issues in the table detection experiment.
by Roland Levillain 23 Mar '13

23 Mar '13

* scribo/sandbox/icdar_13_table/src/new.cc: Use the multiscale version of the Sauvola binarization. (main): Remove an unused variable. Remove superfluous `return' statement. --- scribo/sandbox/icdar_13_table/src/new.cc | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index b13696e..02e7594 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -26,7 +26,6 @@ #include <tesseract/baseapi.h> // INCLUDES SCRIBO -#include <scribo/binarization/sauvola.hh> #include <scribo/binarization/sauvola_ms.hh> #include <scribo/core/component_set.hh> @@ -353,8 +352,7 @@ int main(int argc, char** argv) { I8 original = pdf[page]; image2d<value::int_u8> filtered = data::transform(original, fun::v2v::rgb_to_luma<value::int_u8>()); - IB bin = scribo::binarization::sauvola(filtered, 81, 0.44); - //IB bin = scribo::binarization::sauvola_ms(filtered, 81, 2); + IB bin = scribo::binarization::sauvola_ms(filtered, 81, 2); // Reverse selection IB reverse = logical::not_(bin); @@ -378,7 +376,6 @@ int main(int argc, char** argv) // Find separators IB bin_without_separators = duplicate(bin); - IB separators = separators; V nhlines, nvlines; unsigned min_width = 31; unsigned min_height = 71; @@ -489,6 +486,4 @@ int main(int argc, char** argv) } delete xml; - - return 0; } -- 1.7.2.5

1 0

branch sandbox/anthony updated: olena-2.0-397-gf16ceed
by git＠lrde.epita.fr 23 Mar '13

23 Mar '13

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 sandbox/anthony has been updated via f16ceed7137269e1b484609389d59713a8a1cc2b (commit) from d276a4c40057677a7e0871dcc50ec004b068b620 (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 ----------------------------------------------------------------- f16ceed [ICDAR_13] Refactore and use of sauvola_ms instead of sauvola ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/icdar_13_table/src/new.cc | 93 +++++++++++++++++------------- 1 files changed, 53 insertions(+), 40 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-397-gf16ceed [ICDAR_13] Refactore and use of sauvola_ms instead of sauvola
by Anthony Seure 23 Mar '13

23 Mar '13

--- scribo/sandbox/icdar_13_table/src/new.cc | 93 +++++++++++++++++------------- 1 files changed, 53 insertions(+), 40 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 5370164..b13696e 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -27,6 +27,7 @@ // INCLUDES SCRIBO #include <scribo/binarization/sauvola.hh> +#include <scribo/binarization/sauvola_ms.hh> #include <scribo/core/component_set.hh> #include <scribo/core/line_set.hh> @@ -56,6 +57,29 @@ using namespace mln; +// Draw weighted boxes (red < orange < cyan < green) +// 1 link < 2 links < 3 links < 3+ links +template<typename T, typename L> +void draw_adjacency_boxes(const std::vector<short>& balance, + image2d<T>& ima, + const scribo::object_groups< image2d<L> >& groups) +{ + for (unsigned i = 0; i < balance.size(); ++i) + { + if (balance[i] == 1) + draw::box(ima, groups(i).bbox(), literal::red); + + if (balance[i] == 2) + draw::box(ima, groups(i).bbox(), literal::orange); + + if (balance[i] == 3) + draw::box(ima, groups(i).bbox(), literal::cyan); + + if (balance[i] > 3) + draw::box(ima, groups(i).bbox(), literal::green); + } +} + // Write image2d<bool> images void write_image(const image2d<bool>& ima, const char* name, @@ -226,7 +250,8 @@ void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, && (b1.pmin()[0] == b2.pmin()[0] || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 10) // Reduced gap + && abs(p1[0] - p2[0]) < 10 // Reduced gap + && abs(p1[1] - p2[1]) > (b1.width() + b2.width()) / 4) // Consistent gap { unsigned k = 1; short separators = 0; @@ -277,7 +302,8 @@ void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, && (b1.pmin()[0] == b2.pmin()[0] || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 10) // Reduced gap + && abs(p1[0] - p2[0]) < 10 // Reduced gap + && abs(p1[1] - p2[1]) > (b1.width() + b2.width()) / 4) // Consistent gap { unsigned k = 1; short separators = 0; @@ -311,34 +337,33 @@ int main(int argc, char** argv) { typedef value::label_16 V; typedef image2d<V> L; - - std::ostringstream path; - image2d<value::rgb8> original, ima_links, ima_groups, ima_valid; - image2d<value::int_u8> filtered; - image2d<bool> bin, reverse, reverse_selection, bin_merged, separators, bin_without_separators, whitespaces, comp, denoised; - scribo::component_set< image2d<unsigned> > components, rcomponents; - - unsigned dpi = 72; + typedef image2d<value::rgb8> I8; + typedef image2d<bool> IB; + typedef scribo::component_set< image2d<unsigned> > CS; // Loading and binarization XML* xml = new XML("final.xml", argv[1]); util::array< image2d<value::rgb8> > pdf; + unsigned dpi = 72; io::pdf::load(pdf, argv[1], dpi); + // Iterate over all pages for (unsigned page = 0; page < pdf.nelements(); ++page) { - original = pdf[page]; - filtered = data::transform(original, fun::v2v::rgb_to_luma<value::int_u8>()); - bin = scribo::binarization::sauvola(filtered, 81, 0.44); + I8 original = pdf[page]; + image2d<value::int_u8> filtered = data::transform(original, fun::v2v::rgb_to_luma<value::int_u8>()); + IB bin = scribo::binarization::sauvola(filtered, 81, 0.44); + //IB bin = scribo::binarization::sauvola_ms(filtered, 81, 2); // Reverse selection - reverse = logical::not_(bin); + IB reverse = logical::not_(bin); + IB reverse_selection; initialize(reverse_selection, reverse); data::fill(reverse_selection, false); unsigned nrcomponents; - rcomponents = scribo::primitive::extract::components(reverse, c8(), nrcomponents); + CS rcomponents = scribo::primitive::extract::components(reverse, c8(), nrcomponents); for (unsigned i = 1; i < rcomponents.nelements(); ++i) { @@ -352,8 +377,8 @@ int main(int argc, char** argv) reverse_selection = scribo::preprocessing::denoise_fg(reverse_selection, c8(), 4); // Find separators - bin_without_separators = duplicate(bin); - separators = separators; + IB bin_without_separators = duplicate(bin); + IB separators = separators; V nhlines, nvlines; unsigned min_width = 31; unsigned min_height = 71; @@ -366,14 +391,15 @@ int main(int argc, char** argv) data::fill((bin_without_separators | vlines(i).bbox()).rw(), false); // Denoise - denoised = scribo::preprocessing::denoise_fg(bin_without_separators, c8(), 4); + IB denoised = scribo::preprocessing::denoise_fg(bin_without_separators, c8(), 4); // Bin merged - bin_merged = logical::or_(denoised, reverse_selection); + IB bin_merged = logical::or_(denoised, reverse_selection); // Extract components unsigned ncomponents; - components = scribo::primitive::extract::components(bin_merged, c8(), ncomponents); + CS components = scribo::primitive::extract::components(bin_merged, c8(), ncomponents); + IB comp; initialize(comp, bin_merged); data::fill(comp, false); @@ -398,9 +424,11 @@ int main(int argc, char** argv) // Filter links scribo::object_links< image2d<unsigned> > hratio_filtered_links = scribo::filter::object_links_bbox_h_ratio(merged_links, 2.5f); - ima_links = data::convert(value::rgb8(), bin_merged); - ima_groups = data::convert(value::rgb8(), bin_merged); - ima_valid = data::convert(value::rgb8(), bin_merged); + IB tmp = logical::and_(bin_merged, comp); + + I8 ima_links = data::convert(value::rgb8(), tmp); + I8 ima_groups = data::convert(value::rgb8(), tmp); + I8 ima_valid = data::convert(value::rgb8(), tmp); // Write links for (unsigned l = 1; l < merged_links.nelements(); ++l) @@ -442,25 +470,10 @@ int main(int argc, char** argv) draw_links_bt(groups, ima_groups, balance, average_width, hlines); draw_links_lr(groups, ima_groups, balance, vlines); draw_links_rl(groups, ima_groups, balance, vlines); - - // Draw weighted boxes (red < orange < cyan < green) - // 1 link < 2 links < 3 links < 3+ links - for (unsigned i = 0; i < balance.size(); ++i) - { - if (balance[i] == 1) - draw::box(ima_valid, groups(i).bbox(), literal::red); - - if (balance[i] == 2) - draw::box(ima_valid, groups(i).bbox(), literal::orange); - - if (balance[i] == 3) - draw::box(ima_valid, groups(i).bbox(), literal::cyan); - - if (balance[i] > 3) - draw::box(ima_valid, groups(i).bbox(), literal::green); - } + draw_adjacency_boxes(balance, ima_valid, groups); // Write images and close XML + std::ostringstream path; unsigned number = 0; write_image(bin, "bin", page, number, path); -- 1.7.2.5

1 0

olena-2.0-426-g81bdc8a scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh: Fix an invalid forward declaration.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

--- scribo/ChangeLog | 5 +++++ .../with_single_left_link_dmax_ratio_aligned.hh | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 97b0179..137da91 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh: + Fix an invalid forward declaration. + +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes. * scribo/binarization/internal/global_max_stddev_functor.hh: diff --git a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh index f4e802e..df07415 100644 --- a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh +++ b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -65,8 +65,8 @@ namespace scribo /*! \brief Link objects with their left neighbor if exists. \param[in] components A component set. - \param[in] dmax_ratio Size ratio defining the maximum lookup - distance. + \param[in] dmax_f A function defining the maximum lookup + distance. \param[in] min_angle Minimum difference allowed for alignement angle. \param[in] max_angle Maximum difference allowed for @@ -83,17 +83,18 @@ namespace scribo where w is the bounding box width and h the bounding box height. */ - template <typename L> + template <typename L, typename F> inline object_links<L> with_single_left_link_dmax_ratio_aligned( const component_set<L>& components, - float dmax_ratio, + const DMax_Functor<F>& dmax_f, float min_angle, float max_angle, anchor::Type anchor); /// \overload /// anchor is set to MassCenter. + /// dmax_f functor is set to internal::dmax_default. // template <typename L> inline -- 1.7.2.5

1 0

olena-2.0-425-gb375ab3 doc/Makefile.am: Fix EXTRA_DIST.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 25 +++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c23b608..114d5d4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix EXTRA_DIST. + +2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 55ce81e..f7ad598 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -695,14 +695,23 @@ regen-am: EXTRA_DIST += \ $(DATA_html_dirs) \ $(DOXYFILE).in \ - groups/accu.dox \ - groups/graph.dox \ - groups/images.dox \ - groups/main.dox \ - groups/neighb.dox \ - groups/site_set.dox \ - groups/util.dox \ - groups/win.dox \ + mln/win/win.dox \ + mln/main.dox \ + mln/morpho/morpho.dox \ + mln/canvas/canvas.dox \ + mln/data/data.dox \ + mln/util/graph.dox \ + mln/util/util.dox \ + mln/io/io.dox \ + mln/accu/accu.dox \ + mln/core/image/morphers.dox \ + mln/core/image/identity_morpher.dox \ + mln/core/image/images.dox \ + mln/core/image/domain_morpher.dox \ + mln/core/image/value_morpher.dox \ + mln/core/image/concrete.dox \ + mln/core/neighb.dox \ + mln/core/site_set/site_set.dox \ img/small-enlarged.png \ img/small.png \ doxyfuns.sty \ -- 1.7.2.5

1 0

branch sandbox/anthony updated: olena-2.0-396-gd276a4c
by git＠lrde.epita.fr 22 Mar '13

22 Mar '13

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 sandbox/anthony has been updated via d276a4c40057677a7e0871dcc50ec004b068b620 (commit) via d481951ecd322ef4f015005880317ceaeeedc6c9 (commit) via a1e60f081c8f3a3e97adb1eef3cf7dabcd3568ae (commit) via adcbc825ba7d148d83609a3b90eebd5ce71529ee (commit) via f4c521e33b83c9b37a974fa25959af95713f6d7f (commit) from 5991f6ae98c5808deb04d4c611ff86b5fb846c3f (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 ----------------------------------------------------------------- d276a4c [ICDAR_13] Validate links of boxes based on separators d481951 [ICDAR_13] Check old version XML output with GUI Annotator a1e60f0 [ICDAR_13] Update XML output + Add XML reference adcbc82 [ICDAR_13] Externalize XML handler f4c521e [ICDAR] Externalize some functions ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/icdar_13_table/Makefile | 7 +- scribo/sandbox/icdar_13_table/TODO | 3 +- .../originals/competition-entry-region-model.xsd | 45 +++ scribo/sandbox/icdar_13_table/src/main.cc | 9 +- scribo/sandbox/icdar_13_table/src/new.cc | 386 ++++++++++++++------ scribo/sandbox/icdar_13_table/src/xml.cc | 48 +++ scribo/sandbox/icdar_13_table/src/xml.hh | 29 ++ 7 files changed, 400 insertions(+), 127 deletions(-) create mode 100644 scribo/sandbox/icdar_13_table/originals/competition-entry-region-model.xsd create mode 100644 scribo/sandbox/icdar_13_table/src/xml.cc create mode 100644 scribo/sandbox/icdar_13_table/src/xml.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-396-gd276a4c [ICDAR_13] Validate links of boxes based on separators
by Anthony Seure 22 Mar '13

22 Mar '13

--- scribo/sandbox/icdar_13_table/src/new.cc | 123 +++++++++++++++++++++++++----- 1 files changed, 102 insertions(+), 21 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 9f05030..5370164 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -87,10 +87,12 @@ void write_image(const image2d<value::rgb8>& ima, } // Draw vertical links from top to bottom (red) +template<typename L> void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, std::vector<short>& balance, - unsigned average_width) + unsigned average_width, + const scribo::component_set<L>& hlines) { for (unsigned i = 1; i <= groups.nelements(); ++i) { @@ -116,9 +118,27 @@ void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, && (unsigned) abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap && (unsigned) abs(p1[1] - p2[1]) < 20) // Vertical proximity { - draw::line(ima_groups, p1, p2, literal::red); - balance[i] += 1; - break; + unsigned k = 1; + short separators = 0; + + while (k <= hlines.nelements() && separators < 2) + { + const box2d& s = hlines(k).bbox(); + + if (s.pmin()[1] <= b1.pmin()[1] && s.pmax()[1] >= b1.pmax()[1] + && s.pmin()[0] > b1.pmax()[0] + && s.pmax()[0] < b2.pmin()[0]) + ++separators; + + ++k; + } + + if (separators < 2) + { + draw::line(ima_groups, p1, p2, literal::red); + balance[i] += 1; + break; + } } } } @@ -126,10 +146,12 @@ void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, } // Draw vertical links from bottom to top (red) +template<typename L> void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, std::vector<short>& balance, - unsigned average_width) + unsigned average_width, + const scribo::component_set<L>& hlines) { for (unsigned i = groups.nelements(); i > 0; --i) { @@ -155,9 +177,27 @@ void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, && (unsigned) abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap && (unsigned) abs(p1[1] - p2[1]) < 20) // Vertical proximity { - draw::line(ima_groups, p1, p2, literal::red); - balance[i] += 1; - break; + unsigned k = 1; + short separators = 0; + + while (k <= hlines.nelements() && separators < 2) + { + const box2d& s = hlines(k).bbox(); + + if (s.pmin()[1] <= b1.pmin()[1] && s.pmax()[1] >= b1.pmax()[1] + && s.pmax()[0] < b1.pmin()[0] + && s.pmin()[0] > b2.pmax()[0]) + ++separators; + + ++k; + } + + if (separators < 2) + { + draw::line(ima_groups, p1, p2, literal::red); + balance[i] += 1; + break; + } } } } @@ -165,9 +205,11 @@ void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, } // Draw horizontal links from left to right (green) +template<typename L> void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, - std::vector<short>& balance) + std::vector<short>& balance, + const scribo::component_set<L>& vlines) { for (unsigned i = 1; i <= groups.nelements(); ++i) { @@ -186,9 +228,27 @@ void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned && abs(p1[0] - p2[0]) < 10) // Reduced gap { - draw::line(ima_groups, p1, p2, literal::green); - balance[i] += 1; - break; + unsigned k = 1; + short separators = 0; + + while (k <= vlines.nelements() && separators < 2) + { + const box2d& s = vlines(k).bbox(); + + if (s.pmin()[0] <= b1.pmin()[0] && s.pmax()[0] >= b1.pmax()[0] + && s.pmin()[1] > b1.pmax()[1] + && s.pmax()[1] < b2.pmin()[1]) + ++separators; + + ++k; + } + + if (separators < 2) + { + draw::line(ima_groups, p1, p2, literal::green); + balance[i] += 1; + break; + } } } } @@ -196,9 +256,11 @@ void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, } // Draw horizontal links from right to left (green) +template<typename L> void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, - std::vector<short>& balance) + std::vector<short>& balance, + const scribo::component_set<L>& vlines) { for (unsigned i = groups.nelements(); i > 0; --i) { @@ -217,9 +279,27 @@ void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned && abs(p1[0] - p2[0]) < 10) // Reduced gap { - draw::line(ima_groups, p1, p2, literal::green); - balance[i] += 1; - break; + unsigned k = 1; + short separators = 0; + + while (k <= vlines.nelements() && separators < 2) + { + const box2d& s = vlines(k).bbox(); + + if (s.pmin()[0] <= b1.pmin()[0] && s.pmax()[0] >= b1.pmax()[0] + && s.pmax()[1] < b1.pmin()[1] + && s.pmin()[1] > b2.pmax()[1]) + ++separators; + + ++k; + } + + if (separators < 2) + { + draw::line(ima_groups, p1, p2, literal::green); + balance[i] += 1; + break; + } } } } @@ -358,12 +438,13 @@ int main(int argc, char** argv) std::vector<short> balance(groups.nelements(), 0); // Draw and count links - draw_links_tb(groups, ima_groups, balance, average_width); - draw_links_bt(groups, ima_groups, balance, average_width); - draw_links_lr(groups, ima_groups, balance); - draw_links_rl(groups, ima_groups, balance); + draw_links_tb(groups, ima_groups, balance, average_width, hlines); + draw_links_bt(groups, ima_groups, balance, average_width, hlines); + draw_links_lr(groups, ima_groups, balance, vlines); + draw_links_rl(groups, ima_groups, balance, vlines); - // Draw weighted boxes (red < orange < cyan < green) (useless ?) + // Draw weighted boxes (red < orange < cyan < green) + // 1 link < 2 links < 3 links < 3+ links for (unsigned i = 0; i < balance.size(); ++i) { if (balance[i] == 1) -- 1.7.2.5

1 0

olena-2.0-424-g4938c8d Small fixes.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

* scribo/binarization/internal/global_max_stddev_functor.hh: Remove reference to mln namespace. * headers.mk, * scribo/tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 10 ++++++++++ scribo/headers.mk | 1 + .../internal/global_max_stddev_functor.hh | 6 ++---- scribo/tests/unit_test/unit-tests.mk | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bc93c4f..97b0179 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -2,6 +2,16 @@ Small fixes. + * scribo/binarization/internal/global_max_stddev_functor.hh: + Remove reference to mln namespace. + + * headers.mk, + * scribo/tests/unit_test/unit-tests.mk: Regen. + +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes. + * scribo/binarization/all.hh: Add missing includes. * scribo/binarization/internal/niblack_threshold_functor.hh, diff --git a/scribo/headers.mk b/scribo/headers.mk index 10aaa60..e360703 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -5,6 +5,7 @@ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ scribo/binarization/global_threshold_auto.hh \ +scribo/binarization/internal/global_max_stddev_functor.hh \ scribo/binarization/internal/local_threshold_core.hh \ scribo/binarization/internal/local_threshold_debug.hh \ scribo/binarization/internal/niblack_formula.hh \ diff --git a/scribo/scribo/binarization/internal/global_max_stddev_functor.hh b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh index e10b77d..de6e91b 100644 --- a/scribo/scribo/binarization/internal/global_max_stddev_functor.hh +++ b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh @@ -28,7 +28,8 @@ /// \file /// -/// +/// \brief Functor computing the maximum standard deviation during an +/// integral image browsing. namespace scribo @@ -37,9 +38,6 @@ namespace scribo namespace binarization { - using namespace mln; - - namespace internal { diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index ec86dde..0484b75 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -186,6 +186,7 @@ scribo_all \ scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ +scribo_binarization_internal_global_max_stddev_functor \ scribo_binarization_internal_local_threshold_core \ scribo_binarization_internal_local_threshold_debug \ scribo_binarization_internal_niblack_formula \ -- 1.7.2.5

1 0