- Olena-patches

olena-2.0-34-gd419030 Makefile.am: Add 'deb' rule.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

--- ChangeLog | 4 ++++ Makefile.am | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c130337..bed7b6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * Makefile.am: Add 'deb' rule. + +2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/copyright: Set copyright. 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/Makefile.am b/Makefile.am index 66dc10c..e051c68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,11 @@ CLEANFILES = $(PORTFILE) port: $(PORTFILE) +deb: + git-buildpackage --git-export-dir=../build-area/ \ + --git-builder="debuild -i'\.git' -I.git " + + ## FIXME: Running `build-aux/build_unit_test.sh' just to update ## `milena/tests/unit_test/unit-tests.mk' is overkill: ## -- 1.7.2.5

1 0

olena-2.0-33-g74260e3 debian/copyright: Set copyright.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

--- ChangeLog | 4 ++++ debian/copyright | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6eaa816..c130337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/copyright: Set copyright. + +2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/texi2dvi: Fix Dash incompatibility. 2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/copyright b/debian/copyright index fd0dc60..e6130ab 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,2 +1,2 @@ -All the contents in this package are in the public domain. -You can do whatever you want with them. +Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +The content of this package is under GPLv2 License. \ No newline at end of file -- 1.7.2.5

1 0

olena-2.0-32-g7361f55 build-aux/texi2dvi: Fix Dash incompatibility.
by Guillaume Lazzara 26 Jan '12

26 Jan '12

--- ChangeLog | 4 ++++ build-aux/texi2dvi | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f4e90c..6eaa816 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + * build-aux/texi2dvi: Fix Dash incompatibility. + 2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> Create first draft of manpages for distributed binaries. diff --git a/build-aux/texi2dvi b/build-aux/texi2dvi index 7d1f2ab..e01db32 100755 --- a/build-aux/texi2dvi +++ b/build-aux/texi2dvi @@ -131,11 +131,14 @@ test -n "$TEX" && test -d "$TEX" && unset TEX } test_local test $foo = bar -) || local () { - case $1 in - *=*) eval "$1";; - esac -} +) || +eval ' + local () { + case $1 in + *=*) eval "$1";; + esac + } +' # cd_orig -- 1.7.2.5

1 0

*****SPAM***** olena-patches@lrde.epita.fr Rolex Today -98%
by olena-patches＠lrde.epita.fr 03 Jan '12

03 Jan '12

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Click here! [...] Content analysis details: (31.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 NO_REAL_NAME From: does not include a real name 0.5 ADDRESS_IN_SUBJECT To: address appears in Subject 1.5 RCVD_NUMERIC_HELO Received: contains an IP address used for HELO 0.1 HTML_90_100 BODY: Message is 90% to 100% HTML 0.0 HTML_MESSAGE BODY: HTML included in message 3.1 HTML_IMAGE_ONLY_08 BODY: HTML: images with 400-800 bytes of words 3.0 BAYES_95 BODY: Bayesian spam probability is 95 to 99% [score: 0.9635] 0.0 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 1.6 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?190.42.120.144>] 3.9 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL [190.42.120.144 listed in sbl-xbl.spamhaus.org] 1.6 URIBL_SBL Contains an URL listed in the SBL blocklist [URIs: whipneedle.com] 3.8 URIBL_AB_SURBL Contains an URL listed in the AB SURBL blocklist [URIs: whipneedle.com] 4.1 URIBL_JP_SURBL Contains an URL listed in the JP SURBL blocklist [URIs: whipneedle.com] 2.1 URIBL_WS_SURBL Contains an URL listed in the WS SURBL blocklist [URIs: whipneedle.com] 4.5 URIBL_SC_SURBL Contains an URL listed in the SC SURBL blocklist [URIs: whipneedle.com] 0.9 HTML_SHORT_LINK_IMG_1 HTML is very short with a linked image The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

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

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-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

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

olena-2.0-78-g91060da Change path to .bib files.
by Guillaume Lazzara 12 Dec '11

12 Dec '11

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 4 ++-- scribo/doc/Makefile.am | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e266b39..f369bec 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-12-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Change path to .bib files. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index 1986828..bd28b0f 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -124,8 +124,8 @@ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO INPUT_ENCODING = ISO-8859-1 -CITE_BIB_FILES = @top_srcdir@/doc/doc \ - @top_srcdir@/doc/olena +CITE_BIB_FILES = @abs_srcdir@/doc/doc \ + @abs_srcdir@/doc/olena LATEX_BIB_STYLE = plain #--------------------------------------------------------------------------- # configuration options related to source browsing diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 3963182..bef0fa5 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -63,6 +63,7 @@ edit = sed -e "s|@ID@|$$Id|" \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@top_srcdir\@,$(top_srcdir),g' \ + -e 's,@abs_srcdir\@,$(abs_srcdir),g' \ -e 's,@top_builddir\@,$(top_builddir),g' \ -e 's,@srcdir\@,$(srcdir),g' \ -e 's,@builddir\@,$(builddir),g' -- 1.7.2.5

1 0