13 Dec
2010
13 Dec
'10
10:25 a.m.
This is a merge commit message of the following branches:
Merge: afe7341... db3466e...
AUTHORS | 6 +-
ChangeLog | 10 +++
m4/autotroll.m4 | 3 +
milena/ChangeLog | 60 +++++++++++++++++++
milena/mln/core/concept/proxy.hxx | 6 +-
milena/mln/core/concept/value_set.hh | 5 +-
milena/mln/core/site_set/p_complex_piter.hh | 6 +-
milena/mln/core/site_set/p_graph_piter.hh | 2 +-
milena/mln/core/site_set/p_n_faces_piter.hh | 83 ++++++++++++++-------------
milena/mln/morpho/tree/data.hh | 5 +-
milena/mln/trace/warning.hh | 10 ++--
milena/mln/util/array.hh | 8 +-
milena/mln/util/fibonacci_heap.hh | 40 +++++++-------
swilena/ChangeLog | 9 +++
swilena/python/Makefile.am | 12 ++--
15 files changed, 176 insertions(+), 89 deletions(-)
diff --cc ChangeLog
index a8f671e,b63a9a3..b565a26
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,13 +1,26 @@@
+ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Honor `--without-qt' in configure.
+
+ * m4/autotroll.m4: Here.
+
+ 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr>
+
+ * AUTHORS: Clean up whitespace.
+
+2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * configure.ac: Configure scribo/demo/xml2doc directory.
+
+2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * lrde-upload.sh: Upload tarball for branch next-build-test.
+
+2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * configure.ac: Use tar-ustar to allow filenames with more than 99
+ characters.
+
2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++.
diff --cc milena/ChangeLog
index dd33710,9f07662..0fb0b2b
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@@ -1,25 -1,63 +1,85 @@@
+ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Work around g++ 4.5 deficiencies to compile Milena.
+
+ * mln/core/concept/proxy.hxx
+ (internal::helper_unproxy_rec< P, true >::P_)
+ (internal::helper_unproxy_rec< const P, true >::P_):
+ Remove these intermediate typedefs...
+ (internal::helper_unproxy_rec< P, true >::ret)
+ (internal::helper_unproxy_rec< const P, true >::ret):
+ ...to inline these definitions.
+ * mln/util/array.hh
+ (internal::subject_impl<util::array<T>&, E>::operator())
+ (internal::subject_impl<util::array<T>&, E>::operator[])
+ (internal::subject_impl<const util::array<T>&, E>::operator() const)
+ (internal::subject_impl<const util::array<T>&, E>::operator[] const):
+ * mln/core/site_set/p_graph_piter.hh
+ (internal::subject_impl< const p_graph_piter<S,I>&, E >::graph):
+ Use the exact same return type as in the declaration.
+
+ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix forward declarations in complex piters.
+
+ * mln/core/site_set/p_complex_piter.hh,
+ * mln/core/site_set/p_n_faces_piter.hh:
+ Here.
+
+ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Rename parameter `P' as `G' (geometry) in p_n_faces_piters.
+
+ * mln/core/site_set/p_complex_piter.hh: Here.
+
+ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix the type of the underlying site of p_n_faces_piters.
+
+ * mln/core/site_set/p_n_faces_piter.hh
+ (mln::p_n_faces_fwd_piter, mln::p_n_faces_bkd_piter):
+ Change the third parameter of the base class from `P' to
+ `mln_site(P)'.
+
+ 2010-07-29 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix output streams uses.
+
+ * mln/core/concept/value_set.hh
+ (operator<<(std::ostream&, const Value_Set<E>&))
+ * mln/morpho/tree/data.hh
+ (operator<< (std::ostream&, const tree::data<I, S>&)):
+ Use the stream passed as argument instead of std::cout.
+ * mln/util/fibonacci_heap.hh
+ (mln::util::internal::fibonacci_heap_node::print_): Take an output
+ stream as argument instead of using the standard output.
+ (mln::util::fibonacci_heap::print_): Rename first argument from
+ `cout' to `ostr' prevent confusions with std::cout.
+ * mln/trace/warning.hh (mln::trace::warning): Print warnings on
+ the standard error instead of the standard ourput.
+
+2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Handle more global vars with MLN_WO_GLOBAL_VARS
+
+ * mln/canvas/browsing/depth_first_search.hh,
+ * mln/debug/filename.hh,
+ * mln/debug/quiet.hh,
+ * mln/labeling/colorize.hh,
+ * mln/math/pi.hh: Add missing MLN_WO_GLOBAL_VARS guards.
+
+2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/io/magick/save.hh: Fix a crash when using GraphicsMagick
+ instead of ImageMagick.
+
+2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add a fastest implementation in io::magick.
+
+ * mln/io/magick/load.hh,
+ * mln/io/magick/save.hh: Use pointers to access image data.
+
2010-10-28 Roland Levillain <roland(a)lrde.epita.fr>
Handle properly non 8-bit Magick::Quantum's.
hooks/post-receive
--
Olena, a generic and efficient image processing platform