- Olena-patches

last-svn-commit-534-g40966cc Handle Tesseract 2.x and 3.x in configuration.
by Guillaume Lazzara 25 Oct '10

25 Oct '10

* configure.ac: Call OLN_WITH_TESSERACT macro. * m4/oln-with-lib.m4: Define a new macro OLN_WITH_TESSERACT. --- ChangeLog | 8 ++++++++ configure.ac | 3 +-- m4/oln-with-lib.m4 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0beb3a3..17f0c42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle Tesseract 2.x and 3.x in configuration. + + * configure.ac: Call OLN_WITH_TESSERACT macro. + + * m4/oln-with-lib.m4: Define a new macro OLN_WITH_TESSERACT. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure scribo/src/toolchain/nepomuk directory. 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 82216e6..88c8d15 100644 --- a/configure.ac +++ b/configure.ac @@ -228,8 +228,7 @@ AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes]) # Tesseract. # # ----------- # -OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], - [tesseract], [TESSERACT]) +OLN_WITH_TESSERACT # -------------- # # TIFF library. # diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index b18b773..59c6e16 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -61,6 +61,53 @@ m4_default([$5], m4_toupper([$3])),dnl ])# OLN_WITH_LIB +# OLN_WITH_TESSERACT() +# ------------------------------------------------------------- +# Check if Tesseract 2 or 3 is available. +# +# FIXME: if version 3 is installed in a standard directory, version 2 +# is installed in a non standard directory and its path is passed with +# the --with-tesseract option, this macro may use the version 3 +# anyway... This is because, the _OLN_WITH_LIB_SHARED_IMPL will try to +# link to tesseract_api and it will be available in the standard +# lib directory... + +AC_DEFUN([OLN_WITH_TESSERACT], +[dnl + AC_REQUIRE([AC_PROG_CXX]) + AC_LANG_PUSH([C++]) + AC_ARG_WITH([tesseract], + [AC_HELP_STRING([--with-tesseract@<:@=DIR@:>@], + [use $1 (DIR = prefix for TESSERACT installation)])]) + TESSERACT_CPPFLAGS='' + TESSERACT_LDFLAGS='' + + if test "x$with_tesseract" != xno; then + # Checking for Tesseract 3.x + _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract_api], + [tesseract], [TESSERACT_3], []) + + if test x$oln_have_tesseract != xyes; then + # Tesseract 2.x not found, checking for Tesseract 2.x + _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract_full], + [tesseract], [TESSERACT_2], []) + TESSERACT_CPPFLAGS="$TESSERACT_2_CPPFLAGS -DHAVE_TESSERACT_2" + TESSERACT_LDFLAGS=$TESSERACT_2_LDFLAGS + else + TESSERACT_CPPFLAGS="$TESSERACT_3_CPPFLAGS -DHAVE_TESSERACT_3" + TESSERACT_LDFLAGS=$TESSERACT_3_LDFLAGS + fi + fi + + + AC_SUBST([TESSERACT_CPPFLAGS]) + AC_SUBST([TESSERACT_LDFLAGS]) + AM_CONDITIONAL([HAVE_TESSERACT], [test x$oln_have_tesseract = xyes ]) + AC_LANG_POP([C++]) +])# _OLN_WITH_LIB + + + # _OLN_WITH_LIB(PACKAGE, HEADER, LIBRARY, SHELL_NAME, CPP_NAME, # OTHER-LIBRARIES) # ------------------------------------------------------------- -- 1.5.6.5

1 0

last-svn-commit-533-gf8cd44e Merge remote branch 'origin/next-next' into exp/next-build-ok
by Guillaume Lazzara 25 Oct '10

25 Oct '10

This is a merge commit message of the following branches: Merge: 2f0dd88... b9df179... ChangeLog | 101 ++++++ HACKING | 16 +- README | 63 +++- configure.ac | 375 +++++++------------- m4/autotroll.m4 | 3 + m4/oln-with-lib.m4 | 124 +++++-- milena/ChangeLog | 75 ++++ milena/headers.mk | 1 + milena/mln/algebra/vec.hh | 4 +- milena/mln/fun/x2x/rotation.hh | 222 ++++++------ milena/mln/value/ops.hh | 6 +- milena/tests/accu/Makefile.am | 10 +- milena/tests/fun/x2x/composed.cc | 6 +- milena/tests/labeling/Makefile.am | 11 +- milena/tests/unit_test/Makefile.am | 10 +- .../cond_tests_boost-preprocessor_boost-tuple | 1 - milena/tests/unit_test/cond_tests_boost-tuple | 1 + milena/tests/unit_test/unit-tests.mk | 8 +- milena/tests/value/builtin/Makefile.am | 6 +- milena/tests/value/builtin/floatings.cc | 38 ++ scribo/ChangeLog | 15 + scribo/src/text_in_picture.cc | 6 +- scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 + scribo/tests/unit_test/unit-tests.mk | 8 +- 24 files changed, 673 insertions(+), 438 deletions(-) diff --cc ChangeLog index 6aeb05f,263dfff..0beb3a3 --- a/ChangeLog +++ b/ChangeLog @@@ -1,11 -1,104 +1,112 @@@ +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure scribo/src/toolchain/nepomuk directory. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure new test directories. + + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Do not trigger an error when Qt is missing, too old or not working. + + * configure.ac: Here. + Protect a test from a variable expanding to an empty string. + + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Have AutoTroll always restore the initial ``current directory''. + + * m4/autotroll.m4 (AT_WITH_QT): Always come back to the top-level + directory upon failure. + + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Add a warning about Python 2.6 and greater regarding Swilena. + + * configure.ac: Here. + + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Factor the implementations of OLN_WITH_LIB and OLN_WITH_LIB_PKG_CONFIG. + + * m4/oln-with-lib.m4 (_OLN_WITH_LIB_SHARED_IMPL): New macro. + Use it to factor... + (_OLN_WITH_LIB, _OLN_WITH_LIB_PKG_CONFIG): ...these. + + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Aesthetic changes. + + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Fix configure option `--enable-all'. + + * configure.ac: Check the value of `enable_all' before triggering + optional modules. + + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the handling of Qt. + + * configure.ac: Here. + Use autotroll.m4's features instead of duplicating them. + + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the handling of Boost libraries. + + * configure.ac: Here. + Use boost.m4's features instead of duplicating them. + Do not explictly look for the Boost Preprocessor (Boost.PP) + Library, as we do not directly use it. + + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the handling of Magick++. + + * m4/oln-with-lib.m4 (_OLN_WITH_LIB): Make all arguments + mandatory. + (OLN_WITH_LIB_PKG_CONFIG, _OLN_WITH_LIB_PKG_CONFIG): New macros. + * configure.ac: Use OLN_WITH_LIB_PKG_CONFIG to handle Magick++ + + 2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + + Have configure be terser. + + * configure.ac: Remove intermediate messages. + Add option `--enable-verbose', and show the final summary only + when it is turned on. + Use escaped version of `[' and `]' in message. + Document this option... + * README (Verbose Display): ...here. + + 2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + + Ensure paths passed to `--with-*' options are visited before others. + + * m4/oln-with-lib.m4 (OLN_WITH_LIB): Here. + + 2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + + * m4/oln-with-lib.m4: Revert the previous changes. + + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Update HACKING. + + * HACKING (Required Software): Update. + (Useful Tools): New section. + + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Update README. + + * README: Aesthetic changes. + (Overview): Fix an URL. + (Other libraries): New section. + (Bibliography): Add publications of 2010. + 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> * m4/oln-with-lib.m4: Force headers lookup in specified path. diff --cc scribo/ChangeLog index 0813a97,104f9c6..82c02ca --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@@ -1,71 -1,18 +1,86 @@@ +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Cleanup files. + + * scribo/debug/usage.hh, + * scribo/text/recognition.hh: Remove useless comments. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new example. + + * src/Makefile.am: Add toolchain subdir. + + * src/toolchain/Makefile.am, + * src/toolchain/nepomuk/Makefile.am, + * src/toolchain/nepomuk/text_extraction.cc: New. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/core/line_info.hh: Fix line statistics. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update tests in Scribo. + + * tests/binarization/global_threshold.cc, + * tests/binarization/local_threshold.cc, + * tests/primitive/link/merge_double_link.cc: Fix tests. + + * tests/core/Makefile.am: Add a new test. + + * tests/core/line_info.cc: New. + + * tests/filter/small_and_large_bboxes.cc: Remove useless arguments. + + * tests/img/pixels.pbm: Update. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes in Scribo + + * scribo/core/line_info.hh: Fix invalid extended bboxes. + + * src/text_in_doc_preprocess.cc: Do not invert data anymore. + + * tests/filter/objects_with_holes.cc: Remove useless arguments. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new test for primitive::link::merge_double_link. + + * tests/img/pixels.pbm: New test image. + + * tests/Makefile.am (SUBDIRS): add primitive directory. + + * tests/primitive/Makefile.am, + * tests/primitive/link/Makefile.am, + * tests/primitive/link/merge_double_link.cc: New. + +2010-10-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Negate Sauvola's result. + + * scribo/binarization/local_threshold.hh, + * scribo/binarization/sauvola_ms.hh: Invert threshold test. + + * src/text_in_picture.cc: Do not negate Sauvola's output anymore. + + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Require Tesseract for scribo/toolchain/text_in_doc.hh's unit test. + + * tests/unit_test/cond_tests_tesseract_tiff: + Add scribo/toolchain/text_in_doc.hh. + * tests/unit_test/unit-tests.mk: Regen. + + 2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + + Fix `link' name lookup in Scribo. + + * src/text_in_picture.cc: Help the C++ compiler not to mix up + scribo::primitive::link with unistd.h's link(2). + 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in Scribo hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-506-g2f0dd88 configure.ac: Configure scribo/src/toolchain/nepomuk directory.
by Guillaume Lazzara 25 Oct '10

25 Oct '10

--- ChangeLog | 4 ++++ configure.ac | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a1eee9..6aeb05f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure scribo/src/toolchain/nepomuk directory. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure new test directories. 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index d54b3dc..24a15b0 100644 --- a/configure.ac +++ b/configure.ac @@ -477,6 +477,8 @@ AC_CONFIG_FILES([ scribo/src/primitive/group/Makefile scribo/src/table/Makefile scribo/src/text/Makefile + scribo/src/toolchain/Makefile + scribo/src/toolchain/nepomuk/Makefile ]) AC_CONFIG_FILES([scribo/tests/data.hh]) -- 1.5.6.5

1 0

last-svn-commit-505-g677cf61 Cleanup files.
by Guillaume Lazzara 25 Oct '10

25 Oct '10

* scribo/debug/usage.hh, * scribo/text/recognition.hh: Remove useless comments. --- scribo/ChangeLog | 9 ++++++++- scribo/scribo/debug/usage.hh | 9 +++------ scribo/scribo/text/recognition.hh | 8 -------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3b094e0..0813a97 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,6 +1,13 @@ 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> - Add a new toolchain. + Cleanup files. + + * scribo/debug/usage.hh, + * scribo/text/recognition.hh: Remove useless comments. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new example. * src/Makefile.am: Add toolchain subdir. diff --git a/scribo/scribo/debug/usage.hh b/scribo/scribo/debug/usage.hh index 2c6fa48..7a284e3 100644 --- a/scribo/scribo/debug/usage.hh +++ b/scribo/scribo/debug/usage.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -41,7 +42,6 @@ namespace scribo /// \param[in] desc Description of the program. /// \param[in] args The expected arguments. /// \param[in] args_desc The description of the expected arguments. - /// \param[in] out_desc The description of the output. /// /// \return Return 1. // @@ -67,11 +67,8 @@ namespace scribo std::cout << " " << args_desc[i][0] << ": " << args_desc[i][1] << std::endl; -// if (out_desc) -// std::cout << std::endl << "Output: " << out_desc << std::endl; - std::cout << "-----------" << std::endl; - std::cout << "EPITA/LRDE - Scribo 2009" << std::endl; + std::cout << "EPITA/LRDE - Scribo 2008-2010" << std::endl; return 1; } diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index 8cb0e96..17cbaa2 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -121,10 +121,6 @@ namespace scribo if (! lines(i).is_valid() || lines(i).is_hidden() || lines(i).type() != line::Text) continue; -// std::cout << "Text recognition... (" -// << i << "/" << lines.nelements() << ")" << std::endl; -// std::cout << "x_height = " << lines(i).x_height() << std::endl; - mln_domain(I) box = lines(i).bbox(); // Make sure characters are isolated from the borders. @@ -150,7 +146,6 @@ namespace scribo /// text_ima_cleaned domain may be larger than text_ima's. text::clean_inplace(lines(i), text_ima); -// mln::io::pbm::save(text_ima_cleaned, mln::debug::filename("line.pbm", debug_id++)); // Make sure characters are isolated from the borders. // Help Tesseract. @@ -160,7 +155,6 @@ namespace scribo data::fill(line_image, false); data::paste_without_localization(text_ima, line_image); -// mln::io::pbm::save(line_image, mln::debug::filename("line_image.pbm", debug_id++)); // Recognize characters. char* s = TessBaseAPI::TesseractRect( @@ -175,7 +169,6 @@ namespace scribo if (s != 0) { -// std::cerr << s << std::endl; std::string str(s); str = str.substr(0, str.length() - 2); lines(i).update_text(str); @@ -232,7 +225,6 @@ namespace scribo if (s != 0) { -// std::cout << s << std::endl; if (!output_file.empty()) { std::string str(s); -- 1.5.6.5

1 0

last-svn-commit-504-ga912c61 Add a new example.
by Guillaume Lazzara 25 Oct '10

25 Oct '10

* src/Makefile.am: Add toolchain subdir. * src/toolchain/Makefile.am, * src/toolchain/nepomuk/Makefile.am, * src/toolchain/nepomuk/text_extraction.cc: New. --- scribo/ChangeLog | 10 +++++ scribo/src/Makefile.am | 3 +- .../{tests/primitive => src/toolchain}/Makefile.am | 6 +-- .../{tests => src}/toolchain/nepomuk/Makefile.am | 35 +++++++++---------- .../toolchain/nepomuk/text_extraction.cc | 36 ++++++++++++++------ 5 files changed, 56 insertions(+), 34 deletions(-) copy scribo/{tests/primitive => src/toolchain}/Makefile.am (91%) copy scribo/{tests => src}/toolchain/nepomuk/Makefile.am (65%) copy scribo/{tests => src}/toolchain/nepomuk/text_extraction.cc (75%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 807bdc8..3b094e0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new toolchain. + + * src/Makefile.am: Add toolchain subdir. + + * src/toolchain/Makefile.am, + * src/toolchain/nepomuk/Makefile.am, + * src/toolchain/nepomuk/text_extraction.cc: New. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/line_info.hh: Fix line statistics. 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 52df66d..d3f686b 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -26,7 +26,8 @@ SUBDIRS = \ misc \ postprocessing \ preprocessing \ - text + text \ + toolchain # Disabled for the moment: # table diff --git a/scribo/tests/primitive/Makefile.am b/scribo/src/toolchain/Makefile.am similarity index 91% copy from scribo/tests/primitive/Makefile.am copy to scribo/src/toolchain/Makefile.am index 82c773a..36cfff4 100644 --- a/scribo/tests/primitive/Makefile.am +++ b/scribo/src/toolchain/Makefile.am @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/tests/tests.mk - -SUBDIRS = \ - link +include $(top_srcdir)/scribo/scribo.mk +SUBDIRS = nepomuk \ No newline at end of file diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/src/toolchain/nepomuk/Makefile.am similarity index 65% copy from scribo/tests/toolchain/nepomuk/Makefile.am copy to scribo/src/toolchain/nepomuk/Makefile.am index 4bce3bd..07c2c33 100644 --- a/scribo/tests/toolchain/nepomuk/Makefile.am +++ b/scribo/src/toolchain/nepomuk/Makefile.am @@ -13,33 +13,32 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. - -include $(top_srcdir)/scribo/tests/tests.mk - -check_PROGRAMS = +include $(top_srcdir)/scribo/scribo.mk +bin_PROGRAMS = if HAVE_QT +if HAVE_MAGICKXX if HAVE_TESSERACT -check_PROGRAMS += text_extraction +bin_PROGRAMS += \ +text_extraction + text_extraction_SOURCES = text_extraction.cc -text_extraction_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -text_extraction_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ +text_extraction_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ - $(TIFF_CPPFLAGS) -text_extraction_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) \ + $(TIFF_CPPFLAGS) \ + $(QT_CPPFLAGS) +text_extraction_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ - -lpthread -text_extraction_LDADD = $(QT_LIBS) $(LDADD) + $(QT_LDFLAGS) \ + $(QT_LIBS) \ + -lpthread endif HAVE_TESSERACT -endif HAVE_QT - - -TESTS = $(check_PROGRAMS) +endif HAVE_MAGICKXX +endif HAVE_QT \ No newline at end of file diff --git a/scribo/tests/toolchain/nepomuk/text_extraction.cc b/scribo/src/toolchain/nepomuk/text_extraction.cc similarity index 75% copy from scribo/tests/toolchain/nepomuk/text_extraction.cc copy to scribo/src/toolchain/nepomuk/text_extraction.cc index 027ad99..e5e2de4 100644 --- a/scribo/tests/toolchain/nepomuk/text_extraction.cc +++ b/scribo/src/toolchain/nepomuk/text_extraction.cc @@ -23,22 +23,36 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file -/// -/// Test of scribo::toolchain::nepomuk::text_extraction +#include <libgen.h> +#include <iostream> +#include <QtCore/QDebug> -#include <QtGui/QImage> -#include <QtCore> +#include <scribo/debug/usage.hh> #include <scribo/toolchain/nepomuk/text_extraction.hh> -#include "tests/data.hh" -int main() +const char *args_desc[][2] = { - QImage ima(SCRIBO_IMG_DIR "/wildly.pbm"); + { "input.*", "An image." }, + {0, 0} +}; + + + + +int main(int argc, char* argv[]) +{ + if (argc != 2) + return scribo::debug::usage(argv, + "Extract text in a document.\n\n" + "Common usage: ./text_extraction input.*", + "<image>", + args_desc); + + + QImage ima(argv[1]); QSet<QString> words = scribo::toolchain::nepomuk::text_extraction(ima); - mln_assertion(words.size() == 1); - mln_assertion(words.contains("Wildly")); - return 0; + foreach(QString w, words) + qDebug() << w; } -- 1.5.6.5

1 0

last-svn-commit-503-gdf42e56 scribo/core/line_info.hh: Fix line statistics.
by Guillaume Lazzara 25 Oct '10

25 Oct '10

--- scribo/ChangeLog | 4 ++++ scribo/scribo/core/line_info.hh | 37 +++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b4c122c..807bdc8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/line_info.hh: Fix line statistics. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Update tests in Scribo. * tests/binarization/global_threshold.cc, diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 5328b33..ed31d17 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -328,7 +328,7 @@ namespace scribo 0 1 2 3 4 5 6 7 8 9 --------------------- - 0 | | | |x| | | | | | | ----> a_height = 4 + 0 | | | |x| | | | | | | ----> a_height = 5 --------------------- 1 | | | |x| | | | | | | --------------------- @@ -467,7 +467,7 @@ namespace scribo int line_info<L>::descent() const { - return baseline_ - d_height() + 1; + return baseline_ - d_height(); } @@ -672,11 +672,6 @@ namespace scribo if (D <= 2 && A > 2) D = A; - if (D < 0) - D = 0; - if (A < 0) - A = 0; - int delta = delta_of_line(); ebbox_ = mln::make::box2d(meanline_ - A, bbox().pmin().col() - delta, @@ -847,13 +842,27 @@ namespace scribo + // FIXME: we must guaranty here that the relationship is from + // right to left, otherwise, the space size computed between + // boxes might be wrong... + // + // x------| |-| != |------| x-| + // |------| x-| |------x |-| + // + // (incorrect) (correct) + // (right link) (left link) + // Space between characters. - int space = bb.pmin().col() - - comp_set(holder_.links()(c)).bbox().pmax().col() + 1; + if (holder_.links()(c) != c) + { + int + space = bb.pmin().col() + - comp_set(holder_.links()(c)).bbox().pmax().col() - 1; - // -- Ignore overlapped characters. - if (space > 0) - char_space.take(space); + // -- Ignore overlapped characters. + if (space > 0) + char_space.take(space); + } // Character width // -- Ignore too large components. @@ -896,7 +905,7 @@ namespace scribo baseline_ = absolute_baseline_r; meanline_ = absolute_meanline_r; x_height_ = baseline_ - meanline_ + 1; - d_height_ = baseline_ - bbox.to_result().pmax().row() + 1; + d_height_ = baseline_ - bbox.to_result().pmax().row(); a_height_ = baseline_ - bbox.to_result().pmin().row() + 1; //FIXME @@ -955,7 +964,7 @@ namespace scribo } -# endif // ! MLN_INCLUDE_ONLY +# endif// ! MLN_INCLUDE_ONLY } // end of namespace scribo -- 1.5.6.5

1 0

last-svn-commit-502-gc24234a Update tests in Scribo.
by Guillaume Lazzara 25 Oct '10

25 Oct '10

* tests/binarization/global_threshold.cc, * tests/binarization/local_threshold.cc, * tests/primitive/link/merge_double_link.cc: Fix tests. * tests/core/Makefile.am: Add a new test. * tests/core/line_info.cc: New. * tests/filter/small_and_large_bboxes.cc: Remove useless arguments. * tests/img/pixels.pbm: Update. --- scribo/ChangeLog | 16 ++++++ scribo/tests/binarization/global_threshold.cc | 28 ++++++++++- scribo/tests/binarization/local_threshold.cc | 34 +++++++++++-- scribo/tests/core/Makefile.am | 4 +- .../line_info.cc} | 54 +++++++++++--------- scribo/tests/filter/small_and_large_bboxes.cc | 2 +- scribo/tests/img/pixels.pbm | 2 +- scribo/tests/primitive/link/merge_double_link.cc | 7 +-- 8 files changed, 110 insertions(+), 37 deletions(-) copy scribo/tests/{filter/small_and_large_bboxes.cc => core/line_info.cc} (56%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 98c90d6..b4c122c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,21 @@ 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Update tests in Scribo. + + * tests/binarization/global_threshold.cc, + * tests/binarization/local_threshold.cc, + * tests/primitive/link/merge_double_link.cc: Fix tests. + + * tests/core/Makefile.am: Add a new test. + + * tests/core/line_info.cc: New. + + * tests/filter/small_and_large_bboxes.cc: Remove useless arguments. + + * tests/img/pixels.pbm: Update. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo * scribo/core/line_info.hh: Fix invalid extended bboxes. diff --git a/scribo/tests/binarization/global_threshold.cc b/scribo/tests/binarization/global_threshold.cc index 9da29e3..e43a487 100644 --- a/scribo/tests/binarization/global_threshold.cc +++ b/scribo/tests/binarization/global_threshold.cc @@ -1,10 +1,36 @@ +// 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. + +/// \file + #include <mln/core/image/image2d.hh> #include <mln/make/image.hh> #include <mln/data/compare.hh> #include <scribo/binarization/global_threshold.hh> - int main(int argc, char *argv[]) { using namespace mln; diff --git a/scribo/tests/binarization/local_threshold.cc b/scribo/tests/binarization/local_threshold.cc index 8fb5045..5de4dfd 100644 --- a/scribo/tests/binarization/local_threshold.cc +++ b/scribo/tests/binarization/local_threshold.cc @@ -1,11 +1,37 @@ +// 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. + +/// \file + #include <mln/core/image/image2d.hh> #include <mln/make/image.hh> #include <mln/data/compare.hh> #include <scribo/binarization/local_threshold.hh> - -int main(int argc, char *argv[]) +int main() { using namespace mln; @@ -15,8 +41,8 @@ int main(int argc, char *argv[]) unsigned data_threshold[2][2] = { { 12, 13 }, { 14, 15 } }; - bool data_ref[2][2] = { { 1, 1 }, - { 0, 0 } }; + bool data_ref[2][2] = { { 1, 0 }, + { 1, 1 } }; image2d<unsigned> input = make::image(data); image2d<unsigned> threshold = make::image(data_threshold); diff --git a/scribo/tests/core/Makefile.am b/scribo/tests/core/Makefile.am index cf1c528..356cc31 100644 --- a/scribo/tests/core/Makefile.am +++ b/scribo/tests/core/Makefile.am @@ -20,6 +20,8 @@ include $(top_srcdir)/scribo/tests/tests.mk -check_PROGRAMS = +check_PROGRAMS = line_info + +line_info_SOURCES = line_info.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/filter/small_and_large_bboxes.cc b/scribo/tests/core/line_info.cc similarity index 56% copy from scribo/tests/filter/small_and_large_bboxes.cc copy to scribo/tests/core/line_info.cc index 20ddd12..cc0c575 100644 --- a/scribo/tests/filter/small_and_large_bboxes.cc +++ b/scribo/tests/core/line_info.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -28,28 +27,32 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/util/graph.hh> #include <mln/value/label_16.hh> #include <mln/io/pbm/load.hh> -#include <mln/literal/colors.hh> #include <scribo/primitive/extract/components.hh> -#include <scribo/primitive/group/apply.hh> #include <scribo/primitive/link/with_single_left_link.hh> #include <scribo/primitive/group/from_single_link.hh> -#include <scribo/filter/objects_small.hh> - -#include <scribo/make/debug_filename.hh> -#include <scribo/debug/save_bboxes_image.hh> -#include <scribo/debug/save_linked_bboxes_image.hh> +#include <scribo/core/line_set.hh> #include "tests/data.hh" -int main(int argc, char* argv[]) + +int main() { using namespace scribo; using namespace mln; - std::string img = SCRIBO_IMG_DIR "/text_to_group_and_clean.pbm"; + + int ref[][9] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + // baseline, meanline, ascent, descent, x_height, d_height, a_height, char_space, char_width + { 2, 2, 2, 2, 1, 0, 1, 1, 1 }, + { 4, 4, 4, 4, 1, 0, 1, 0, 1 }, + { 6, 6, 6, 6, 1, 0, 1, 0, 1 }, + { 7, 7, 7, 7, 1, 0, 1, 0, 1 }, + { 12, 12, 10, 12, 1, 0, 3, 0, 1 }, + { 17, 15, 15, 17, 3, 0, 3, 0, 4 } }; + + std::string img = SCRIBO_IMG_DIR "/pixels.pbm"; image2d<bool> input; io::pbm::load(input, img.c_str()); @@ -61,23 +64,24 @@ int main(int argc, char* argv[]) object_links<L> links = primitive::link::with_single_left_link(text, 30); - - mln_assertion(nbboxes == 12u); - object_groups<L> groups = primitive::group::from_single_link(links); - component_set<L> grouped_comps = primitive::group::apply(groups); + line_set<L> lines = scribo::line_set<L>(groups); - mln_assertion(grouped_comps.nelements() == 6u); - component_set<L> - filtered_comps = scribo::filter::components_small(grouped_comps, 20); + for_all_lines(l, lines) + { + mln_assertion(lines(l).baseline() == ref[l][0]); + mln_assertion(lines(l).meanline() == ref[l][1]); + mln_assertion(lines(l).ascent() == ref[l][2]); + mln_assertion(lines(l).descent() == ref[l][3]); + mln_assertion(lines(l).x_height() == unsigned(ref[l][4])); + mln_assertion(lines(l).d_height() == ref[l][5]); + mln_assertion(lines(l).a_height() == ref[l][6]); + mln_assertion(lines(l).char_space() == unsigned(ref[l][7])); + mln_assertion(lines(l).char_width() == unsigned(ref[l][8])); + } - unsigned valid_comps = 0; - for_all_comps(c, filtered_comps) - if (filtered_comps(c).is_valid()) - ++valid_comps; +} - mln_assertion(valid_comps == 2u); -} diff --git a/scribo/tests/filter/small_and_large_bboxes.cc b/scribo/tests/filter/small_and_large_bboxes.cc index 20ddd12..b3d7d5f 100644 --- a/scribo/tests/filter/small_and_large_bboxes.cc +++ b/scribo/tests/filter/small_and_large_bboxes.cc @@ -44,7 +44,7 @@ #include "tests/data.hh" -int main(int argc, char* argv[]) +int main() { using namespace scribo; using namespace mln; diff --git a/scribo/tests/img/pixels.pbm b/scribo/tests/img/pixels.pbm index e69f06d..6f72469 100644 --- a/scribo/tests/img/pixels.pbm +++ b/scribo/tests/img/pixels.pbm @@ -1,4 +1,4 @@ P4 # CREATOR: GIMP PNM Filter Version 1.1 38 23 -ÿÿÿÿüÿÿÿÿüÿþ¿ÿüÿÿÿÿüÿþÿÿüÿÿÿÿüÿûÿÿüÿïÿÿüÿÿÿÿüÿÿÿÿüÿïÿÿüÿßÿÿüÿ×ÿÿüÿÿÿÿüÿÿÿÿüÿÿÿüÿoÿÿüÿïÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿü \ No newline at end of file +ÿÿÿÿüÿÿÿÿüÿþ¯ÿüÿÿÿÿüÿþÿÿüÿÿÿÿüÿûÿÿüÿïÿÿüÿÿÿÿüÿÿÿÿüÿïÿÿüÿßÿÿüÿ×ÿÿüÿÿÿÿüÿÿÿÿüÿÿÿüÿoÿÿüÿïÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿü \ No newline at end of file diff --git a/scribo/tests/primitive/link/merge_double_link.cc b/scribo/tests/primitive/link/merge_double_link.cc index ca3002b..1b0674e 100644 --- a/scribo/tests/primitive/link/merge_double_link.cc +++ b/scribo/tests/primitive/link/merge_double_link.cc @@ -50,9 +50,9 @@ int main() std::string img = SCRIBO_IMG_DIR "/pixels.pbm"; - unsigned ref_left[] = {0, 1, 1, 3, 4, 5, 6, 6, 8}; - unsigned ref_right[] = {0, 2, 2, 3, 4, 5, 6, 7, 8}; - unsigned ref_merged[] = {0, 1, 1, 3, 4, 5, 6, 7, 8}; + unsigned ref_left[] = {0, 1, 1, 2, 4, 5, 6, 7, 7, 9}; + unsigned ref_right[] = {0, 2, 3, 3, 4, 5, 6, 7, 8, 9}; + unsigned ref_merged[] = {0, 1, 1, 2, 4, 5, 6, 7, 8, 9}; image2d<bool> input; @@ -79,7 +79,6 @@ int main() merged_links = primitive::link::merge_double_link(left_link, right_link); - for_all_links(i, left_link) mln_assertion(ref_left[i] == left_link(i)); -- 1.5.6.5

1 0

branch fix-swilena-deps-tracking created: last-svn-commit-524-g7924629
by git＠lrde.epita.fr 25 Oct '10

25 Oct '10

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-swilena-deps-tracking has been created at 7924629f9a5ed75553a8fa6cee857bf59b634c0f (commit) - Log ----------------------------------------------------------------- 7924629 Fix Swilena's dependency tracking. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-524-g7924629 Fix Swilena's dependency tracking.
by Roland Levillain 25 Oct '10

25 Oct '10

* python/Makefile.am (%-wrap.cc %.py): Honor Automake's `AMDEP' internal conditional. --- swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index d2e2998..6d31d60 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,10 @@ +2010-10-25 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Swilena's dependency tracking. + + * python/Makefile.am (%-wrap.cc %.py): Honor Automake's `AMDEP' + internal conditional. + 2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> Canonize Swilena's tests' output file names. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index df28551..531880f 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -32,11 +32,12 @@ AM_LDFLAGS = -avoid-version -module -shared ## Run Swig to create the C++ wrapper files, the Python interface ## files, and the dependency Makefile snippets. %-wrap.cc %.py: $(top_srcdir)/swilena/%.i - if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \ - mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\ - else \ - rm -f "$(DEPDIR)/$*-wrap.Tcc"; exit 1;\ - fi +@AMDEP_TRUE@ if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \ +@AMDEP_TRUE@ mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\ +@AMDEP_TRUE@ else \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*-wrap.Tcc"; exit 1;\ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -o $@ $< # ltihooks.py: Python import hooks that understand Libtool libraries. -- 1.5.6.5

1 0

branch exp/next-build-ok updated: last-svn-commit-501-g57977f8
by lazzara＠lrde.epita.fr 25 Oct '10

25 Oct '10

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 exp/next-build-ok has been updated via 57977f81558b43b3893bc5d911788e6454bbb7fb (commit) via c5f99a53310656248179f8298a4ef1227dfa67ee (commit) via 74fe46474374fc2fb128f79a94590adfae77864e (commit) via c043808bc7590289ae081ebe381f4ddab862a1bc (commit) from e102484ec1067be75dd6589397b5582a103f38e4 (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 ----------------------------------------------------------------- 57977f8 configure.ac: Configure new test directories. c5f99a5 Small fixes in Scribo 74fe464 Add a new test for primitive::link::merge_double_link. c043808 Negate Sauvola's result. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 2 + scribo/ChangeLog | 31 +++++ scribo/scribo/binarization/local_threshold.hh | 4 +- scribo/scribo/binarization/sauvola_ms.hh | 128 ++++++++++---------- scribo/scribo/core/line_info.hh | 5 + scribo/src/text_in_doc_preprocess.cc | 2 - scribo/src/text_in_picture.cc | 2 - scribo/tests/Makefile.am | 4 +- scribo/tests/filter/objects_with_holes.cc | 4 +- scribo/tests/img/pixels.pbm | 4 + scribo/tests/{toolchain => primitive}/Makefile.am | 3 +- .../tests/primitive/link}/Makefile.am | 8 +- .../link/merge_double_link.cc} | 53 +++++++-- 14 files changed, 165 insertions(+), 89 deletions(-) create mode 100644 scribo/tests/img/pixels.pbm copy scribo/tests/{toolchain => primitive}/Makefile.am (98%) copy {milena/tests/subsampling => scribo/tests/primitive/link}/Makefile.am (86%) copy scribo/tests/{filter/objects_with_holes.cc => primitive/link/merge_double_link.cc} (55%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0