December 2011 - Olena-patches

[Olena] #195: Organize accumulators in subdirectories
by Olena Trac 29 Nov '12

29 Nov '12

#195: Organize accumulators in subdirectories -------------------------+-------------------------------------------------- Reporter: theo | Owner: Olena Team Type: enhancement | Status: new Priority: critical | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- For instance: * `accu/stats/` * ... * What else? -- Ticket URL: <https://trac.lrde.org/olena/ticket/195> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 3

[Olena] #251: Document how to compile with multiple files
by Olena Trac 29 Nov '12

29 Nov '12

#251: Document how to compile with multiple files -------------------------+-------------------------------------------------- Reporter: lazzara | Owner: lazzara Type: enhancement | Status: new Priority: minor | Milestone: Olena 2.1 Component: Milena | Version: 2.0 Keywords: | -------------------------+-------------------------------------------------- Add a chapter in the user reference guide. - MLN_INCLUDE_ONLY - MLN_WO_GLOBAL_VARS - Compilation with automake - Compilation with QMake - Common error messages (duplicated symbols, undefined symbols) -- Ticket URL: <https://trac.lrde.org/olena/ticket/251> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 2

[Olena] #208: Fix dependencies of the HTML documentation generation?
by Olena Trac 29 Nov '12

29 Nov '12

#208: Fix dependencies of the HTML documentation generation? ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: minor | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: doc | ----------------------+----------------------------------------------------- The generation of the HTML documentation requires a file named `html.sty`, which is not provided by HeVeA, but by latex2html. Is that right? I thought we only had a dependency on the former, not the latter. -- Ticket URL: <https://trac.lrde.org/olena/ticket/208> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

[Olena] #219: Add \internal in the documentation of internal code
by Olena Trac 29 Nov '12

29 Nov '12

#219: Add \internal in the documentation of internal code ---------------------+------------------------------------------------------ Reporter: lazzara | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ---------------------+------------------------------------------------------ Currently, in order to not expose the internal code in the user documentation, everything in the internal and trait namespaces is ignored during the doc generation. The main issue is that inherited members are not shown in the documentation of the classes exposed to the user. The only way to ask Doxygen to show inherited members and not to show internal documentation is to add \internal in the documentation of internal code. -- Ticket URL: <https://trac.lrde.org/olena/ticket/219> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

[Olena] #235: Support GraphicsMagick++ and drop support for ImageMagick++
by Olena Trac 29 Nov '12

29 Nov '12

#235: Support GraphicsMagick++ and drop support for ImageMagick++ -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: proposal | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: io external | -------------------------+-------------------------------------------------- !GraphicsMagick (http://www.graphicsmagick.org/) seems to provide a framework more modern than !ImageMagick's (http://www.imagemagick.org) in particular regarding multi-core support. Moreover Fabien has discovered weird behaviors (#210) and Buildbot has also recently exhibited run time errors that did not surface before (https://buildfarm.lrde.org/buildfarm/oln/builders/i486-linux-gnu- gcc-4.1/builds/539/steps/check/logs/stdio) -- though I don't know who's the culprit here. -- Ticket URL: <https://trac.lrde.org/olena/ticket/235> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

olena-2.0-23-g0a1c1c9 README: update requirements information.
by Guillaume Lazzara 14 Dec '11

14 Dec '11

--- scribo/ChangeLog | 4 ++++ scribo/README | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0aeb3dc..d14af81 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-11-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + * README: update requirements information. + 2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/text/recognition.hh: Fix code for Tesseract 3.01 diff --git a/scribo/README b/scribo/README index 4ba7f07..00bc235 100644 --- a/scribo/README +++ b/scribo/README @@ -59,7 +59,7 @@ dependencies should be installed : - xsltproc - fop - GraphicsMagick++ or ImageMagick++ -- Tesseract 2.x or 3.x (strongly recommended) +- Tesseract 2.x or 3.01 minimum (strongly recommended) Warning: Tesseract 2.x is still supported however, you may encounter crashes because of bugs with Tesseract and specific locales. Moreover, @@ -74,6 +74,10 @@ KNOWN ISSUES - Tesseract 2.x may cause crashes with specific system locales. It is fixed in Tesseract 3.x +- From Tesseract 3.00 to 3.01 API has changed, introducing + incompatibilities. We chose to be compatible with the latest version. + Hence, Scribo will not compile with Tesseract 3.00. + - Apple's GCC (llvm-{gcc,g++} 4.2) compiler provided with Mac OS X Lion (10.7.0) has some trouble with strict aliasing and our code. If you encounter any crashes or strange behaviors, try compiling with -- 1.7.2.5

1 0

olena-2.0-22-g287d09b m4/oln-with-lib.m4: Lookup for multiple AND single libraries while checking Tesseract availability.
by Guillaume Lazzara 14 Dec '11

14 Dec '11

--- ChangeLog | 5 +++++ m4/oln-with-lib.m4 | 28 ++++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31ebcf6..6f2cfc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + * m4/oln-with-lib.m4: Lookup for multiple AND single libraries + while checking Tesseract availability. + 2011-11-25 Roland Levillain <roland(a)lrde.epita.fr> Update lrde-scmstats.sh. diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index 59c6e16..a59acf0 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -1,7 +1,7 @@ # -*- Autoconf -*- -# 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. # @@ -83,19 +83,27 @@ AC_DEFUN([OLN_WITH_TESSERACT], 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], + # Checking for Tesseract 3.x (single lib) + _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract], [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], + # Checking for Tesseract 3.x (multiple lib) + _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract_api], + [tesseract], [TESSERACT_3], []) + if test x$oln_have_tesseract != xyes; then + # Tesseract 3.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 + 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 else - TESSERACT_CPPFLAGS="$TESSERACT_3_CPPFLAGS -DHAVE_TESSERACT_3" - TESSERACT_LDFLAGS=$TESSERACT_3_LDFLAGS + TESSERACT_CPPFLAGS="$TESSERACT_3_CPPFLAGS -DHAVE_TESSERACT_3" + TESSERACT_LDFLAGS=$TESSERACT_3_LDFLAGS fi fi -- 1.7.2.5

1 0

olena-2.0-21-gcc2c4ef scribo/text/recognition.hh: Fix code for Tesseract 3.01 compatibility.
by Guillaume Lazzara 14 Dec '11

14 Dec '11

--- scribo/ChangeLog | 5 +++++ scribo/scribo/text/recognition.hh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 420997a..0aeb3dc 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/text/recognition.hh: Fix code for Tesseract 3.01 + compatibility. + 2011-10-06 Roland Levillain <roland(a)lrde.epita.fr> Mention the ICDAR 2011 paper in SCRIBO's README. diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index 1e11a3e..b7e5c91 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -112,7 +112,7 @@ namespace scribo TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); # else // HAVE_TESSERACT_3 tesseract::TessBaseAPI tess; - if (tess.Init(NULL, language, NULL, 0, false) == -1) + if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) { std::cout << "Error: cannot initialize tesseract!" << std::endl; abort(); @@ -220,7 +220,7 @@ namespace scribo TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); # else // HAVE_TESSERACT_3 tesseract::TessBaseAPI tess; - if (tess.Init(NULL, language, NULL, 0, false) == -1) + if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) { std::cout << "Error: cannot initialize tesseract!" << std::endl; abort(); -- 1.7.2.5

1 0

branch exp/newdoc updated: olena-2.0-79-g1ddd7de
by git＠lrde.epita.fr 12 Dec '11

12 Dec '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 exp/newdoc has been updated via 1ddd7de0b34b608816ea1f10e7bc1c82b7e33ee3 (commit) via 91060da53c6ae12125ad3ab9d707c6d37c90f334 (commit) from e0226cbab4a078b353231ef52dfbaf9b47097706 (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 ----------------------------------------------------------------- 1ddd7de doc/Makefile.am: Add more missing files in EXTRA_DIST. 91060da Change path to .bib files. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ doc/Makefile.am | 9 ++++++++- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 4 ++-- scribo/doc/Makefile.am | 1 + 5 files changed, 22 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-79-g1ddd7de doc/Makefile.am: Add more missing files in EXTRA_DIST.
by Guillaume Lazzara 12 Dec '11

12 Dec '11

--- ChangeLog | 4 ++++ doc/Makefile.am | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48495bd..b30c1a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-12-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Add more missing files in EXTRA_DIST. + 2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Add missing files in EXTRA_DIST. diff --git a/doc/Makefile.am b/doc/Makefile.am index 8da072b..1b5835a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -57,6 +57,7 @@ REFMAN_IMAGES = \ $(srcdir)/images/logo.jpg EXTRA_DIST = \ + $(DOXYFILE).in \ $(REFMAN_IMAGES) \ $(srcdir)/images/olena_layers.svg @@ -79,7 +80,6 @@ REFMAN_deps = $(srcdir)/footer.html \ $(srcdir)/get_sources.dox \ $(srcdir)/subdoc_footer.html \ contributors.html \ - lrde_olena.html \ $(REFMAN_IMAGES) EXTRA_DIST += $(REFMAN_deps) @@ -162,6 +162,13 @@ lrde_olena.html: lrde_olena.bib -noabstract -nofooter -labelname -nodoc -linebreak -nf urllrde PDF lrde_olena.bib +EXTRA_DIST += \ + lrde_olena.cite \ + lrde_olena.html \ + lrde_olena.html \ + lrde_olena.bib \ + lrde_olena_bib.html + MAINTAINERCLEANFILES += lrde_olena.cite \ lrde_olena.bib \ lrde_olena_bib.html \ -- 1.7.2.5

1 0