- Olena-patches

branch improve-autotroll deleted: last-svn-commit-534-g626d241
by git＠lrde.epita.fr 02 Dec '10

02 Dec '10

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 improve-autotroll has been deleted was 626d241b525d8c8339f47db71552fdd507441e20 ----------------------------------------------------------------------- 626d241b525d8c8339f47db71552fdd507441e20 Honor `--without-qt' in configure. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch g++-4.5-compatibility deleted: last-svn-commit-535-g47737dc
by git＠lrde.epita.fr 02 Dec '10

02 Dec '10

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 g++-4.5-compatibility has been deleted was 47737dc394d2bb22742e7bd2f964bed0cd950648 ----------------------------------------------------------------------- 47737dc394d2bb22742e7bd2f964bed0cd950648 Work around g++ 4.5 deficiencies to compile Milena. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-535-g47737dc
by git＠lrde.epita.fr 02 Dec '10

02 Dec '10

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 next has been updated via 47737dc394d2bb22742e7bd2f964bed0cd950648 (commit) via 626d241b525d8c8339f47db71552fdd507441e20 (commit) via ac6d6f3b631b86ed8c9ff6164ad5730f43037038 (commit) via 93da222f1f71aff9addd237d8bd5d065aba3882f (commit) via 6a4e9c53629433058a6fbbbb012b86b275eda65a (commit) from 7186af46bed3e9755e7c319178fdf677b42efdce (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++ m4/autotroll.m4 | 3 + milena/ChangeLog | 43 ++++++++++++++ milena/mln/core/concept/proxy.hxx | 6 +- 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/util/array.hh | 8 +- 8 files changed, 105 insertions(+), 52 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch g++-4.5-compatibility created: last-svn-commit-535-g47737dc
by git＠lrde.epita.fr 01 Dec '10

01 Dec '10

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 g++-4.5-compatibility has been created at 47737dc394d2bb22742e7bd2f964bed0cd950648 (commit) - Log ----------------------------------------------------------------- 47737dc Work around g++ 4.5 deficiencies to compile Milena. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch improve-autotroll created: last-svn-commit-534-g626d241
by git＠lrde.epita.fr 30 Nov '10

30 Nov '10

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 improve-autotroll has been created at 626d241b525d8c8339f47db71552fdd507441e20 (commit) - Log ----------------------------------------------------------------- 626d241 Honor `--without-qt' in configure. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch fix-complex-piters created: last-svn-commit-533-gac6d6f3
by git＠lrde.epita.fr 29 Nov '10

29 Nov '10

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 fix-complex-piters has been created at ac6d6f3b631b86ed8c9ff6164ad5730f43037038 (commit) - Log ----------------------------------------------------------------- ac6d6f3 Fix forward declarations in complex piters. 93da222 Rename parameter `P' as `G' (geometry) in p_n_faces_piters. 6a4e9c5 Fix the type of the underlying site of p_n_faces_piters. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-533-gac6d6f3 Fix forward declarations in complex piters.
by Roland Levillain 29 Nov '10

29 Nov '10

* mln/core/site_set/p_complex_piter.hh, * mln/core/site_set/p_n_faces_piter.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/site_set/p_complex_piter.hh | 6 ++---- milena/mln/core/site_set/p_n_faces_piter.hh | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8aaea83..4141442 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 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. diff --git a/milena/mln/core/site_set/p_complex_piter.hh b/milena/mln/core/site_set/p_complex_piter.hh index 8a34309..9fa2282 100644 --- a/milena/mln/core/site_set/p_complex_piter.hh +++ b/milena/mln/core/site_set/p_complex_piter.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,9 +43,6 @@ namespace mln // Forward declarations. template <unsigned D, typename G> class p_complex; - template <unsigned D> class complex_fwd_iter_; - template <unsigned D> class complex_bkd_iter_; - /*-----------------------------. | p_complex_fwd_piter_<D, G>. | diff --git a/milena/mln/core/site_set/p_n_faces_piter.hh b/milena/mln/core/site_set/p_n_faces_piter.hh index cd71282..3282be8 100644 --- a/milena/mln/core/site_set/p_n_faces_piter.hh +++ b/milena/mln/core/site_set/p_n_faces_piter.hh @@ -42,6 +42,10 @@ namespace mln { + // Forward declarations. + template <unsigned D, typename G> class p_complex; + + /*----------------------------. | p_n_faces_fwd_piter<D, G>. | `----------------------------*/ -- 1.5.6.5

1 0

last-svn-commit-532-g93da222 Rename parameter `P' as `G' (geometry) in p_n_faces_piters.
by Roland Levillain 29 Nov '10

29 Nov '10

* mln/core/site_set/p_complex_piter.hh: Here. --- milena/ChangeLog | 6 ++ milena/mln/core/site_set/p_n_faces_piter.hh | 76 +++++++++++++------------- 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8df9b80..8aaea83 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 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 diff --git a/milena/mln/core/site_set/p_n_faces_piter.hh b/milena/mln/core/site_set/p_n_faces_piter.hh index de5653d..cd71282 100644 --- a/milena/mln/core/site_set/p_n_faces_piter.hh +++ b/milena/mln/core/site_set/p_n_faces_piter.hh @@ -43,29 +43,29 @@ namespace mln { /*----------------------------. - | p_n_faces_fwd_piter<D, P>. | + | p_n_faces_fwd_piter<D, G>. | `----------------------------*/ /// \brief Forward iterator on the n-faces sites of an - /// mln::p_complex<D, P>. - template <unsigned D, typename P> + /// mln::p_complex<D, G>. + template <unsigned D, typename G> class p_n_faces_fwd_piter : public internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, - p_complex<D, P>, - mln_site(P), - p_n_faces_fwd_piter<D, P> > + p_complex<D, G>, + mln_site(G), + p_n_faces_fwd_piter<D, G> > { - typedef p_n_faces_fwd_piter<D, P> self_; + typedef p_n_faces_fwd_piter<D, G> self_; typedef internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, - p_complex<D, P>, - mln_site(P), + p_complex<D, G>, + mln_site(G), self_ > super_; public: /// Construction and assignment. /// \{ p_n_faces_fwd_piter(); - p_n_faces_fwd_piter(const p_complex<D, P>& pc, unsigned n); + p_n_faces_fwd_piter(const p_complex<D, G>& pc, unsigned n); /// \} /// \brief Accessors. @@ -79,31 +79,31 @@ namespace mln /*----------------------------. - | p_n_faces_bkd_piter<D, P>. | + | p_n_faces_bkd_piter<D, G>. | `----------------------------*/ /// \brief Backward iterator on the n-faces sites of an - /// mln::p_complex<D, P>. - template <unsigned D, typename P> + /// mln::p_complex<D, G>. + template <unsigned D, typename G> class p_n_faces_bkd_piter /* FIXME: Rename internal::p_complex_piter_base_ to something else, as it is also used for p_faces piters! */ : public internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, - p_complex<D, P>, - mln_site(P), - p_n_faces_bkd_piter<D, P> > + p_complex<D, G>, + mln_site(G), + p_n_faces_bkd_piter<D, G> > { - typedef p_n_faces_bkd_piter<D, P> self_; + typedef p_n_faces_bkd_piter<D, G> self_; typedef internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, - p_complex<D, P>, - mln_site(P), + p_complex<D, G>, + mln_site(G), self_ > super_; public: /// Construction and assignment. /// \{ p_n_faces_bkd_piter(); - p_n_faces_bkd_piter(const p_complex<D, P>& pc, unsigned n); + p_n_faces_bkd_piter(const p_complex<D, G>& pc, unsigned n); /// \} /// \brief Accessors. @@ -120,18 +120,18 @@ namespace mln # ifndef MLN_INCLUDE_ONLY /*----------------------------. - | p_n_faces_fwd_piter<D, P>. | + | p_n_faces_fwd_piter<D, G>. | `----------------------------*/ - template <unsigned D, typename P> + template <unsigned D, typename G> inline - p_n_faces_fwd_piter<D, P>::p_n_faces_fwd_piter() + p_n_faces_fwd_piter<D, G>::p_n_faces_fwd_piter() { } - template <unsigned D, typename P> + template <unsigned D, typename G> inline - p_n_faces_fwd_piter<D, P>::p_n_faces_fwd_piter(const p_complex<D, P>& pc, + p_n_faces_fwd_piter<D, G>::p_n_faces_fwd_piter(const p_complex<D, G>& pc, unsigned n) : super_(pc) { @@ -139,36 +139,36 @@ namespace mln set_n(n); } - template <unsigned D, typename P> + template <unsigned D, typename G> inline unsigned - p_n_faces_fwd_piter<D, P>::n() const + p_n_faces_fwd_piter<D, G>::n() const { return this->iter_.n(); } - template <unsigned D, typename P> + template <unsigned D, typename G> inline void - p_n_faces_fwd_piter<D, P>::set_n (unsigned n) + p_n_faces_fwd_piter<D, G>::set_n (unsigned n) { this->iter_.set_n(n); } /*----------------------------. - | p_n_faces_bkd_piter<D, P>. | + | p_n_faces_bkd_piter<D, G>. | `----------------------------*/ - template <unsigned D, typename P> + template <unsigned D, typename G> inline - p_n_faces_bkd_piter<D, P>::p_n_faces_bkd_piter() + p_n_faces_bkd_piter<D, G>::p_n_faces_bkd_piter() { } - template <unsigned D, typename P> + template <unsigned D, typename G> inline - p_n_faces_bkd_piter<D, P>::p_n_faces_bkd_piter(const p_complex<D, P>& pc, + p_n_faces_bkd_piter<D, G>::p_n_faces_bkd_piter(const p_complex<D, G>& pc, unsigned n) : super_(pc) { @@ -176,18 +176,18 @@ namespace mln set_n(n); } - template <unsigned D, typename P> + template <unsigned D, typename G> inline unsigned - p_n_faces_bkd_piter<D, P>::n() const + p_n_faces_bkd_piter<D, G>::n() const { return this->iter_.n(); } - template <unsigned D, typename P> + template <unsigned D, typename G> inline void - p_n_faces_bkd_piter<D, P>::set_n (unsigned n) + p_n_faces_bkd_piter<D, G>::set_n (unsigned n) { this->iter_.set_n(n); } -- 1.5.6.5

1 0

last-svn-commit-531-g6a4e9c5 Fix the type of the underlying site of p_n_faces_piters.
by Roland Levillain 29 Nov '10

29 Nov '10

* 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)'. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/site_set/p_n_faces_piter.hh | 11 ++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 20a3967..8df9b80 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +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. diff --git a/milena/mln/core/site_set/p_n_faces_piter.hh b/milena/mln/core/site_set/p_n_faces_piter.hh index 599f49d..de5653d 100644 --- a/milena/mln/core/site_set/p_n_faces_piter.hh +++ b/milena/mln/core/site_set/p_n_faces_piter.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -51,13 +52,13 @@ namespace mln class p_n_faces_fwd_piter : public internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, p_complex<D, P>, - P, + mln_site(P), p_n_faces_fwd_piter<D, P> > { typedef p_n_faces_fwd_piter<D, P> self_; typedef internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, p_complex<D, P>, - P, + mln_site(P), self_ > super_; public: @@ -89,13 +90,13 @@ namespace mln as it is also used for p_faces piters! */ : public internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, p_complex<D, P>, - P, + mln_site(P), p_n_faces_bkd_piter<D, P> > { typedef p_n_faces_bkd_piter<D, P> self_; typedef internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, p_complex<D, P>, - P, + mln_site(P), self_ > super_; public: -- 1.5.6.5

1 0

last-svn-commit-534-g626d241 Honor `--without-qt' in configure.
by Roland Levillain 29 Nov '10

29 Nov '10

* m4/autotroll.m4: Here. --- ChangeLog | 6 ++++++ m4/autotroll.m4 | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98d3a41..b63a9a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/m4/autotroll.m4 b/m4/autotroll.m4 index 2a382d4..0fae85e 100644 --- a/m4/autotroll.m4 +++ b/m4/autotroll.m4 @@ -143,6 +143,9 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given]) # this is a hack to get decent flow control with 'break' for _qt_ignored in once; do + # Stop here if Qt is disabled. + if test "x$with_qt" = xno; then break; fi + # Find Qt. AC_ARG_VAR([QT_PATH], [Path to the Qt installation]) if test -d /usr/local/Trolltech; then -- 1.5.6.5

1 0