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