January 2011 - Olena-patches

last-svn-commit-755-g845cc75 Small fixes
by Guillaume Lazzara 28 Jan '11

28 Jan '11

* scribo/binarization/sauvola_ms.hh: Add comments. * scribo/toolchain/internal/content_in_doc_functor.hh: Initialize a local variable. * src/content_in_doc.cc, * src/pbm_text_in_doc.cc: Fix option processing. * tests/unit_test/Makefile.am, * tests/unit_test/cond_tests_magickxx_tesseract_tiff, * tests/unit_test/cond_tests_tesseract_tiff: Change test condition. --- scribo/ChangeLog | 17 +++++++++++++++++ scribo/scribo/binarization/sauvola_ms.hh | 6 ++++-- .../toolchain/internal/content_in_doc_functor.hh | 7 +++++-- scribo/src/content_in_doc.cc | 10 ++++++++-- scribo/src/pbm_text_in_doc.cc | 20 ++++++++++++-------- scribo/tests/unit_test/Makefile.am | 7 ++++--- .../unit_test/cond_tests_magickxx_tesseract_tiff | 1 + scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 - 8 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff diff --git a/scribo/ChangeLog b/scribo/ChangeLog index eba5cb3..d6a4b3d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,22 @@ 2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes + + * scribo/binarization/sauvola_ms.hh: Add comments. + + * scribo/toolchain/internal/content_in_doc_functor.hh: Initialize + a local variable. + + * src/content_in_doc.cc, + * src/pbm_text_in_doc.cc: Fix option processing. + + * tests/unit_test/Makefile.am, + * tests/unit_test/cond_tests_magickxx_tesseract_tiff, + * tests/unit_test/cond_tests_tesseract_tiff: Change test + condition. + +2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/scribo-cli.in: Add content_in_doc entry. 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 1233d1c..e8eb2c2 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -280,6 +280,8 @@ namespace scribo typedef const mln_value(K)* ptr_type; + // Warning: if there are pixels with value different from 2, 3 + // or 4 in e2, it will crash because of that array... ptr_type ptr_t[5]; ptr_t[2] = & t_ima[2].at_(0, 0); ptr_t[3] = & t_ima[3].at_(0, 0); @@ -301,8 +303,8 @@ namespace scribo more_offset = 0; // No offset needed. const int - nrows4 = t_ima[4].nrows(), ncols4 = t_ima[4].ncols(), - + nrows4 = t_ima[4].nrows(), + ncols4 = t_ima[4].ncols(), delta1 = in.delta_index(dpoint2d(+1, -(s - 1))), delta1b = in.delta_index(dpoint2d(+1, -(s + s - 1))), diff --git a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh index 7c665e5..fb7cd7c 100644 --- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_doc_functor.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. // @@ -162,7 +163,9 @@ namespace scribo doc.set_image(exact(original_image)); // Remove separators - mln_ch_value(I,bool) separators, input_cleaned; + mln_ch_value(I,bool) + separators, + input_cleaned = exact(processed_image); if (enable_line_seps) { on_new_progress_label("Find vertical separators..."); diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index 8cd262b..9748b28 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -100,7 +100,7 @@ int main(int argc, char* argv[]) image2d<bool> input_preproc; { double K = 0.34; - if (argc == 8 || argc == 12 || argc >= 12) + if (argc == 8 || argc >= 12) { if (argc == 8) K = atof(argv[7]); @@ -140,14 +140,20 @@ int main(int argc, char* argv[]) std::string language = "eng"; if (argc >= 5 && argc < 13) language = argv[4]; + else if (argc >= 12) + language = argv[8]; bool find_line_seps = true; if (argc >= 6 && argc < 13) find_line_seps = (atoi(argv[5]) != 0); + else if (argc >= 12) + find_line_seps = (atoi(argv[9]) != 0); bool find_whitespace_seps = true; if (argc >= 7 && argc < 13) - find_line_seps = (atoi(argv[6]) != 0); + find_whitespace_seps = (atoi(argv[6]) != 0); + else if (argc >= 12) + find_whitespace_seps = (atoi(argv[10]) != 0); std::cout << "Running with the following options :" << " ocr_language = " << language diff --git a/scribo/src/pbm_text_in_doc.cc b/scribo/src/pbm_text_in_doc.cc index 721ff47..2726ead 100644 --- a/scribo/src/pbm_text_in_doc.cc +++ b/scribo/src/pbm_text_in_doc.cc @@ -101,7 +101,7 @@ int main(int argc, char* argv[]) // Optional Cropping point2d crop_shift = literal::origin; - if (argc >= 12) + if (argc >= 9) { mln::def::coord minr = atoi(argv[4]), @@ -109,6 +109,9 @@ int main(int argc, char* argv[]) maxr = atoi(argv[6]), maxc = atoi(argv[7]); + std::cout << "> Image cropped from (" << minr << "," << minc << ")" + << " to (" << maxr << "," << maxc << ")" << std::endl; + box2d roi = mln::make::box2d(minr, minc, maxr, maxc); input = preprocessing::crop_without_localization(input, roi); crop_shift = point2d(minr, minc); @@ -121,26 +124,27 @@ int main(int argc, char* argv[]) bool denoise = (argc > 3 && atoi(argv[3]) != 0); std::string language = "eng"; - if (argc > 4 && argc < 12) + if (argc > 4 && argc < 10) language = argv[4]; - else if (argc == 12) + else if (argc >= 9) language = argv[8]; bool find_line_seps = true; - if (argc > 5 && argc < 12) + if (argc > 5 && argc < 10) find_line_seps = (atoi(argv[5]) != 0); - else if (argc == 12) + else if (argc >= 10) find_line_seps = (atoi(argv[9]) != 0); bool find_whitespace_seps = true; - if (argc > 6 && argc < 12) + if (argc > 6 && argc < 10) find_whitespace_seps = (atoi(argv[6]) != 0); - else if (argc == 12) + else if (argc >= 11) find_whitespace_seps = (atoi(argv[10]) != 0); std::cout << "Running with the following options :" - << "find_lines_seps = " << find_line_seps + << " ocr language = " << language + << " | find_lines_seps = " << find_line_seps << " | find_whitespace_seps = " << find_whitespace_seps << " | debug = " << debug << std::endl; diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index b150824..c88f553 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/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. # @@ -17,7 +17,8 @@ include $(top_srcdir)/scribo/tests/tests.mk -COND_TESTS = cond_tests_qt \ +COND_TESTS = cond_tests_magickxx_tesseract_tiff \ + cond_tests_qt \ cond_tests_qt_tesseract_tiff \ cond_tests_tesseract_tiff diff --git a/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff b/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff new file mode 100644 index 0000000..3f1c2fb --- /dev/null +++ b/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff @@ -0,0 +1 @@ +scribo/toolchain/internal/content_in_doc_functor.hh diff --git a/scribo/tests/unit_test/cond_tests_tesseract_tiff b/scribo/tests/unit_test/cond_tests_tesseract_tiff index 1324f06..ee10868 100644 --- a/scribo/tests/unit_test/cond_tests_tesseract_tiff +++ b/scribo/tests/unit_test/cond_tests_tesseract_tiff @@ -1,5 +1,4 @@ scribo/text/recognition.hh -scribo/toolchain/internal/content_in_doc_functor.hh scribo/toolchain/internal/text_in_doc_functor.hh scribo/toolchain/content_in_doc.hh scribo/toolchain/text_in_doc.hh -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-754-g1929a06
by lazzara＠lrde.epita.fr 28 Jan '11

28 Jan '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-build-test has been updated via 1929a06cb69ed407a22cab24f255597724cd1b15 (commit) via 74824d3f48aa29bdd954121fa410a31ec2a45629 (commit) from 7cb7284e9d339d7fc6efff83358d5dbd5a6d7d71 (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 ----------------------------------------------------------------- 1929a06 src/scribo-cli.in: Add content_in_doc entry. 74824d3 demo/xml2doc/templates/pdf/line.xsl: Make use of paragraph information in PDF output. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 9 +++++++++ scribo/demo/xml2doc/templates/pdf/line.xsl | 18 +++++++++--------- scribo/src/scribo-cli.in | 11 ++++++++++- 3 files changed, 28 insertions(+), 10 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-754-g1929a06 src/scribo-cli.in: Add content_in_doc entry.
by Guillaume Lazzara 28 Jan '11

28 Jan '11

--- scribo/ChangeLog | 4 ++++ scribo/src/scribo-cli.in | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a61f078..eba5cb3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + * src/scribo-cli.in: Add content_in_doc entry. + 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/xml2doc/templates/pdf/line.xsl: Make use of paragraph diff --git a/scribo/src/scribo-cli.in b/scribo/src/scribo-cli.in index 96fcdf2..e4964f3 100755 --- a/scribo/src/scribo-cli.in +++ b/scribo/src/scribo-cli.in @@ -44,7 +44,12 @@ List of available COMMAND argument: doc-ppc Common preprocessing before looking for text. - doc-ocr Find and recognize text. + doc-ocr Find and recognize text. Output: the actual text + and its location. + + doc-dia Analyse the document structure and extract the + text. Output: an XML file with region and text + information. @@ -101,6 +106,10 @@ run_cmd() $bdir/pbm_text_in_doc $@ ;; + doc-dia) + $bdir/content_in_doc $@ + ;; + pic-loc) $bdir/text_in_picture $@ ;; -- 1.5.6.5

1 0

last-svn-commit-753-g74824d3 demo/xml2doc/templates/pdf/line.xsl: Make use of paragraph information in PDF output.
by Guillaume Lazzara 27 Jan '11

27 Jan '11

--- scribo/ChangeLog | 5 +++++ scribo/demo/xml2doc/templates/pdf/line.xsl | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3b85f66..a61f078 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/templates/pdf/line.xsl: Make use of paragraph + information in PDF output. + +2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit-test/cond_tests_tesseract_tiff: Add content_in_doc.hh. diff --git a/scribo/demo/xml2doc/templates/pdf/line.xsl b/scribo/demo/xml2doc/templates/pdf/line.xsl index e804d52..7056da0 100644 --- a/scribo/demo/xml2doc/templates/pdf/line.xsl +++ b/scribo/demo/xml2doc/templates/pdf/line.xsl @@ -2,30 +2,30 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">  - <xsl:template match="pcGts/page/text_region/paragraph/line"> + <xsl:template match="pcGts/page/text_region/line">  <xsl:variable name="x_height"> - <xsl:value-of select="../../@x_height" /> + <xsl:value-of select="@x_height" /> </xsl:variable>  <xsl:variable name="a_height"> - <xsl:value-of select="../../@a_height" /> + <xsl:value-of select="@a_height" /> </xsl:variable>  <xsl:variable name="d_height_abs"> <xsl:choose> - <xsl:when test="../../@d_height < 0"> - <xsl:value-of select="-../../@d_height" /> + <xsl:when test="@d_height < 0"> + <xsl:value-of select="-@d_height" /> </xsl:when> <xsl:otherwise> - <xsl:value-of select="../../@d_height" /> + <xsl:value-of select="@d_height" /> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -106,8 +106,8 @@  <xsl:variable name="colour"> <xsl:choose> - <xsl:when test="../../@txt_colour != ''"> - <xsl:value-of select="translate(../../@txt_colour, $smallcase, $uppercase)" /> + <xsl:when test="@txt_colour != ''"> + <xsl:value-of select="translate(@txt_colour, $smallcase, $uppercase)" /> </xsl:when> <xsl:otherwise> black -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-752-g7cb7284
by lazzara＠lrde.epita.fr 27 Jan '11

27 Jan '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-build-test has been updated via 7cb7284e9d339d7fc6efff83358d5dbd5a6d7d71 (commit) via c1f761e61f51e51b3d191ded765eac9b852ae47e (commit) from 0b401e10bf1f46b312d3527eae0f427778001ade (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 ----------------------------------------------------------------- 7cb7284 tests/convert/to_qimage_nocopy.cc: Fix a warning. c1f761e tests/unit-test/cond_tests_tesseract_tiff: Add content_in_doc.hh. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++++ milena/tests/convert/to_qimage_nocopy.cc | 5 +++-- scribo/ChangeLog | 5 +++++ scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-752-g7cb7284 tests/convert/to_qimage_nocopy.cc: Fix a warning.
by Guillaume Lazzara 27 Jan '11

27 Jan '11

--- milena/ChangeLog | 4 ++++ milena/tests/convert/to_qimage_nocopy.cc | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 76cf550..7a28158 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/convert/to_qimage_nocopy.cc: Fix a warning. + 2011-01-20 Guillaume Lazzara <z(a)lrde.epita.fr> Fix a serious bug with gcc 4.5 and later. diff --git a/milena/tests/convert/to_qimage_nocopy.cc b/milena/tests/convert/to_qimage_nocopy.cc index e2b83cc..506e601 100644 --- a/milena/tests/convert/to_qimage_nocopy.cc +++ b/milena/tests/convert/to_qimage_nocopy.cc @@ -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. // @@ -41,7 +42,7 @@ #include <mln/convert/to_qimage_nocopy.hh> -main() +int main() { using namespace mln; -- 1.5.6.5

1 0

last-svn-commit-751-gc1f761e tests/unit-test/cond_tests_tesseract_tiff: Add content_in_doc.hh.
by Guillaume Lazzara 27 Jan '11

27 Jan '11

--- scribo/ChangeLog | 5 +++++ scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1a8998e..3b85f66 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit-test/cond_tests_tesseract_tiff: Add + content_in_doc.hh. + +2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/Makefile.am: Fix generated file dependency. 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/unit_test/cond_tests_tesseract_tiff b/scribo/tests/unit_test/cond_tests_tesseract_tiff index c55f4c1..1324f06 100644 --- a/scribo/tests/unit_test/cond_tests_tesseract_tiff +++ b/scribo/tests/unit_test/cond_tests_tesseract_tiff @@ -1,4 +1,5 @@ scribo/text/recognition.hh scribo/toolchain/internal/content_in_doc_functor.hh scribo/toolchain/internal/text_in_doc_functor.hh +scribo/toolchain/content_in_doc.hh scribo/toolchain/text_in_doc.hh -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-750-g0b401e1
by lazzara＠lrde.epita.fr 27 Jan '11

27 Jan '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-build-test has been updated via 0b401e10bf1f46b312d3527eae0f427778001ade (commit) from f4bb64d1b80774189d198b923692d2d2cfb8f350 (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 ----------------------------------------------------------------- 0b401e1 demo/xml2doc/Makefile.am: Fix generated file dependency. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/Makefile.am | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-750-g0b401e1 demo/xml2doc/Makefile.am: Fix generated file dependency.
by Guillaume Lazzara 27 Jan '11

27 Jan '11

--- scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/Makefile.am | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8d534cd..1a8998e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/Makefile.am: Fix generated file dependency. + +2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix missing includes. * scribo/filter/line_links_x_height.hh, diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am index ca8c578..c3e0d1c 100644 --- a/scribo/demo/xml2doc/Makefile.am +++ b/scribo/demo/xml2doc/Makefile.am @@ -39,7 +39,8 @@ scribo_xml2doc_LDADD = $(QT_LIBS) $(LDADD) BUILT_SOURCES = common.moc.cc \ image_crop.moc.cc \ loader.moc.cc \ - xml_transform.moc.cc + xml_transform.moc.cc \ + datarootdir.hh noinst_HEADERS = common.hh \ -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-749-gf4bb64d
by lazzara＠lrde.epita.fr 27 Jan '11

27 Jan '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-build-test has been updated via f4bb64d1b80774189d198b923692d2d2cfb8f350 (commit) from a4ce6e74f91ddafc9206ee6289043897bfbeb837 (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 ----------------------------------------------------------------- f4bb64d Fix missing includes. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 7 +++++++ scribo/scribo/filter/line_links_x_height.hh | 1 + scribo/scribo/primitive/identify.hh | 7 +++++-- 3 files changed, 13 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0