18 Nov
2010
18 Nov
'10
12:36 p.m.
This is a merge commit message of the following branches:
Merge: 738511d... 0d8813e...
ChangeLog | 6 ++++++
configure.ac | 1 -
milena/ChangeLog | 25 +++++++++++++++++++++++++
milena/Makefile.am | 1 +
milena/mln/io/magick/load.hh | 17 +++++++++++------
milena/mln/io/magick/save.hh | 30 ++++++++++++++++++++++--------
milena/tests/accu/Makefile.am | 1 +
milena/tests/unit_test/Makefile.am | 5 +++++
swilena/ChangeLog | 7 +++++++
swilena/python/Makefile.am | 11 ++++++-----
10 files changed, 84 insertions(+), 20 deletions(-)
diff --cc ChangeLog
index 6935872,3155d63..f85e4c6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,9 +1,34 @@@
+ 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++.
+
+ * configure.ac: Here.
+
+2010-05-11 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Distribute Scribo.
+
+ * configure.ac: Remove tags `<<lrde' and `dnl>>' around
+ Scribo-related bits.
+ * Makefile.am: Likewise.
+ (LRDE_NODIST_FILES): Remove $(distdir)/scribo.
+
+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>
+
+ * 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.
diff --cc milena/ChangeLog
index 6d5de98,2b6ae78..10d8482
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@@ -1,149 -1,28 +1,174 @@@
+ 2010-10-28 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Handle properly non 8-bit Magick::Quantum's.
+
+ * mln/io/magick/load.hh
+ (mln::io::magick::load(Image<I>&, const std::string&))
+ * mln/io/magick/save.hh
+ (mln::io::magick::impl::get_color(const value::int_u8&))
+ (mln::io::magick::impl::get_color(const value::rgb8&)):
+ Properly convert values between Magick::Quantum and
+ mln::value::int_u8, and vice versa.
+
+ 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix Boost.Tuple handling.
+
+ * tests/accu/Makefile.am (tuple_CPPFLAGS): New.
+ * tests/unit_test/Makefile.am (BOOST_TUPLE_CPPFLAGS): New.
+
+ 2010-10-26 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix Milena's distribution.
+
+ * Makefile.am (dist_img_DATA): Add img/picasso.ppm.
+
+2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/io/pnm/save.hh: Add a fixme related to an ICE with GCC
+ 4.1.1.
+
+2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix QImage conversions.
+
+ * mln/convert/to_qimage.hh: Fix a duplicate declaration.
+
+ * mln/convert/to_qimage_nocopy.hh: Fix the minimum version
+ required.
+
+2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/convert/from_to.hh: Use value::cast for default builtin
+ conversions and use specific from_to_ overloads for float/double
+ conversions
+
+2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix disabled unit tests in Milena.
+
+ * tests/unit_test/disabled_tests: Add a missing new line at end of
+ file.
+
+ * tests/unit_test/unit-tests.mk: Regen.
+
+2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe
+ test.
+
+2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add a new test for accu::stat:deviation.
+
+ * tests/accu/stat/Makefile.am: Add a new target.
+
+ * tests/accu/stat/deviation.cc: New.
+
+2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Remove a useless from_to overload.
+
+ * mln/convert/from_to.hxx,
+ * mln/convert/impl/from_unsigned_to_value.hh: Remove overload
+ converting unsigned to float.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Regen mk files in Milena.
+
+ * headers.mk,
+ * tests/unit_test/unit-tests.mk: Regen.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Introduce world::rgb::invert.
+
+ * mln/world/rgb/invert.hh,
+ * mln/world/rgb/invert.spe.hh: New.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Improve dispatch in arith::revert routine.
+
+ * mln/arith/revert.hh,
+ * mln/arith/revert.spe.hh: Add a standard dispatch.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/data/paste_without_localization.hh: Remove duplicate
+ declarations.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from
+ Yann's sandbox.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/clustering/kmean_rgb.hh: Import Kmean RGB from Yann's
+ sandbox.
+
+2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr>
+
+ Fix the way to convert unsigned to float.
+
+ * mln/convert/from_to.hxx: New conversion utilities.
+ * mln/convert/impl/from_unsigned_to_value.hh: New conversion utilities.
+
+2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr>
+
+ Fix the outside template use case for the convolve macros.
+
+ * mln/linear/ch_convolve.hh (mln_ch_convolve_, mln_ch_convolve_grad_):
+ Define new macros to work outside templates.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add conversions from int_u to float and double.
+
+ * mln/convert/from_to.hxx,
+ * mln/value/int_u.hh: Here.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/convert/from_to.hh: Make use of value::cast for conversions
+ between built-in types.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/data/paste_without_localization.hh: Add a missing dispatch
+ overload.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/io/plot/save.hh: Remove an inline keyword.
+
+2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add missing MLN_WO_GLOBAL_VARS conditions.
+
+ * mln/canvas/browsing/backdiagonal2d.hh
+ * mln/canvas/browsing/diagonal2d.hh
+ * mln/canvas/browsing/directional.hh
+ * mln/canvas/browsing/snake_fwd.hh
+ * mln/canvas/browsing/snake_generic.hh
+ * mln/value/qt/rgb32.hh
+
+2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/accu/stat/deviation.hh: Set first template parameter of
+ accu::stat:sum to mln_sum(T).
+
+2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/labeling/compute.hh: Add a missing overload in dispatch.
+
+2010-09-22 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid
+ function call.
+
2010-10-22 Roland Levillain <roland(a)lrde.epita.fr>
* headers.mk, tests/unit_test/unit-tests.mk: Regen.
hooks/post-receive
--
Olena, a generic and efficient image processing platform