- Olena-patches

branch unstable/scribo updated: olena-2.0-53-ga20c065
by git＠lrde.epita.fr 29 Nov '11

29 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via a20c0650f91295e50e8913ecd9f8bf0516747318 (commit) via 4f0a66f09045818f9b9bb16dc315ca7691e30c03 (commit) via d5207270e354bb9317c6339ab1ada1bc7e88f701 (commit) via 1f0b6046717272eac676f1f9212ce1f6ab00eba0 (commit) via 7876a2ce362a03e89fc494def140d0bb0c6d654f (commit) via ae6f6e5e98ec7c589cadc60ac8547639c36e45d8 (commit) via 6c73505ca244e78dfc6557fe69387381d2e81916 (commit) via 876593557f34e3a78366a5aa9322fec0afae8af3 (commit) via 861239963254a72f51b25bfd8323a12ff4a58b82 (commit) via 31125795c939e4f5a1175022dc534025ad8ed179 (commit) via 7dbcef7b638f3e0a133551a7b5a0c81b8326e979 (commit) from 54defbbea0f22afc1413698b007cd6457d245f40 (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 ----------------------------------------------------------------- a20c065 Merge branch 'next' into unstable/scribo 4f0a66f Do not compile scribo-viewer if Tesseract is not present. d520727 Make recognition faster and store recognition confidence. ae6f6e5 mln/io/dicom/load.hh: Update comments. 8765935 Improve io::dump tests with floating values. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 16 +++ distrib/macports/Portfile.in | 2 +- lrde-scmstats.sh | 20 ++- milena/ChangeLog | 44 +++++++ milena/mln/debug/slices_2d.hh | 2 + milena/mln/fun/v2v/rgb_to_hsl.hh | 2 +- milena/mln/io/dicom/load.hh | 2 +- milena/mln/io/dump/get_header.hh | 4 +- milena/mln/io/fld/header.hh | 7 +- milena/mln/io/fld/load.hh | 3 +- milena/mln/io/fld/load_header.hh | 5 +- milena/mln/io/off/load.hh | 12 ++ milena/mln/io/off/save.hh | 8 ++ milena/mln/math/jacobi.hh | 4 +- milena/mln/morpho/hit_or_miss.hh | 7 +- milena/mln/value/builtin/floatings.hh | 14 ++- milena/mln/world/binary_2d/subsample.hh | 4 +- milena/tests/Makefile.am | 2 + milena/tests/global_vars1.cc | 6 +- milena/tests/global_vars2.cc | 10 +- milena/tests/io/dump/Makefile.am | 4 +- milena/tests/io/dump/dump.cc | 20 +++- milena/tests/value/builtin/floatings.cc | 34 ++++-- scribo/ChangeLog | 13 ++ scribo/demo/Makefile.am | 8 +- scribo/scribo/core/line_info.hh | 11 ++- scribo/scribo/text/recognition.hh | 189 ++++++++++++++++++++++++------ 27 files changed, 375 insertions(+), 78 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-53-ga20c065 Merge branch 'next' into unstable/scribo
by Guillaume Lazzara 29 Nov '11

29 Nov '11

This is a merge commit message of the following branches: Merge: 4f0a66f 1f0b604 ChangeLog | 16 ++++++++++++++ distrib/macports/Portfile.in | 2 +- lrde-scmstats.sh | 20 +++++++++++------ milena/ChangeLog | 33 ++++++++++++++++++++++++++++++ milena/mln/debug/slices_2d.hh | 2 + milena/mln/fun/v2v/rgb_to_hsl.hh | 2 +- milena/mln/io/dump/get_header.hh | 4 ++- milena/mln/io/fld/header.hh | 7 ++++- milena/mln/io/fld/load.hh | 3 +- milena/mln/io/fld/load_header.hh | 5 +++- milena/mln/io/off/load.hh | 12 +++++++++++ milena/mln/io/off/save.hh | 8 +++++++ milena/mln/math/jacobi.hh | 4 ++- milena/mln/morpho/hit_or_miss.hh | 7 +++++- milena/mln/value/builtin/floatings.hh | 14 +++++++++++- milena/mln/world/binary_2d/subsample.hh | 4 ++- milena/tests/Makefile.am | 2 + milena/tests/global_vars1.cc | 6 ++++- milena/tests/global_vars2.cc | 10 ++++++-- milena/tests/value/builtin/floatings.cc | 34 +++++++++++++++++++++++------- 20 files changed, 164 insertions(+), 31 deletions(-) diff --cc milena/ChangeLog index cd7886f,b977679..695abec --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,24 -1,36 +1,57 @@@ + 2011-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix the initialization of all global constants (ticket #43) + + * mln/debug/slices_2d.hh, + * mln/io/dump/get_header.hh, + * mln/io/fld/header.hh, + * mln/io/fld/load.hh, + * mln/io/fld/load_header.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/math/jacobi.hh, + * mln/morpho/hit_or_miss.hh, + * mln/world/binary_2d/subsample.hh: Add missing 'inline'. + + * tests/Makefile.am (CXXFLAGS): Add -DMLN_WO_GLOBAL_VARS. + + * tests/global_vars1.cc, + * tests/global_vars2.cc: Make take MLN_WO_GLOBAL_VARS into + consideration. + + 2011-11-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid minimum value for builtin floating types. (ticket #247) + + * mln/value/builtin/floatings.hh: Here. + + * tests/value/builtin/floatings.cc: write test. + + 2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration. + +2011-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/dicom/load.hh: Update comments. + +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve io::dump tests with floating values. + + * tests/io/dump/Makefile.am, + * tests/io/dump/dump.cc: Here. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + New routine in Milena. + + * mln/data/compute_in_window.hh: New. + + * tests/data/Makefile.am: New target. + + * tests/data/compute_in_window.cc: New test. + 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> Fix compilation with multiple files. hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch fix-globals deleted: olena-2.0-20-g1f0b604
by git＠lrde.epita.fr 29 Nov '11

29 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fix-globals has been deleted was 1f0b6046717272eac676f1f9212ce1f6ab00eba0 ----------------------------------------------------------------------- 1f0b6046717272eac676f1f9212ce1f6ab00eba0 Fix the initialization of all global constants (ticket #43) ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: olena-2.0-20-g1f0b604
by git＠lrde.epita.fr 29 Nov '11

29 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 1f0b6046717272eac676f1f9212ce1f6ab00eba0 (commit) from 7876a2ce362a03e89fc494def140d0bb0c6d654f (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: milena/ChangeLog | 21 +++++++++++++++++++++ milena/mln/debug/slices_2d.hh | 2 ++ milena/mln/io/dump/get_header.hh | 4 +++- milena/mln/io/fld/header.hh | 7 +++++-- milena/mln/io/fld/load.hh | 3 ++- milena/mln/io/fld/load_header.hh | 5 ++++- milena/mln/io/off/load.hh | 15 ++++++++++++++- milena/mln/io/off/save.hh | 11 ++++++++++- milena/mln/math/jacobi.hh | 4 +++- milena/mln/morpho/hit_or_miss.hh | 7 ++++++- milena/mln/world/binary_2d/subsample.hh | 4 +++- milena/tests/Makefile.am | 2 ++ milena/tests/global_vars1.cc | 6 +++++- milena/tests/global_vars2.cc | 10 +++++++--- 14 files changed, 87 insertions(+), 14 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-46-g4f0a66f Do not compile scribo-viewer if Tesseract is not present.
by Guillaume Lazzara 29 Nov '11

29 Nov '11

* demo/Makefile.am: Add guards. --- scribo/ChangeLog | 6 ++++++ scribo/demo/Makefile.am | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e8fe131..b98f55b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2011-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Do not compile scribo-viewer if Tesseract is not present. + + * demo/Makefile.am: Add guards. + +2011-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Make recognition faster and store recognition confidence. * scribo/core/line_info.hh, diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index 328f17e..b5825c9 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -25,8 +25,12 @@ SUBDIRS += review if HAVE_MAGICKXX +if HAVE_TESSERACT + SUBDIRS += viewer +endif HAVE_TESSERACT + endif HAVE_MAGICKXX -- 1.7.2.5

1 0

olena-2.0-45-gd520727 Make recognition faster and store recognition confidence.
by Guillaume Lazzara 29 Nov '11

29 Nov '11

* scribo/core/line_info.hh, * scribo/text/recognition.hh: Here. --- scribo/ChangeLog | 7 ++ scribo/scribo/core/line_info.hh | 11 ++- scribo/scribo/text/recognition.hh | 189 +++++++++++++++++++++++++++++-------- 3 files changed, 167 insertions(+), 40 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a105435..e8fe131 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make recognition faster and store recognition confidence. + + * scribo/core/line_info.hh, + * scribo/text/recognition.hh: Here. + 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> Regenerate mk files. diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 2913f81..b121205 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -137,6 +137,7 @@ namespace scribo // sqrt(Max(VAR(R), VAR(G), VAR(B))) float color_reliability_; + float text_confidence_; std::string text_; std::string html_text_; @@ -237,9 +238,12 @@ namespace scribo bool indented() const; bool has_text() const; + // Returns the percentage of confidence of the recognized text. If + // no text has been recognized, it returns -1. + float text_confidence() const; const std::string& text() const; const std::string& html_text() const; - void update_text(const std::string& str); + void update_text(const std::string& str, float confidence); bool is_valid() const; @@ -400,6 +404,8 @@ namespace scribo reading_orientation_ = 0.; indented_ = false; + + text_confidence_ = -1; } } // end of namespace scribo::internal @@ -769,8 +775,9 @@ namespace scribo template <typename L> void - line_info<L>::update_text(const std::string& str) + line_info<L>::update_text(const std::string& str, float confidence = 1.0) { + data_->text_confidence_ = confidence; data_->text_ = str; data_->html_text_ = scribo::internal::html_markups_replace(str); } diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index b7e5c91..358ff24 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -59,6 +59,8 @@ # include <tesseract/baseapi.h> +# include <tesseract/ocrclass.h> +# include <tesseract/resultiterator.h> # if !defined HAVE_TESSERACT_2 && !defined HAVE_TESSERACT_3 @@ -100,6 +102,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY +# ifdef HAVE_TESSERACT_2 template <typename L> void recognition(line_set<L>& lines, const char *language) @@ -108,19 +111,8 @@ namespace scribo // Initialize Tesseract. -# ifdef HAVE_TESSERACT_2 - TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); -# else // HAVE_TESSERACT_3 - tesseract::TessBaseAPI tess; - if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) - { - std::cout << "Error: cannot initialize tesseract!" << std::endl; - abort(); - } - tess.SetPageSegMode(tesseract::PSM_SINGLE_LINE); - -# endif // HAVE_TESSERACT_2 + TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); typedef mln_ch_value(L,bool) I; @@ -148,7 +140,8 @@ namespace scribo for_all_elements(e, lines(i).component_ids()) { unsigned comp_id = comps(e); - data::fill(((text_ima | comp_set(comp_id).bbox()).rw() | (pw::value(lbl) == pw::cst(comp_id))).rw(), + data::fill(((text_ima | comp_set(comp_id).bbox()).rw() + | (pw::value(lbl) == pw::cst(comp_id))).rw(), true); } @@ -170,7 +163,6 @@ namespace scribo data::paste_without_localization(text_ima, line_image); // Recognize characters. -# ifdef HAVE_TESSERACT_2 char* s = TessBaseAPI::TesseractRect( (unsigned char*) line_image.buffer(), sizeof (bool), // Pixel size. @@ -179,15 +171,6 @@ namespace scribo 0, // Top line_image.ncols(), // n cols line_image.nrows()); // n rows -# else // HAVE_TESSERACT_3 - tess.SetImage( - (unsigned char*) line_image.buffer(), - line_image.ncols(), // n cols - line_image.nrows(), // n rows - sizeof (bool), // Pixel size. - line_image.ncols() * sizeof (bool)); // Row_offset - char* s = tess.GetUTF8Text(); -# endif // ! HAVE_TESSERACT_2 if (s != 0) { @@ -216,16 +199,7 @@ namespace scribo mln_precondition(line.is_valid()); // Initialize Tesseract. -# ifdef HAVE_TESSERACT_2 TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); -# else // HAVE_TESSERACT_3 - tesseract::TessBaseAPI tess; - if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) - { - std::cout << "Error: cannot initialize tesseract!" << std::endl; - abort(); - } -# endif // ! HAVE_TESSERACT_2 std::ofstream file; if (!output_file.empty()) @@ -244,7 +218,6 @@ namespace scribo border::resize(text_ima, 0); // Recognize characters. -# ifdef HAVE_TESSERACT_2 char* s = TessBaseAPI::TesseractRect( (unsigned char*) text_ima.buffer(), sizeof (bool), // Pixel size. @@ -253,16 +226,152 @@ namespace scribo 0, // Top text_ima.ncols(), // n cols text_ima.nrows()); // n rows + + if (s != 0) + { + if (!output_file.empty()) + { + std::string str(s); + str = str.substr(0, str.length() - 1); + file << line.domain().bbox().pmin().row() + << " " + << line.domain().bbox().pmin().col() + << " " + << line.domain().bbox().pmax().row() + << " " + << line.domain().bbox().pmax().col() + << " " + << str; + } + } + + // The string has been allocated by Tesseract. We must free it. + delete [] s; + + if (!output_file.empty()) + file.close(); + + trace::exiting("scribo::text::recognition"); + } + + + # else // HAVE_TESSERACT_3 + + + + template <typename L> + void + recognition(line_set<L>& lines, const char *language) + { + trace::entering("scribo::text::recognition"); + + + // Initialize Tesseract. + tesseract::TessBaseAPI tess; + if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) + { + std::cout << "Error: cannot initialize tesseract!" << std::endl; + abort(); + } + tess.SetPageSegMode(tesseract::PSM_SINGLE_LINE); + + typedef mln_ch_value(L,bool) I; + + + /// Use text bboxes with Tesseract + for_all_lines(i, lines) + { + if (! lines(i).is_textline()) + continue; + + mln_domain(I) box = lines(i).bbox(); + + // Make sure characters are isolated from the borders. + // Help Tesseract. + // FIXME: not needed anymore in tesseract 3 ? + // + box.enlarge(2); + + I text_ima(box); + data::fill(text_ima, false); + + // Careful : background is set to 'False' + const component_set<L>& comp_set = lines.components(); + const L& lbl = comp_set.labeled_image(); + + // Extract each character components to create the line image. + const mln::util::array<component_id_t>& comps = lines(i).component_ids(); + for_all_elements(e, lines(i).component_ids()) + { + unsigned comp_id = comps(e); + data::fill(((text_ima | comp_set(comp_id).bbox()).rw() + | (pw::value(lbl) == pw::cst(comp_id))).rw(), + true); + } + + /// Improve text quality. + text::clean_inplace(lines(i), text_ima); + + // Recognize characters. + tess.SetImage( + (unsigned char*) &text_ima(text_ima.domain().pmin()), + text_ima.ncols(), // n cols + text_ima.nrows(), // n rows + sizeof (bool), // Pixel size. + text_ima.ncols() * sizeof (bool) + 2 * text_ima.border()); // Row_offset + + char *s = tess.GetUTF8Text(); + if (s != 0) + { + tesseract::ResultIterator *it = tess.GetIterator(); + std::string str(s); + str = str.substr(0, str.length() - 2); + lines(i).update_text(str, it->Confidence(tesseract::RIL_TEXTLINE)); + } + + delete[] s; + } + + trace::exiting("scribo::text::recognition"); + } + + + + template <typename I> + void + recognition(const Image<I>& line_, + const char *language, + const std::string& output_file = std::string()) + { + trace::entering("scribo::text::recognition"); + + const I& line = exact(line_); + mln_precondition(line.is_valid()); + + // Initialize Tesseract. + tesseract::TessBaseAPI tess; + if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) + { + std::cout << "Error: cannot initialize tesseract!" << std::endl; + abort(); + } + + std::ofstream file; + if (!output_file.empty()) + file.open(output_file.c_str()); + + mln_domain(I) box = line.domain(); + + // Recognize characters. char* s = tess.TesseractRect( - (unsigned char*) text_ima.buffer(), + (unsigned char*) &line(line.domain().pmin()), sizeof (bool), // Pixel size. - text_ima.ncols() * sizeof (bool), // Row_offset + line.ncols() * sizeof (bool) + line.border() * 2, // Row_offset 0, // Left 0, // Top - text_ima.ncols(), // n cols - text_ima.nrows()); // n rows -# endif // ! HAVE_TESSERACT_2 + line.ncols(), // n cols + line.nrows()); // n rows if (s != 0) { @@ -292,6 +401,10 @@ namespace scribo } +# endif // ! HAVE_TESSERACT_2 + + + # endif // ! MLN_INCLUDE_ONLY -- 1.7.2.5

1 0

[Olena] #250: Improve iteration over elements in high-level data structures
by Olena Trac 29 Nov '11

29 Nov '11

#250: Improve iteration over elements in high-level data structures -------------------------+-------------------------------------------------- Reporter: lazzara | Owner: lazzara Type: enhancement | Status: new Priority: critical | Milestone: Component: Scribo | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Currently, accessing information about an element in a document using data structures is error prone. For instance, iterating over a component_set and accessing current component information look like this: {{{ component_set<L> compset; for_all_comps(comp, compset) compset(comp).is_valid(); }}} Here, ''comp'' is an ID, not the component itself. Moreover, it is error prone since several methods exists both in the container and in element structure: {{{ component_set<L> compset; for_all_comps(comp, compset) compset.is_valid(); }}} This code would also work and may not lead to the expected result... We want iterators to write the following code: {{{ component_set<L> compset; scribo_citer(component_set<L>) comp(compset); for_all(comp) comp.is_valid(); }}} Iterators would also make the code more 'Milena style'. -- Ticket URL: <https://trac.lrde.org/olena/ticket/250> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 1

[Olena] #249: Add export to OpenDocument
by Olena Trac 29 Nov '11

29 Nov '11

#249: Add export to OpenDocument -------------------------+-------------------------------------------------- Reporter: lazzara | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Component: Scribo | Version: 2.0 Keywords: | -------------------------+-------------------------------------------------- Scribo-viewer can only export segmentation results to XML, PDF or HTML. We would like to export to editable documents like OpenDocument. We could use the following library: http://docs.lpod-project.org/ -- Ticket URL: <https://trac.lrde.org/olena/ticket/249> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

Re: [Olena-patches] [Olena] #14: Clean up stc::entry
by Olena Trac 29 Nov '11

29 Nov '11

#14: Clean up stc::entry -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: closed Priority: trivial | Milestone: Olena NG Component: Static | Version: 2.0 Resolution: wontfix | Keywords: entry -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => wontfix Comment: Olena NG (based on the old SCOOP 2) is no longer being developped; closing this ticket. -- Ticket URL: <https://trac.lrde.org/olena/ticket/14#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

Re: [Olena-patches] [Olena] #13: Specify the position of SCOOP w.r.t. virtual inheritance
by Olena Trac 29 Nov '11

29 Nov '11

#13: Specify the position of SCOOP w.r.t. virtual inheritance -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: proposal | Status: closed Priority: trivial | Milestone: Olena NG Component: Olena | Version: 2.0 Resolution: wontfix | Keywords: scoop virtual inheritance -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * type: enhancement => proposal * resolution: => wontfix Comment: Olena NG (based on the old SCOOP 2) is no longer being developped; closing this ticket. -- Ticket URL: <https://trac.lrde.org/olena/ticket/13#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0