March 2013 - Olena-patches

olena-2.0-411-gc430b36 Misc. changes in the table recognition application.
by Roland Levillain 28 Mar '13

28 Mar '13

* scribo/src/contest/table-2013/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index 5d3bc11..962bf22 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -1,5 +1,4 @@ #undef MLN_WO_GLOBAL_VARS -#include "xml.hh" // INCLUDES OLENA #include <mln/binarization/all.hh> @@ -55,6 +54,7 @@ #include <scribo/text/merging.hh> #include "disjoint_set.hh" +#include "xml.hh" using namespace mln; @@ -451,7 +451,7 @@ int main(int argc, char** argv) I8 ima_groups = data::convert(value::rgb8(), tmp); I8 ima_valid = data::convert(value::rgb8(), tmp); - // Write links + // Draw links for (unsigned l = 1; l < merged_links.nelements(); ++l) { point2d p1 = scribo::primitive::link::internal::compute_anchor(merged_links.components(), l, scribo::anchor::MassCenter); @@ -640,7 +640,6 @@ int main(int argc, char** argv) // Write images and close XML unsigned number = 0; - write_image(bin, prefix, "bin", page, number); write_image(bin_without_separators, prefix, "bin_without_separators", page, number); write_image(denoised, prefix, "denoised", page, number); -- 1.7.2.5

1 0

olena-2.0-410-g9265a94 Improve the handling of outputs in the table recognition application.
by Roland Levillain 28 Mar '13

28 Mar '13

* src/contest/table-2013/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 49 ++++++++++++++++-------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index a40ed07..5d3bc11 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -83,13 +83,13 @@ void draw_adjacency_boxes(const std::vector<short>& balance, // Write image2d<bool> images void write_image(const image2d<bool>& ima, + const std::string prefix, const char* name, const unsigned page, - unsigned& number, - std::ostringstream& path) + unsigned& number) { - path.str(""); - path << "output/p" << page + std::ostringstream path; + path << "output/" << prefix << "_p" << page << "_" << number << "_" << name << ".pbm"; io::pbm::save(ima, path.str()); @@ -98,13 +98,13 @@ void write_image(const image2d<bool>& ima, // Write image2d<value::rbg8> images void write_image(const image2d<value::rgb8>& ima, + const std::string prefix, const char* name, const unsigned page, - unsigned& number, - std::ostringstream& path) + unsigned& number) { - path.str(""); - path << "output/p" << page + std::ostringstream path; + path << "output/" << prefix << "_p" << page << "_" << number << "_" << name << ".ppm"; io::ppm::save(ima, path.str()); @@ -346,9 +346,10 @@ int main(int argc, char** argv) typedef image2d<bool> IB; typedef scribo::component_set< image2d<unsigned> > CS; - if (argc != 2 && argc != 3) + if (argc != 3 && argc != 4) { - std::cerr << "usage: " << argv[0] << "input.pdf [scale]"; + std::cerr << "usage: " << argv[0] << " input.pdf output-prefix [scale]" + << std::endl; exit(1); } @@ -358,7 +359,7 @@ int main(int argc, char** argv) const float default_scale = 1.0; // Magnification factor. - const float scale_factor = argc == 3 ? strtof(argv[2], 0) : default_scale; + const float scale_factor = argc == 4 ? strtof(argv[3], 0) : default_scale; // Loading and binarization XML xml("final.xml", argv[1]); @@ -367,6 +368,9 @@ int main(int argc, char** argv) unsigned dpi = default_res * scale_factor; io::pdf::load(pdf, argv[1], dpi); + // Filename prefix. + std::string prefix(argv[2]); + // Iterate over all pages for (unsigned page = 0; page < pdf.nelements(); ++page) { @@ -635,19 +639,18 @@ int main(int argc, char** argv) } // Write images and close XML - std::ostringstream path; unsigned number = 0; - write_image(bin, "bin", page, number, path); - write_image(bin_without_separators, "bin_without_separators", page, number, path); - write_image(denoised, "denoised", page, number, path); - write_image(reverse, "reverse", page, number, path); - write_image(reverse_selection, "", page, number, path); - write_image(bin_merged, "reverse_selection", page, number, path); - write_image(comp, "bin_merged", page, number, path); - 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_cols_rows, "cols_rows", page, number, path); + write_image(bin, prefix, "bin", page, number); + write_image(bin_without_separators, prefix, "bin_without_separators", page, number); + write_image(denoised, prefix, "denoised", page, number); + write_image(reverse, prefix, "reverse", page, number); + write_image(reverse_selection, prefix, "", page, number); + write_image(bin_merged, prefix, "reverse_selection", page, number); + write_image(comp, prefix, "bin_merged", page, number); + write_image(ima_links, prefix, "components", page, number); + write_image(ima_groups, prefix, "groups", page, number); + write_image(ima_valid, prefix, "valid", page, number); + write_image(ima_cols_rows, prefix, "cols_rows", page, number); } } -- 1.7.2.5

1 0

branch origin/sandbox/anthony created: olena-2.0-401-g7936694
by git＠lrde.epita.fr 28 Mar '13

28 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 origin/sandbox/anthony has been created at 793669454e02565d98983df63057e20838b02991 (commit) - Log ----------------------------------------------------------------- 7936694 Remove many false positives (intersecting boxes) ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-401-g7936694 Remove many false positives (intersecting boxes)
by Anthony Seure 28 Mar '13

28 Mar '13

--- scribo/sandbox/icdar_13_table/src/new.cc | 35 +++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index bcf127e..d52ac15 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -58,6 +58,13 @@ using namespace mln; +// Check if two boxes intersected +bool intersect(const box2d& b1, const box2d& b2) +{ + return ((unsigned) abs(b1.pcenter().col() - b2.pcenter().col()) * 2 < b1.width() + b2.width() + && (unsigned) abs(b1.pcenter().row() - b2.pcenter().row()) * 2 < b1.height() + b2.height()); +} + // Draw weighted boxes (red < orange < cyan < green) // 1 link < 2 links < 3 links < 3+ links template<typename T, typename L> @@ -581,6 +588,9 @@ int main(int argc, char** argv) descendants[columns_set.find(j)].insert(j); } + std::vector<box2d> columns; + std::set<unsigned> not_valid; + // Visualization: columns. image2d<value::rgb8> ima_columns = data::convert(value::rgb8(), bin_merged); for (unsigned i = 0; i < groups.nelements(); ++i) @@ -590,9 +600,32 @@ int main(int argc, char** argv) 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); + draw::box(ima_columns, column_box, literal::green); + columns.push_back(column_box); } + for (unsigned i = 0; i < columns.size(); ++i) + { + for (unsigned j = 0; j < columns.size(); ++j) + { + if (i != j) + { + const box2d& c1 = columns[i]; + const box2d& c2 = columns[j]; + + if (intersect(c1, c2) || intersect(c2, c1)) + { + not_valid.insert(i); + not_valid.insert(j); + } + } + } + } + + for (unsigned i = 0; i < columns.size(); ++i) + if (not_valid.find(i) != not_valid.end()) + draw::box(ima_columns, columns[i], literal::red); + // Write images and close XML std::ostringstream path; unsigned number = 0; -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-450-g055f40a
by git＠lrde.epita.fr 28 Mar '13

28 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 unstable/scribo has been updated via 055f40a10996f1d64c9c2577f395a46409b49e2c (commit) from a74409363a9941dec0c4a86205cb5f22bdc2dab2 (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 ----------------------------------------------------------------- 055f40a doc/Makefile.am: Add a missing dependency. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ doc/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-450-g055f40a doc/Makefile.am: Add a missing dependency.
by Guillaume Lazzara 28 Mar '13

28 Mar '13

--- ChangeLog | 4 ++++ doc/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f26f566..806acdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Add a missing dependency. + 2013-03-27 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Allow tarballs with long filenames. diff --git a/doc/Makefile.am b/doc/Makefile.am index 2c9e81b..36a14aa 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -80,6 +80,8 @@ REFMAN_deps = $(srcdir)/footer.html \ $(srcdir)/get_sources.dox \ $(srcdir)/subdoc_footer.html \ contributors.html \ + lrde_olena.html + $(REFMAN_IMAGES) EXTRA_DIST += $(REFMAN_deps) -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-449-ga744093
by git＠lrde.epita.fr 28 Mar '13

28 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 unstable/scribo has been updated via a74409363a9941dec0c4a86205cb5f22bdc2dab2 (commit) via e0089be56aed528efb113d4f804adc7b0eeca65d (commit) from c6262b2dd178ba0b4cb6e6b9135d3006b287b98b (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ configure.ac | 2 +- milena/ChangeLog | 5 +++++ milena/mln/world/binary_2d/subsample.hh | 23 ++++++++--------------- 4 files changed, 18 insertions(+), 16 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch icdar/hnla2013 created: olena-2.0-449-ga744093
by git＠lrde.epita.fr 28 Mar '13

28 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 icdar/hnla2013 has been created at a74409363a9941dec0c4a86205cb5f22bdc2dab2 (commit) - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch icdar/hbr2013 created: olena-2.0-449-ga744093
by git＠lrde.epita.fr 28 Mar '13

28 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 icdar/hbr2013 has been created at a74409363a9941dec0c4a86205cb5f22bdc2dab2 (commit) - Log ----------------------------------------------------------------- a744093 configure.ac: Allow tarballs with long filenames. e0089be mln/world/binary_2d/subsample.hh: Cleanup code. Fix a memory leak. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

[Olena] #267: Factor some p2b and v2b functions.
by Olena Trac 28 Mar '13

28 Mar '13

#267: Factor some p2b and v2b functions. -------------------------+-------------------------------------------------- Reporter: lazzara | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Component: Milena | Version: 2.0 Keywords: | -------------------------+-------------------------------------------------- The following functions share the same code: - fun::p2b::tautology - fun::p2b::antilogy - fun::v2b::always_true.hh - fun::v2b::always_false.hh We would like to find a way to factor this code while preserving the function concept. -- Ticket URL: <https://trac.lrde.org/olena/ticket/267> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0