May 2009 - Olena-patches

[Olena] #182: Repair Swilena
by Olena 15 May '09

15 May '09

#182: Repair Swilena ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: defect | Status: new Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- [source:trunk/swilena Swilena] is broken since the end of Summer 2008 (before the merging back of [source:branches/cleanup-2008 cleanup-2008/] into [source:trunk/ trunk/]). Have it compile and pass the tests again. -- Ticket URL: <https://trac.lrde.org/olena/ticket/182> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 2

[PATCH 31/31] WIP: More (unfinished) tests on for_all_in.
by Roland Levillain 15 May '09

15 May '09

--- milena/tests/core/image/complex_image.cc | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 27dfeb0..857ff56 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -226,17 +226,23 @@ int main() test_neighborhood(ima, complex_lower_neighborhood<D, G>(), "Lower-dimension faces"); - test_neighborhood(ima, complex_higher_neighborhood<D, G>(), - "Higher-dimension faces"); - test_neighborhood(ima, complex_lower_higher_neighborhood<D, G>(), - "Lower- and higer-dimension faces"); - - test_neighborhood(ima, - complex_lower_dim_connected_n_face_neighborhood<D, G>(), - "Lower-dimension connected n-faces"); - test_neighborhood(ima, - complex_higher_dim_connected_n_face_neighborhood<D, G>(), - "Higher-dimension connected n-faces"); +// test_neighborhood(ima, complex_higher_neighborhood<D, G>(), +// "Higher-dimension faces"); +// test_neighborhood(ima, complex_lower_higher_neighborhood<D, G>(), +// "Lower- and higer-dimension faces"); + +// test_neighborhood(ima, +// complex_lower_dim_connected_n_face_neighborhood<D, G>(), +// "Lower-dimension connected n-faces"); +// test_neighborhood(ima, +// complex_higher_dim_connected_n_face_neighborhood<D, G>(), +// "Higher-dimension connected n-faces"); + + typedef complex_lower_neighborhood<D, G> nbh_t; + for_all_in_(q, nbh_t, fp) + std::cout << q << std::endl; + + /* FIXME: Implement other neighborhoods (and windows) and corresponding iterators for complex-based images. -- 1.6.1.2

1 0

[PATCH 30/31] Add sugar macros for iterations on neighborhoods and windows.
by Roland Levillain 15 May '09

15 May '09

* mln/core/concept/site_iterator.hh (for_all_in_nbh for_all_in_nbh_, for_all_in_win, for_all_in_win_): New macros. (mln::internal::make_and_start_iterator): New helper functions. * tests/core/image/for_all_in.cc: New. * tests/core/image/Makefile.am (check_PROGRAMS): Add for_all_in. (for_all_in_SOURCES): New. --- milena/ChangeLog | 12 ++++ milena/mln/core/concept/site_iterator.hh | 92 ++++++++++++++++++++++++++++++ milena/tests/core/image/Makefile.am | 2 + milena/tests/core/image/for_all_in.cc | 65 +++++++++++++++++++++ 4 files changed, 171 insertions(+), 0 deletions(-) create mode 100644 milena/tests/core/image/for_all_in.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 34bb8a0..b83ee26 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2008-12-29 Roland Levillain <roland(a)lrde.epita.fr> + + Add sugar macros for iterations on neighborhoods and windows. + + * mln/core/concept/site_iterator.hh + (for_all_in_nbh for_all_in_nbh_, for_all_in_win, for_all_in_win_): + New macros. + (mln::internal::make_and_start_iterator): New helper functions. + * tests/core/image/for_all_in.cc: New. + * tests/core/image/Makefile.am (check_PROGRAMS): Add for_all_in. + (for_all_in_SOURCES): New. + 2009-05-14 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add morpho reconstruction by_dilation union_find algorithm. diff --git a/milena/mln/core/concept/site_iterator.hh b/milena/mln/core/concept/site_iterator.hh index 97cbc57..ef37285 100644 --- a/milena/mln/core/concept/site_iterator.hh +++ b/milena/mln/core/concept/site_iterator.hh @@ -40,6 +40,54 @@ # include <mln/core/concept/iterator.hh> // To fetch the macros. +/// \brief Loop shortcuts for iterations on neighborhood and windows. +/// +/// These iterations only work with default-constructible +/// neighborhoods and windows. +/// +/// If we were using `typeof' (non-standard GNU extension) or `auto' +/// (C++0x keyword), we could be more flexible w.r.t. the +/// initialization of the neighborhood/window. +// \{ + +// FIXME: Factor neighborhood and window versions. +// FIXME: What about for_all_in_fwd an for_all_in_bkd? + +/// \brief Loop to browse all the elements of a neighborhood of type +/// \p nbh_t centered at \p p, using an iterator named \p n (template +/// version). +# define for_all_in_nbh(n, nbh_t, p) \ + for (mln_niter(nbh_t) n = \ + mln::internal::make_and_start_iterator(nbh_t(), p); \ + n.is_valid(); n.next()) + +/// \brief Loop to browse all the elements of a neighborhood of type +/// \p nbh_t centered at \p p, using an iterator named \p n +/// (non-template version). +# define for_all_in_nbh_(n, nbh_t, p) \ + for (mln_niter_(nbh_t) n = \ + mln::internal::make_and_start_iterator(nbh_t(), p); \ + n.is_valid(); n.next()) + +/// \brief Loop to browse all the elements of a window of type \p +/// win_t centered at \p p, using an iterator named \p q (template +/// version). +# define for_all_in_win(q, win_t, p) \ + for (mln_niter(win_t) q = \ + mln::internal::make_and_start_iterator(win_t(), p); \ + q.is_valid(); q.next()) + +/// \brief Loop to browse all the elements of a window of type \p +/// win_t centered at \p p, using an iterator named \p q (non-template +/// version). +# define for_all_in_win_(q, win_t, p) \ + for (mln_niter_(win_t) q = \ + mln::internal::make_and_start_iterator(win_t(), p); \ + q.is_valid(); q.next()) + +/// \} + + namespace mln { @@ -86,6 +134,26 @@ namespace mln }; + // Forward declarations. + template <typename E> struct Neighborhood; + template <typename E> struct Window; + + namespace internal + { + + /// \brief Helper for for_all_in_nbh and for_all_in_nbh_ macros. + template <typename N, typename P> + mln_niter(N) + make_and_start_iterator(const Neighborhood<N>& nbh, const P& center); + + /// \brief Helper for for_all_in_win and for_all_in_win_ macros. + template <typename W, typename P> + mln_niter(W) + make_and_start_iterator(const Window<W>& win, const P& center); + + } // end of namespace mln::internal + + # ifndef MLN_INCLUDE_ONLY @@ -147,6 +215,30 @@ namespace mln m5 = 0; } + + namespace internal + { + + template <typename N, typename P> + mln_niter(N) + make_and_start_iterator(const Neighborhood<N>& nbh, const P& center) + { + mln_niter(N) n(exact(nbh), center); + n.start(); + return n; + } + + template <typename W, typename P> + mln_niter(W) + make_and_start_iterator(const Window<W>& win, const P& center) + { + mln_niter(W) q(exact(win), center); + q.start(); + return q; + } + + } // end of namespace mln::internal + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index cdd52f6..89c9bd7 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -10,6 +10,7 @@ check_PROGRAMS = \ edge_image \ flat_image \ hexa \ + for_all_in \ graph_image \ image1d \ image2d \ @@ -47,6 +48,7 @@ decorated_image_SOURCES = decorated_image.cc graph_image_SOURCES = graph_image.cc flat_image_SOURCES = flat_image.cc hexa_SOURCES = hexa.cc +for_all_in_SOURCES = for_all_in.cc image1d_SOURCES = image1d.cc image2d_SOURCES = image2d.cc image2d_h_SOURCES = image2d_h.cc diff --git a/milena/tests/core/image/for_all_in.cc b/milena/tests/core/image/for_all_in.cc new file mode 100644 index 0000000..7978d18 --- /dev/null +++ b/milena/tests/core/image/for_all_in.cc @@ -0,0 +1,65 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/core/image/for_all_in.cc +/// \brief Tests on for_all_in_* macros. + +#include <iostream> + +#include <mln/core/image/complex_neighborhoods.hh> +#include <mln/debug/iota.hh> + +#include "tests/core/image/complex_image.hh" + + +int main() +{ + typedef mln::int_u8_2complex_image2d ima_t; + ima_t ima = make_test_complex_image(); + + // FIXME: Update comment. + + /* This for_all_in_nbh_ shortcut is much shorter than the following + equivalent lines: + + mln::neighb2d nbh = mln::c4(); + mln_niter_(mln::neighb2d) n(nbh) + for_all_in_nbh_(n) + std::cout << n << ' '; + std::cout << std::endl; + + However it doesn't work with non default-constructible + neighborhoods (yet). */ + mln_piter_(ima_t) p(ima.domain()); + for_all(p) + { + typedef mln::complex_lower_neighborhood< 2, mln_geom_(ima_t) > nbh_t; + std::cout << p << std::endl; + for_all_in_nbh_(n, nbh_t, p) + std::cout << " " << n << std::endl; + } +} -- 1.6.1.2

1 0

[PATCH 30/31] Add sugar macros for iterations on neighborhoods and windows.
by Roland Levillain 15 May '09

15 May '09

* mln/core/concept/site_iterator.hh (for_all_in_nbh for_all_in_nbh_, for_all_in_win, for_all_in_win_): New macros. (mln::internal::make_and_start_iterator): New helper functions. * tests/core/image/for_all_in.cc: New. * tests/core/image/Makefile.am (check_PROGRAMS): Add for_all_in. (for_all_in_SOURCES): New. --- milena/ChangeLog | 12 ++++ milena/mln/core/concept/site_iterator.hh | 92 ++++++++++++++++++++++++++++++ milena/tests/core/image/Makefile.am | 2 + milena/tests/core/image/for_all_in.cc | 65 +++++++++++++++++++++ 4 files changed, 171 insertions(+), 0 deletions(-) create mode 100644 milena/tests/core/image/for_all_in.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 34bb8a0..b83ee26 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2008-12-29 Roland Levillain <roland(a)lrde.epita.fr> + + Add sugar macros for iterations on neighborhoods and windows. + + * mln/core/concept/site_iterator.hh + (for_all_in_nbh for_all_in_nbh_, for_all_in_win, for_all_in_win_): + New macros. + (mln::internal::make_and_start_iterator): New helper functions. + * tests/core/image/for_all_in.cc: New. + * tests/core/image/Makefile.am (check_PROGRAMS): Add for_all_in. + (for_all_in_SOURCES): New. + 2009-05-14 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add morpho reconstruction by_dilation union_find algorithm. diff --git a/milena/mln/core/concept/site_iterator.hh b/milena/mln/core/concept/site_iterator.hh index 97cbc57..ef37285 100644 --- a/milena/mln/core/concept/site_iterator.hh +++ b/milena/mln/core/concept/site_iterator.hh @@ -40,6 +40,54 @@ # include <mln/core/concept/iterator.hh> // To fetch the macros. +/// \brief Loop shortcuts for iterations on neighborhood and windows. +/// +/// These iterations only work with default-constructible +/// neighborhoods and windows. +/// +/// If we were using `typeof' (non-standard GNU extension) or `auto' +/// (C++0x keyword), we could be more flexible w.r.t. the +/// initialization of the neighborhood/window. +// \{ + +// FIXME: Factor neighborhood and window versions. +// FIXME: What about for_all_in_fwd an for_all_in_bkd? + +/// \brief Loop to browse all the elements of a neighborhood of type +/// \p nbh_t centered at \p p, using an iterator named \p n (template +/// version). +# define for_all_in_nbh(n, nbh_t, p) \ + for (mln_niter(nbh_t) n = \ + mln::internal::make_and_start_iterator(nbh_t(), p); \ + n.is_valid(); n.next()) + +/// \brief Loop to browse all the elements of a neighborhood of type +/// \p nbh_t centered at \p p, using an iterator named \p n +/// (non-template version). +# define for_all_in_nbh_(n, nbh_t, p) \ + for (mln_niter_(nbh_t) n = \ + mln::internal::make_and_start_iterator(nbh_t(), p); \ + n.is_valid(); n.next()) + +/// \brief Loop to browse all the elements of a window of type \p +/// win_t centered at \p p, using an iterator named \p q (template +/// version). +# define for_all_in_win(q, win_t, p) \ + for (mln_niter(win_t) q = \ + mln::internal::make_and_start_iterator(win_t(), p); \ + q.is_valid(); q.next()) + +/// \brief Loop to browse all the elements of a window of type \p +/// win_t centered at \p p, using an iterator named \p q (non-template +/// version). +# define for_all_in_win_(q, win_t, p) \ + for (mln_niter_(win_t) q = \ + mln::internal::make_and_start_iterator(win_t(), p); \ + q.is_valid(); q.next()) + +/// \} + + namespace mln { @@ -86,6 +134,26 @@ namespace mln }; + // Forward declarations. + template <typename E> struct Neighborhood; + template <typename E> struct Window; + + namespace internal + { + + /// \brief Helper for for_all_in_nbh and for_all_in_nbh_ macros. + template <typename N, typename P> + mln_niter(N) + make_and_start_iterator(const Neighborhood<N>& nbh, const P& center); + + /// \brief Helper for for_all_in_win and for_all_in_win_ macros. + template <typename W, typename P> + mln_niter(W) + make_and_start_iterator(const Window<W>& win, const P& center); + + } // end of namespace mln::internal + + # ifndef MLN_INCLUDE_ONLY @@ -147,6 +215,30 @@ namespace mln m5 = 0; } + + namespace internal + { + + template <typename N, typename P> + mln_niter(N) + make_and_start_iterator(const Neighborhood<N>& nbh, const P& center) + { + mln_niter(N) n(exact(nbh), center); + n.start(); + return n; + } + + template <typename W, typename P> + mln_niter(W) + make_and_start_iterator(const Window<W>& win, const P& center) + { + mln_niter(W) q(exact(win), center); + q.start(); + return q; + } + + } // end of namespace mln::internal + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index cdd52f6..89c9bd7 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -10,6 +10,7 @@ check_PROGRAMS = \ edge_image \ flat_image \ hexa \ + for_all_in \ graph_image \ image1d \ image2d \ @@ -47,6 +48,7 @@ decorated_image_SOURCES = decorated_image.cc graph_image_SOURCES = graph_image.cc flat_image_SOURCES = flat_image.cc hexa_SOURCES = hexa.cc +for_all_in_SOURCES = for_all_in.cc image1d_SOURCES = image1d.cc image2d_SOURCES = image2d.cc image2d_h_SOURCES = image2d_h.cc diff --git a/milena/tests/core/image/for_all_in.cc b/milena/tests/core/image/for_all_in.cc new file mode 100644 index 0000000..7978d18 --- /dev/null +++ b/milena/tests/core/image/for_all_in.cc @@ -0,0 +1,65 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/core/image/for_all_in.cc +/// \brief Tests on for_all_in_* macros. + +#include <iostream> + +#include <mln/core/image/complex_neighborhoods.hh> +#include <mln/debug/iota.hh> + +#include "tests/core/image/complex_image.hh" + + +int main() +{ + typedef mln::int_u8_2complex_image2d ima_t; + ima_t ima = make_test_complex_image(); + + // FIXME: Update comment. + + /* This for_all_in_nbh_ shortcut is much shorter than the following + equivalent lines: + + mln::neighb2d nbh = mln::c4(); + mln_niter_(mln::neighb2d) n(nbh) + for_all_in_nbh_(n) + std::cout << n << ' '; + std::cout << std::endl; + + However it doesn't work with non default-constructible + neighborhoods (yet). */ + mln_piter_(ima_t) p(ima.domain()); + for_all(p) + { + typedef mln::complex_lower_neighborhood< 2, mln_geom_(ima_t) > nbh_t; + std::cout << p << std::endl; + for_all_in_nbh_(n, nbh_t, p) + std::cout << " " << n << std::endl; + } +} -- 1.6.1.2

1 0

[PATCH 31/31] WIP: More (unfinished) tests on for_all_in.
by Roland Levillain 15 May '09

15 May '09

--- milena/tests/core/image/complex_image.cc | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 27dfeb0..857ff56 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -226,17 +226,23 @@ int main() test_neighborhood(ima, complex_lower_neighborhood<D, G>(), "Lower-dimension faces"); - test_neighborhood(ima, complex_higher_neighborhood<D, G>(), - "Higher-dimension faces"); - test_neighborhood(ima, complex_lower_higher_neighborhood<D, G>(), - "Lower- and higer-dimension faces"); - - test_neighborhood(ima, - complex_lower_dim_connected_n_face_neighborhood<D, G>(), - "Lower-dimension connected n-faces"); - test_neighborhood(ima, - complex_higher_dim_connected_n_face_neighborhood<D, G>(), - "Higher-dimension connected n-faces"); +// test_neighborhood(ima, complex_higher_neighborhood<D, G>(), +// "Higher-dimension faces"); +// test_neighborhood(ima, complex_lower_higher_neighborhood<D, G>(), +// "Lower- and higer-dimension faces"); + +// test_neighborhood(ima, +// complex_lower_dim_connected_n_face_neighborhood<D, G>(), +// "Lower-dimension connected n-faces"); +// test_neighborhood(ima, +// complex_higher_dim_connected_n_face_neighborhood<D, G>(), +// "Higher-dimension connected n-faces"); + + typedef complex_lower_neighborhood<D, G> nbh_t; + for_all_in_(q, nbh_t, fp) + std::cout << q << std::endl; + + /* FIXME: Implement other neighborhoods (and windows) and corresponding iterators for complex-based images. -- 1.6.1.2

1 0

[PATCH 31/31] WIP: More (unfinished) tests on for_all_in.
by Roland Levillain 15 May '09

15 May '09

--- milena/tests/core/image/complex_image.cc | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 27dfeb0..857ff56 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -226,17 +226,23 @@ int main() test_neighborhood(ima, complex_lower_neighborhood<D, G>(), "Lower-dimension faces"); - test_neighborhood(ima, complex_higher_neighborhood<D, G>(), - "Higher-dimension faces"); - test_neighborhood(ima, complex_lower_higher_neighborhood<D, G>(), - "Lower- and higer-dimension faces"); - - test_neighborhood(ima, - complex_lower_dim_connected_n_face_neighborhood<D, G>(), - "Lower-dimension connected n-faces"); - test_neighborhood(ima, - complex_higher_dim_connected_n_face_neighborhood<D, G>(), - "Higher-dimension connected n-faces"); +// test_neighborhood(ima, complex_higher_neighborhood<D, G>(), +// "Higher-dimension faces"); +// test_neighborhood(ima, complex_lower_higher_neighborhood<D, G>(), +// "Lower- and higer-dimension faces"); + +// test_neighborhood(ima, +// complex_lower_dim_connected_n_face_neighborhood<D, G>(), +// "Lower-dimension connected n-faces"); +// test_neighborhood(ima, +// complex_higher_dim_connected_n_face_neighborhood<D, G>(), +// "Higher-dimension connected n-faces"); + + typedef complex_lower_neighborhood<D, G> nbh_t; + for_all_in_(q, nbh_t, fp) + std::cout << q << std::endl; + + /* FIXME: Implement other neighborhoods (and windows) and corresponding iterators for complex-based images. -- 1.6.1.2

1 0

[PATCH 30/31] Add sugar macros for iterations on neighborhoods and windows.
by Roland Levillain 15 May '09

15 May '09

* mln/core/concept/site_iterator.hh (for_all_in_nbh for_all_in_nbh_, for_all_in_win, for_all_in_win_): New macros. (mln::internal::make_and_start_iterator): New helper functions. * tests/core/image/for_all_in.cc: New. * tests/core/image/Makefile.am (check_PROGRAMS): Add for_all_in. (for_all_in_SOURCES): New. --- milena/ChangeLog | 12 ++++ milena/mln/core/concept/site_iterator.hh | 92 ++++++++++++++++++++++++++++++ milena/tests/core/image/Makefile.am | 2 + milena/tests/core/image/for_all_in.cc | 65 +++++++++++++++++++++ 4 files changed, 171 insertions(+), 0 deletions(-) create mode 100644 milena/tests/core/image/for_all_in.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 34bb8a0..b83ee26 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2008-12-29 Roland Levillain <roland(a)lrde.epita.fr> + + Add sugar macros for iterations on neighborhoods and windows. + + * mln/core/concept/site_iterator.hh + (for_all_in_nbh for_all_in_nbh_, for_all_in_win, for_all_in_win_): + New macros. + (mln::internal::make_and_start_iterator): New helper functions. + * tests/core/image/for_all_in.cc: New. + * tests/core/image/Makefile.am (check_PROGRAMS): Add for_all_in. + (for_all_in_SOURCES): New. + 2009-05-14 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add morpho reconstruction by_dilation union_find algorithm. diff --git a/milena/mln/core/concept/site_iterator.hh b/milena/mln/core/concept/site_iterator.hh index 97cbc57..ef37285 100644 --- a/milena/mln/core/concept/site_iterator.hh +++ b/milena/mln/core/concept/site_iterator.hh @@ -40,6 +40,54 @@ # include <mln/core/concept/iterator.hh> // To fetch the macros. +/// \brief Loop shortcuts for iterations on neighborhood and windows. +/// +/// These iterations only work with default-constructible +/// neighborhoods and windows. +/// +/// If we were using `typeof' (non-standard GNU extension) or `auto' +/// (C++0x keyword), we could be more flexible w.r.t. the +/// initialization of the neighborhood/window. +// \{ + +// FIXME: Factor neighborhood and window versions. +// FIXME: What about for_all_in_fwd an for_all_in_bkd? + +/// \brief Loop to browse all the elements of a neighborhood of type +/// \p nbh_t centered at \p p, using an iterator named \p n (template +/// version). +# define for_all_in_nbh(n, nbh_t, p) \ + for (mln_niter(nbh_t) n = \ + mln::internal::make_and_start_iterator(nbh_t(), p); \ + n.is_valid(); n.next()) + +/// \brief Loop to browse all the elements of a neighborhood of type +/// \p nbh_t centered at \p p, using an iterator named \p n +/// (non-template version). +# define for_all_in_nbh_(n, nbh_t, p) \ + for (mln_niter_(nbh_t) n = \ + mln::internal::make_and_start_iterator(nbh_t(), p); \ + n.is_valid(); n.next()) + +/// \brief Loop to browse all the elements of a window of type \p +/// win_t centered at \p p, using an iterator named \p q (template +/// version). +# define for_all_in_win(q, win_t, p) \ + for (mln_niter(win_t) q = \ + mln::internal::make_and_start_iterator(win_t(), p); \ + q.is_valid(); q.next()) + +/// \brief Loop to browse all the elements of a window of type \p +/// win_t centered at \p p, using an iterator named \p q (non-template +/// version). +# define for_all_in_win_(q, win_t, p) \ + for (mln_niter_(win_t) q = \ + mln::internal::make_and_start_iterator(win_t(), p); \ + q.is_valid(); q.next()) + +/// \} + + namespace mln { @@ -86,6 +134,26 @@ namespace mln }; + // Forward declarations. + template <typename E> struct Neighborhood; + template <typename E> struct Window; + + namespace internal + { + + /// \brief Helper for for_all_in_nbh and for_all_in_nbh_ macros. + template <typename N, typename P> + mln_niter(N) + make_and_start_iterator(const Neighborhood<N>& nbh, const P& center); + + /// \brief Helper for for_all_in_win and for_all_in_win_ macros. + template <typename W, typename P> + mln_niter(W) + make_and_start_iterator(const Window<W>& win, const P& center); + + } // end of namespace mln::internal + + # ifndef MLN_INCLUDE_ONLY @@ -147,6 +215,30 @@ namespace mln m5 = 0; } + + namespace internal + { + + template <typename N, typename P> + mln_niter(N) + make_and_start_iterator(const Neighborhood<N>& nbh, const P& center) + { + mln_niter(N) n(exact(nbh), center); + n.start(); + return n; + } + + template <typename W, typename P> + mln_niter(W) + make_and_start_iterator(const Window<W>& win, const P& center) + { + mln_niter(W) q(exact(win), center); + q.start(); + return q; + } + + } // end of namespace mln::internal + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index cdd52f6..89c9bd7 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -10,6 +10,7 @@ check_PROGRAMS = \ edge_image \ flat_image \ hexa \ + for_all_in \ graph_image \ image1d \ image2d \ @@ -47,6 +48,7 @@ decorated_image_SOURCES = decorated_image.cc graph_image_SOURCES = graph_image.cc flat_image_SOURCES = flat_image.cc hexa_SOURCES = hexa.cc +for_all_in_SOURCES = for_all_in.cc image1d_SOURCES = image1d.cc image2d_SOURCES = image2d.cc image2d_h_SOURCES = image2d_h.cc diff --git a/milena/tests/core/image/for_all_in.cc b/milena/tests/core/image/for_all_in.cc new file mode 100644 index 0000000..7978d18 --- /dev/null +++ b/milena/tests/core/image/for_all_in.cc @@ -0,0 +1,65 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/core/image/for_all_in.cc +/// \brief Tests on for_all_in_* macros. + +#include <iostream> + +#include <mln/core/image/complex_neighborhoods.hh> +#include <mln/debug/iota.hh> + +#include "tests/core/image/complex_image.hh" + + +int main() +{ + typedef mln::int_u8_2complex_image2d ima_t; + ima_t ima = make_test_complex_image(); + + // FIXME: Update comment. + + /* This for_all_in_nbh_ shortcut is much shorter than the following + equivalent lines: + + mln::neighb2d nbh = mln::c4(); + mln_niter_(mln::neighb2d) n(nbh) + for_all_in_nbh_(n) + std::cout << n << ' '; + std::cout << std::endl; + + However it doesn't work with non default-constructible + neighborhoods (yet). */ + mln_piter_(ima_t) p(ima.domain()); + for_all(p) + { + typedef mln::complex_lower_neighborhood< 2, mln_geom_(ima_t) > nbh_t; + std::cout << p << std::endl; + for_all_in_nbh_(n, nbh_t, p) + std::cout << " " << n << std::endl; + } +} -- 1.6.1.2

1 0

[PATCH 31/31] Regen Makefile helpers.
by Roland Levillain 15 May '09

15 May '09

* doc/examples/examples.mk, * doc/figures/figures.mk, * doc/outputs/outputs.mk, * headers.mk, * tests/unit_tests/unit-tests.mk: Regen. --- milena/ChangeLog | 11 ++ milena/doc/examples/examples.mk | 6 +- milena/doc/figures/figures.mk | 60 ++++---- milena/doc/outputs/outputs.mk | 85 +++++----- milena/headers.mk | 152 +++++++++--------- milena/tests/unit_test/unit-tests.mk | 296 +++++++++++++++++---------------- 6 files changed, 317 insertions(+), 293 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5325ab4..fb68d60 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-05-15 Roland Levillain <roland(a)lrde.epita.fr> + Regen Makefile helpers. + + * doc/examples/examples.mk, + * doc/figures/figures.mk, + * doc/outputs/outputs.mk, + * headers.mk, + * tests/unit_tests/unit-tests.mk: + Regen. + +2009-05-15 Roland Levillain <roland(a)lrde.epita.fr> + Get compilation flags for applications from configure. * apps/statues/Makefile.am (APPS_CXXFLAGS): New. diff --git a/milena/doc/examples/examples.mk b/milena/doc/examples/examples.mk index 3ae418c..dba7c48 100644 --- a/milena/doc/examples/examples.mk +++ b/milena/doc/examples/examples.mk @@ -1,9 +1,9 @@ ## Generated by ../generate_dist_files, do not modify. EXTRA_DIST += \ +examples/accu-wrong-instanciation.cc.raw \ examples/fill-proto.cc.raw \ examples/ima2d-restricted-1.cc.raw \ examples/ima2d-restricted-2.cc.raw \ -examples/tuto3/fill_non_generic.cc.raw \ -examples/accu-wrong-instanciation.cc.raw \ -examples/ima2d-restricted-3.cc.raw +examples/ima2d-restricted-3.cc.raw \ +examples/tuto3/fill_non_generic.cc.raw diff --git a/milena/doc/figures/figures.mk b/milena/doc/figures/figures.mk index 2602b31..35beaa1 100644 --- a/milena/doc/figures/figures.mk +++ b/milena/doc/figures/figures.mk @@ -1,41 +1,41 @@ ## Generated by ../generate_dist_files, do not modify. EXTRA_DIST += \ -figures/extend-1.ppm \ -figures/ima2d-rot-2.ppm \ -figures/tuto3_rw_image-1.ppm \ -figures/logical-not-2.pbm \ -figures/fill-subdomain-2.ppm \ -figures/tuto4_genericity_and_algorithms-9.pgm \ -figures/labeling-compute-2.ppm \ -figures/tuto4_genericity_and_algorithms-7.pgm \ -figures/tuto4_genericity_and_algorithms-5.ppm \ -figures/ima2d-rot-1.ppm \ -figures/fill-subdomain-3.ppm \ -figures/tuto4_genericity_and_algorithms-9.ppm \ -figures/logical-not-1.pbm \ -figures/ima_save.pbm \ -figures/tuto2_first_image-1.pbm \ -figures/fill-subimage-cfun-1.ppm \ -figures/extend-3.ppm \ -figures/fill-subdomain-4.ppm \ figures/colorize-1.pgm \ -figures/tuto4_genericity_and_algorithms-7.ppm \ -figures/tuto4_genericity_and_algorithms-6.ppm \ -figures/extend-5.ppm \ -figures/logical-not-3.pbm \ figures/colorize-2.ppm \ -figures/tuto4_genericity_and_algorithms-3.pbm \ -figures/tuto4_genericity_and_algorithms-1.ppm \ +figures/extend-1.ppm \ +figures/extend-2.ppm \ +figures/extend-3.ppm \ figures/extend-4.ppm \ +figures/extend-5.ppm \ +figures/fill-1.ppm \ figures/fill-2.ppm \ -figures/tuto4_genericity_and_algorithms-8.ppm \ +figures/fill-subdomain-1.pbm \ +figures/fill-subdomain-2.ppm \ +figures/fill-subdomain-3.ppm \ +figures/fill-subdomain-4.ppm \ +figures/fill-subimage-cfun-1.ppm \ +figures/ima2d-rot-1.ppm \ +figures/ima2d-rot-2.ppm \ +figures/ima_save.pbm \ figures/labeling-compute-1.pbm \ +figures/labeling-compute-2.ppm \ +figures/logical-not-1.pbm \ +figures/logical-not-2.pbm \ +figures/logical-not-3.pbm \ +figures/tuto2_first_image-1.pbm \ +figures/tuto3_rw_image-1.ppm \ +figures/tuto3_rw_image-2.ppm \ figures/tuto3_rw_image-3.ppm \ +figures/tuto4_genericity_and_algorithms-1.ppm \ +figures/tuto4_genericity_and_algorithms-2.ppm \ +figures/tuto4_genericity_and_algorithms-3.pbm \ figures/tuto4_genericity_and_algorithms-4.ppm \ +figures/tuto4_genericity_and_algorithms-5.ppm \ +figures/tuto4_genericity_and_algorithms-6.ppm \ +figures/tuto4_genericity_and_algorithms-7.pgm \ +figures/tuto4_genericity_and_algorithms-7.ppm \ figures/tuto4_genericity_and_algorithms-8.pgm \ -figures/extend-2.ppm \ -figures/tuto4_genericity_and_algorithms-2.ppm \ -figures/fill-subdomain-1.pbm \ -figures/fill-1.ppm \ -figures/tuto3_rw_image-2.ppm +figures/tuto4_genericity_and_algorithms-8.ppm \ +figures/tuto4_genericity_and_algorithms-9.pgm \ +figures/tuto4_genericity_and_algorithms-9.ppm diff --git a/milena/doc/outputs/outputs.mk b/milena/doc/outputs/outputs.mk index 5b9de7c..754db84 100644 --- a/milena/doc/outputs/outputs.mk +++ b/milena/doc/outputs/outputs.mk @@ -1,59 +1,60 @@ ## Generated by ../generate_dist_files, do not modify. EXTRA_DIST += \ -outputs/win-create-1-display.txt \ -outputs/trace.txt \ -outputs/win-create-2.txt \ outputs/accu-right-instanciation.txt \ -outputs/extend.txt \ -outputs/ima2d-1.txt \ outputs/borderthickness.txt \ -outputs/first_routine.txt \ -outputs/ima-save.txt \ -outputs/fill-subimage-cfun.txt \ -outputs/labeling-compute.txt \ -outputs/parray-display-1.txt \ -outputs/fill-subdomain-shorter.txt \ +outputs/box2d-bbox.txt \ +outputs/domain-display.txt \ outputs/dpoint-1.txt \ +outputs/estim-sites.txt \ +outputs/extend.txt \ +outputs/extension-ignore.txt \ +outputs/fill-call-1.txt \ +outputs/fill-part-image.txt \ +outputs/fill-subdomain-shorter.txt \ +outputs/fill-subdomain.txt \ +outputs/fill-subimage-cfun.txt \ +outputs/fill.txt \ +outputs/first_routine.txt \ outputs/forall-piter.txt \ -outputs/predicate-1.txt \ -outputs/box2d-bbox.txt \ +outputs/fun-p2v-1.txt \ +outputs/graph-data.txt \ outputs/graph-iter.txt \ outputs/graph-output-1.txt \ -outputs/fill-call-1.txt \ -outputs/site_set_create.txt \ -outputs/ima2d-rot.txt \ -outputs/paste-call-1.txt \ -outputs/fun-p2v-1.txt \ -outputs/estim-sites.txt \ -outputs/parray-append.txt \ -outputs/fill-subdomain.txt \ +outputs/ima-has.txt \ +outputs/ima-save.txt \ outputs/ima-size.txt \ -outputs/tuto2_first_image.txt \ -outputs/logical-not.txt \ -outputs/colorize.txt \ -outputs/ima2d-display-output-2.txt \ -outputs/ima2d-decl-2.txt \ -outputs/paste.txt \ +outputs/ima2d-1.txt \ +outputs/ima2d-2.txt \ +outputs/ima2d-3.txt \ +outputs/ima2d-4.txt \ +outputs/ima2d-5.txt \ outputs/ima2d-6-clone.txt \ outputs/ima2d-7.txt \ -outputs/println.txt \ -outputs/tuto3_rw_image.txt \ -outputs/parray-bbox.txt \ -outputs/domain-display.txt \ +outputs/ima2d-decl-2.txt \ outputs/ima2d-display-1.txt \ -outputs/win-create-1.txt \ outputs/ima2d-display-2.txt \ outputs/ima2d-display-output-1.txt \ -outputs/fill-part-image.txt \ -outputs/tuto4_genericity_and_algorithms.txt \ -outputs/ima-has.txt \ -outputs/ima2d-5.txt \ -outputs/ima2d-4.txt \ +outputs/ima2d-display-output-2.txt \ +outputs/ima2d-rot.txt \ +outputs/labeling-compute.txt \ +outputs/logical-not.txt \ outputs/mln_var.txt \ -outputs/fill.txt \ +outputs/parray-append.txt \ +outputs/parray-bbox.txt \ +outputs/parray-display-1.txt \ +outputs/paste-call-1.txt \ +outputs/paste.txt \ outputs/point-1.txt \ -outputs/extension-ignore.txt \ -outputs/graph-data.txt \ -outputs/ima2d-2.txt \ -outputs/ima2d-3.txt +outputs/predicate-1.txt \ +outputs/tuto2_first_image.txt \ +outputs/tuto3_colorize.txt \ +outputs/tuto3_println.txt \ +outputs/tuto3_rw_image.txt \ +outputs/tuto3_trace.txt \ +outputs/tuto4_genericity_and_algorithms.txt \ +outputs/tuto4_point2d.txt \ +outputs/tuto4_site_set_create.txt \ +outputs/win-create-1-display.txt \ +outputs/win-create-1.txt \ +outputs/win-create-2.txt diff --git a/milena/headers.mk b/milena/headers.mk index 9ec7784..9643f61 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -7,8 +7,8 @@ mln/accu/bbox.hh \ mln/accu/center.hh \ mln/accu/compute.hh \ mln/accu/convolve.hh \ -mln/accu/count_adjacent_vertices.hh \ mln/accu/count.hh \ +mln/accu/count_adjacent_vertices.hh \ mln/accu/count_labels.hh \ mln/accu/essential.hh \ mln/accu/height.hh \ @@ -17,8 +17,8 @@ mln/accu/image/all.hh \ mln/accu/image/essential.hh \ mln/accu/image/init.hh \ mln/accu/image/set_value.hh \ -mln/accu/image/take_as_init.hh \ mln/accu/image/take.hh \ +mln/accu/image/take_as_init.hh \ mln/accu/image/take_n_times.hh \ mln/accu/image/to_result.hh \ mln/accu/image/untake.hh \ @@ -26,11 +26,11 @@ mln/accu/inf.hh \ mln/accu/internal/base.hh \ mln/accu/internal/couple.hh \ mln/accu/label_used.hh \ -mln/accu/land_basic.hh \ mln/accu/land.hh \ +mln/accu/land_basic.hh \ mln/accu/line.hh \ -mln/accu/lor_basic.hh \ mln/accu/lor.hh \ +mln/accu/lor_basic.hh \ mln/accu/maj_h.hh \ mln/accu/max.hh \ mln/accu/max_h.hh \ @@ -41,10 +41,10 @@ mln/accu/min.hh \ mln/accu/min_h.hh \ mln/accu/min_max.hh \ mln/accu/nil.hh \ -mln/accu/pair.hh \ mln/accu/p.hh \ -mln/accu/rank_bool.hh \ +mln/accu/pair.hh \ mln/accu/rank.hh \ +mln/accu/rank_bool.hh \ mln/accu/rank_high_quant.hh \ mln/accu/rms.hh \ mln/accu/site_set/all.hh \ @@ -57,9 +57,9 @@ mln/accu/stat/variance.hh \ mln/accu/sum.hh \ mln/accu/sup.hh \ mln/accu/take.hh \ +mln/accu/transform.hh \ mln/accu/transform_diagonal.hh \ mln/accu/transform_directional.hh \ -mln/accu/transform.hh \ mln/accu/transform_line.hh \ mln/accu/transform_snake.hh \ mln/accu/transform_stop.hh \ @@ -102,19 +102,21 @@ mln/border/fill.hh \ mln/border/find.hh \ mln/border/get.hh \ mln/border/mirror.hh \ -mln/border/resize_equal.hh \ mln/border/resize.hh \ +mln/border/resize_equal.hh \ mln/border/thickness.hh \ mln/canvas/all.hh \ mln/canvas/browsing/all.hh \ mln/canvas/browsing/backdiagonal2d.hh \ +mln/canvas/browsing/breadth_first_search.hh \ mln/canvas/browsing/depth_first_search.hh \ mln/canvas/browsing/diagonal2d.hh \ -mln/canvas/browsing/directional.hh \ mln/canvas/browsing/dir_struct_elt_incr_update.hh \ +mln/canvas/browsing/directional.hh \ mln/canvas/browsing/essential.hh \ mln/canvas/browsing/fwd.hh \ mln/canvas/browsing/hyper_directional.hh \ +mln/canvas/browsing/internal/graph_first_search.hh \ mln/canvas/browsing/snake_fwd.hh \ mln/canvas/browsing/snake_generic.hh \ mln/canvas/browsing/snake_vert.hh \ @@ -138,14 +140,15 @@ mln/convert/impl/from_int_to_value.hh \ mln/convert/impl/from_site_set_to_image.hh \ mln/convert/impl/from_unsigned_to_value.hh \ mln/convert/impl/from_value_to_value.hh \ +mln/convert/to.hh \ mln/convert/to_dpoint.hh \ mln/convert/to_fun.hh \ -mln/convert/to.hh \ mln/convert/to_image.hh \ mln/convert/to_p_array.hh \ mln/convert/to_p_set.hh \ mln/convert/to_upper_window.hh \ mln/convert/to_window.hh \ +mln/core/a_point_of.hh \ mln/core/alias/all.hh \ mln/core/alias/box1d.hh \ mln/core/alias/box2d.hh \ @@ -160,29 +163,28 @@ mln/core/alias/dpoint3d.hh \ mln/core/alias/neighb1d.hh \ mln/core/alias/neighb2d.hh \ mln/core/alias/neighb3d.hh \ +mln/core/alias/p_run2d.hh \ +mln/core/alias/p_runs2d.hh \ mln/core/alias/point1d.hh \ mln/core/alias/point2d.hh \ mln/core/alias/point2d_h.hh \ mln/core/alias/point3d.hh \ -mln/core/alias/p_run2d.hh \ -mln/core/alias/p_runs2d.hh \ mln/core/alias/vec2d.hh \ mln/core/alias/vec3d.hh \ -mln/core/alias/window1d.hh \ -mln/core/alias/window2d.hh \ -mln/core/alias/window3d.hh \ mln/core/alias/w_window1d_float.hh \ mln/core/alias/w_window1d_int.hh \ mln/core/alias/w_window2d_float.hh \ mln/core/alias/w_window2d_int.hh \ mln/core/alias/w_window3d_float.hh \ mln/core/alias/w_window3d_int.hh \ +mln/core/alias/window1d.hh \ +mln/core/alias/window2d.hh \ +mln/core/alias/window3d.hh \ mln/core/all.hh \ -mln/core/a_point_of.hh \ mln/core/box_runstart_piter.hh \ mln/core/category.hh \ -mln/core/clock_neighb2d.hh \ mln/core/clock_neighb.hh \ +mln/core/clock_neighb2d.hh \ mln/core/concept/accumulator.hh \ mln/core/concept/all.hh \ mln/core/concept/box.hh \ @@ -192,8 +194,8 @@ mln/core/concept/doc/accumulator.hh \ mln/core/concept/doc/box.hh \ mln/core/concept/doc/dpoint.hh \ mln/core/concept/doc/generalized_pixel.hh \ -mln/core/concept/doc/image_fastest.hh \ mln/core/concept/doc/image.hh \ +mln/core/concept/doc/image_fastest.hh \ mln/core/concept/doc/iterator.hh \ mln/core/concept/doc/neighborhood.hh \ mln/core/concept/doc/object.hh \ @@ -216,8 +218,8 @@ mln/core/concept/iterator.hh \ mln/core/concept/literal.hh \ mln/core/concept/mesh.hh \ mln/core/concept/meta_accumulator.hh \ -mln/core/concept/meta_function.hh \ mln/core/concept/meta_fun.hh \ +mln/core/concept/meta_function.hh \ mln/core/concept/neighborhood.hh \ mln/core/concept/object.hh \ mln/core/concept/pixel_iterator.hh \ @@ -237,8 +239,8 @@ mln/core/concept/weighted_window.hh \ mln/core/concept/window.hh \ mln/core/contract.hh \ mln/core/def/all.hh \ -mln/core/def/coordf.hh \ mln/core/def/coord.hh \ +mln/core/def/coordf.hh \ mln/core/def/essential.hh \ mln/core/def/low_quant_nbits.hh \ mln/core/dpoint.hh \ @@ -297,9 +299,9 @@ mln/core/image/sparse_encode.hh \ mln/core/image/sparse_image.hh \ mln/core/image/sub_image.hh \ mln/core/image/sub_image_if.hh \ -mln/core/image/thrubin_morpher.hh \ -mln/core/image/thru_morpher.hh \ mln/core/image/t_image.hh \ +mln/core/image/thru_morpher.hh \ +mln/core/image/thrubin_morpher.hh \ mln/core/image/tr_image.hh \ mln/core/image/tr_mesh.hh \ mln/core/image/unproject_image.hh \ @@ -389,8 +391,8 @@ mln/core/site_set/p_line2d.hh \ mln/core/site_set/p_mutable_array_of.hh \ mln/core/site_set/p_n_faces_piter.hh \ mln/core/site_set/p_priority.hh \ -mln/core/site_set/p_queue_fast.hh \ mln/core/site_set/p_queue.hh \ +mln/core/site_set/p_queue_fast.hh \ mln/core/site_set/p_run.hh \ mln/core/site_set/p_run_piter.hh \ mln/core/site_set/p_set.hh \ @@ -405,8 +407,8 @@ mln/core/trait/op_mult.hh \ mln/core/trait/pixter.hh \ mln/core/trait/qlf_value.hh \ mln/core/var.hh \ -mln/core/window.hh \ mln/core/w_window.hh \ +mln/core/window.hh \ mln/data/all.hh \ mln/data/essential.hh \ mln/data/fill.hh \ @@ -450,9 +452,9 @@ mln/estim/essential.hh \ mln/estim/mean.hh \ mln/estim/min_max.hh \ mln/estim/sum.hh \ +mln/extension/adjust.hh \ mln/extension/adjust_duplicate.hh \ mln/extension/adjust_fill.hh \ -mln/extension/adjust.hh \ mln/extension/all.hh \ mln/extension/duplicate.hh \ mln/extension/essential.hh \ @@ -471,11 +473,11 @@ mln/fun/accu_result.hh \ mln/fun/all.hh \ mln/fun/binary.hh \ mln/fun/binary_param.hh \ -mln/fun/cast.hh \ mln/fun/c.hh \ +mln/fun/cast.hh \ mln/fun/component/blue.hh \ -mln/fun/component/comp_count.hh \ mln/fun/component/comp.hh \ +mln/fun/component/comp_count.hh \ mln/fun/component/green.hh \ mln/fun/component/ithcomp.hh \ mln/fun/component/red.hh \ @@ -663,18 +665,17 @@ mln/io/pgm/load.hh \ mln/io/pgm/save.hh \ mln/io/plot/save.hh \ mln/io/pnm/all.hh \ -mln/io/pnm/load_header.hh \ mln/io/pnm/load.hh \ +mln/io/pnm/load_header.hh \ mln/io/pnm/macros.hh \ mln/io/pnm/max_component.hh \ -mln/io/pnm/save_header.hh \ mln/io/pnm/save.hh \ +mln/io/pnm/save_header.hh \ mln/io/ppm/all.hh \ mln/io/ppm/load.hh \ mln/io/ppm/save.hh \ mln/io/tiff/all.hh \ mln/io/tiff/load.hh \ -mln/io/tiff/save.hh \ mln/io/txt/all.hh \ mln/io/txt/save.hh \ mln/labeling/all.hh \ @@ -718,22 +719,22 @@ mln/level/sort_psites.hh \ mln/level/stretch.hh \ mln/level/to_enc.hh \ mln/level/transform.hh \ -mln/level/transform_inplace.hh \ mln/level/transform.spe.hh \ +mln/level/transform_inplace.hh \ mln/level/update.hh \ mln/level/was.median.hh \ mln/linear/all.hh \ mln/linear/ch_convolve.hh \ +mln/linear/convolve.hh \ mln/linear/convolve_2x1d.hh \ mln/linear/convolve_directional.hh \ -mln/linear/convolve.hh \ mln/linear/essential.hh \ -mln/linear/gaussian_1d.hh \ -mln/linear/gaussian_directional_2d.hh \ -mln/linear/gaussian/filter.hh \ mln/linear/gaussian.hh \ +mln/linear/gaussian/filter.hh \ mln/linear/gaussian/impl.hh \ mln/linear/gaussian/internal/coefficients.hh \ +mln/linear/gaussian_1d.hh \ +mln/linear/gaussian_directional_2d.hh \ mln/linear/lap.hh \ mln/linear/local/convolve.hh \ mln/linear/log.hh \ @@ -776,23 +777,23 @@ mln/make/dummy_p_vertices.hh \ mln/make/edge_image.hh \ mln/make/essential.hh \ mln/make/h_mat.hh \ +mln/make/image.hh \ mln/make/image2d.hh \ mln/make/image3d.hh \ -mln/make/image.hh \ mln/make/influence_zone_adjacency_graph.hh \ mln/make/mat.hh \ mln/make/p_edges_with_mass_centers.hh \ -mln/make/pixel.hh \ +mln/make/p_vertices_with_mass_centers.hh \ mln/make/pix.hh \ +mln/make/pixel.hh \ mln/make/point2d_h.hh \ -mln/make/p_vertices_with_mass_centers.hh \ mln/make/rag_and_labeled_wsl.hh \ mln/make/region_adjacency_graph.hh \ mln/make/relabelfun.hh \ mln/make/vec.hh \ mln/make/vertex_image.hh \ mln/make/voronoi.hh \ -mln/make/win_chamfer.hh \ +mln/make/w_window.hh \ mln/make/w_window1d.hh \ mln/make/w_window1d_int.hh \ mln/make/w_window2d.hh \ @@ -800,7 +801,7 @@ mln/make/w_window2d_int.hh \ mln/make/w_window3d.hh \ mln/make/w_window3d_int.hh \ mln/make/w_window_directional.hh \ -mln/make/w_window.hh \ +mln/make/win_chamfer.hh \ mln/math/abs.hh \ mln/math/acos.hh \ mln/math/all.hh \ @@ -820,10 +821,10 @@ mln/math/sqrt.hh \ mln/metal/abort.hh \ mln/metal/all.hh \ mln/metal/ands.hh \ +mln/metal/array.hh \ mln/metal/array1d.hh \ mln/metal/array2d.hh \ mln/metal/array3d.hh \ -mln/metal/array.hh \ mln/metal/bexpr.hh \ mln/metal/bool.hh \ mln/metal/const.hh \ @@ -834,17 +835,17 @@ mln/metal/fix_return.hh \ mln/metal/goes_to.hh \ mln/metal/if.hh \ mln/metal/int.hh \ +mln/metal/is.hh \ mln/metal/is_a.hh \ mln/metal/is_const.hh \ -mln/metal/is.hh \ +mln/metal/is_not.hh \ mln/metal/is_not_a.hh \ mln/metal/is_not_const.hh \ -mln/metal/is_not.hh \ mln/metal/is_not_ref.hh \ mln/metal/is_ref.hh \ mln/metal/is_unqualif.hh \ -mln/metal/math/all.hh \ mln/metal/mat.hh \ +mln/metal/math/all.hh \ mln/metal/math/max.hh \ mln/metal/math/pow.hh \ mln/metal/math/root.hh \ @@ -861,6 +862,7 @@ mln/metal/unptr.hh \ mln/metal/unqualif.hh \ mln/metal/unref.hh \ mln/metal/vec.hh \ +mln/morpho/Rd.hh \ mln/morpho/algebraic_filter.hh \ mln/morpho/all.hh \ mln/morpho/approx/all.hh \ @@ -892,8 +894,8 @@ mln/morpho/elementary/closing.hh \ mln/morpho/elementary/dilation.hh \ mln/morpho/elementary/erosion.hh \ mln/morpho/elementary/essential.hh \ -mln/morpho/elementary/gradient_external.hh \ mln/morpho/elementary/gradient.hh \ +mln/morpho/elementary/gradient_external.hh \ mln/morpho/elementary/gradient_internal.hh \ mln/morpho/elementary/laplacian.hh \ mln/morpho/elementary/like_ero_fun.hh \ @@ -927,10 +929,12 @@ mln/morpho/opening/structural.hh \ mln/morpho/opening/volume.hh \ mln/morpho/plus.hh \ mln/morpho/rank_filter.hh \ -mln/morpho/Rd.hh \ +mln/morpho/reconstruction/all.hh \ +mln/morpho/reconstruction/by_dilation/all.hh \ +mln/morpho/reconstruction/by_dilation/union_find.hh \ mln/morpho/skeleton_constrained.hh \ -mln/morpho/thickening.hh \ mln/morpho/thick_miss.hh \ +mln/morpho/thickening.hh \ mln/morpho/thin_fit.hh \ mln/morpho/thinning.hh \ mln/morpho/top_hat.hh \ @@ -1001,14 +1005,14 @@ mln/topo/algebraic_face.hh \ mln/topo/algebraic_n_face.hh \ mln/topo/all.hh \ mln/topo/attic/faces_iter.hh \ -mln/topo/centered_iter_adapter.hh \ mln/topo/center_only_iter.hh \ +mln/topo/centered_iter_adapter.hh \ mln/topo/complex.hh \ mln/topo/complex_iterators.hh \ mln/topo/detach.hh \ mln/topo/essential.hh \ -mln/topo/face_data.hh \ mln/topo/face.hh \ +mln/topo/face_data.hh \ mln/topo/face_iter.hh \ mln/topo/internal/complex_iterator_base.hh \ mln/topo/internal/complex_relative_iterator_base.hh \ @@ -1040,13 +1044,13 @@ mln/trait/ch_value.hh \ mln/trait/concrete.hh \ mln/trait/essential.hh \ mln/trait/functions.hh \ -mln/trait/image_from_grid.hh \ mln/trait/image/print.hh \ mln/trait/image/props.hh \ +mln/trait/image_from_grid.hh \ mln/trait/images.hh \ mln/trait/neighborhood.hh \ -mln/trait/next/solve_binary.hh \ mln/trait/next/solve.hh \ +mln/trait/next/solve_binary.hh \ mln/trait/next/solve_proxy.hh \ mln/trait/next/solve_unary.hh \ mln/trait/op/all.hh \ @@ -1064,8 +1068,8 @@ mln/trait/op/minus.hh \ mln/trait/op/mod.hh \ mln/trait/op/neq.hh \ mln/trait/op/not.hh \ -mln/trait/op/ord.hh \ mln/trait/op/or.hh \ +mln/trait/op/ord.hh \ mln/trait/op/plus.hh \ mln/trait/op/postdec.hh \ mln/trait/op/postinc.hh \ @@ -1079,20 +1083,20 @@ mln/trait/promote.hh \ mln/trait/site_set/print.hh \ mln/trait/site_set/props.hh \ mln/trait/site_sets.hh \ -mln/trait/solve_binary.hh \ mln/trait/solve.hh \ +mln/trait/solve_binary.hh \ mln/trait/solve_unary.hh \ mln/trait/undef.hh \ mln/trait/value/all.hh \ mln/trait/value/comp.hh \ mln/trait/value/essential.hh \ -mln/trait/value_.hh \ mln/trait/value/internal/all.hh \ mln/trait/value/internal/comp.hh \ mln/trait/value/kind.hh \ mln/trait/value/nature.hh \ mln/trait/value/print.hh \ mln/trait/value/quant.hh \ +mln/trait/value_.hh \ mln/trait/window/print.hh \ mln/trait/window/props.hh \ mln/trait/windows.hh \ @@ -1125,16 +1129,16 @@ mln/util/greater_point.hh \ mln/util/greater_psite.hh \ mln/util/ignore.hh \ mln/util/index.hh \ -mln/util/internal/boost_graph_access.hh \ mln/util/internal/boost_graph.hh \ +mln/util/internal/boost_graph_access.hh \ mln/util/internal/boost_graph_property.hh \ mln/util/internal/boost_graph_structure.hh \ mln/util/internal/edge_impl.hh \ mln/util/internal/graph_base.hh \ -mln/util/internal/graph_iter_base.hh \ mln/util/internal/graph_iter.hh \ -mln/util/internal/graph_nbh_iter_base.hh \ +mln/util/internal/graph_iter_base.hh \ mln/util/internal/graph_nbh_iter.hh \ +mln/util/internal/graph_nbh_iter_base.hh \ mln/util/internal/id2element.hh \ mln/util/internal/vertex_impl.hh \ mln/util/lazy_set.hh \ @@ -1152,9 +1156,9 @@ mln/util/site_pair.hh \ mln/util/soft_heap.hh \ mln/util/timer.hh \ mln/util/tracked_ptr.hh \ +mln/util/tree.hh \ mln/util/tree_fast.hh \ mln/util/tree_fast_to_image.hh \ -mln/util/tree.hh \ mln/util/tree_to_fast.hh \ mln/util/tree_to_image.hh \ mln/util/vertex.hh \ @@ -1182,50 +1186,50 @@ mln/value/concept/symbolic.hh \ mln/value/concept/vectorial.hh \ mln/value/equiv.hh \ mln/value/essential.hh \ +mln/value/float01.hh \ +mln/value/float01_.hh \ mln/value/float01_16.hh \ mln/value/float01_8.hh \ mln/value/float01_f.hh \ -mln/value/float01_.hh \ -mln/value/float01.hh \ mln/value/gl16.hh \ mln/value/gl8.hh \ mln/value/glf.hh \ -mln/value/graylevel_f.hh \ mln/value/graylevel.hh \ +mln/value/graylevel_f.hh \ mln/value/hsi.hh \ mln/value/hsl.hh \ +mln/value/int_s.hh \ +mln/value/int_s16.hh \ +mln/value/int_s32.hh \ +mln/value/int_s8.hh \ +mln/value/int_u.hh \ +mln/value/int_u12.hh \ +mln/value/int_u16.hh \ +mln/value/int_u32.hh \ +mln/value/int_u8.hh \ +mln/value/int_u_sat.hh \ mln/value/internal/all.hh \ mln/value/internal/convert.hh \ mln/value/internal/encoding.hh \ mln/value/internal/essential.hh \ -mln/value/internal/gray_f.hh \ mln/value/internal/gray_.hh \ +mln/value/internal/gray_f.hh \ mln/value/internal/integer.hh \ mln/value/internal/iterable_set.hh \ mln/value/internal/limits.hh \ mln/value/internal/value_like.hh \ mln/value/interval.hh \ -mln/value/int_s16.hh \ -mln/value/int_s32.hh \ -mln/value/int_s8.hh \ -mln/value/int_s.hh \ -mln/value/int_u12.hh \ -mln/value/int_u16.hh \ -mln/value/int_u32.hh \ -mln/value/int_u8.hh \ -mln/value/int_u.hh \ -mln/value/int_u_sat.hh \ +mln/value/label.hh \ mln/value/label_16.hh \ mln/value/label_8.hh \ -mln/value/label.hh \ mln/value/lut_vec.hh \ mln/value/mixin.hh \ mln/value/ops.hh \ mln/value/other.hh \ mln/value/proxy.hh \ +mln/value/rgb.hh \ mln/value/rgb16.hh \ mln/value/rgb8.hh \ -mln/value/rgb.hh \ mln/value/scalar.hh \ mln/value/set.hh \ mln/value/shell.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 5d4c851..3cca3ea 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -6,8 +6,8 @@ mln_accu_bbox \ mln_accu_center \ mln_accu_compute \ mln_accu_convolve \ -mln_accu_count_adjacent_vertices \ mln_accu_count \ +mln_accu_count_adjacent_vertices \ mln_accu_count_labels \ mln_accu_essential \ mln_accu_height \ @@ -16,8 +16,8 @@ mln_accu_image_all \ mln_accu_image_essential \ mln_accu_image_init \ mln_accu_image_set_value \ -mln_accu_image_take_as_init \ mln_accu_image_take \ +mln_accu_image_take_as_init \ mln_accu_image_take_n_times \ mln_accu_image_to_result \ mln_accu_image_untake \ @@ -25,11 +25,11 @@ mln_accu_inf \ mln_accu_internal_base \ mln_accu_internal_couple \ mln_accu_label_used \ -mln_accu_land_basic \ mln_accu_land \ +mln_accu_land_basic \ mln_accu_line \ -mln_accu_lor_basic \ mln_accu_lor \ +mln_accu_lor_basic \ mln_accu_maj_h \ mln_accu_max \ mln_accu_max_h \ @@ -40,10 +40,10 @@ mln_accu_min \ mln_accu_min_h \ mln_accu_min_max \ mln_accu_nil \ -mln_accu_pair \ mln_accu_p \ -mln_accu_rank_bool \ +mln_accu_pair \ mln_accu_rank \ +mln_accu_rank_bool \ mln_accu_rank_high_quant \ mln_accu_rms \ mln_accu_site_set_all \ @@ -56,9 +56,9 @@ mln_accu_stat_variance \ mln_accu_sum \ mln_accu_sup \ mln_accu_take \ +mln_accu_transform \ mln_accu_transform_diagonal \ mln_accu_transform_directional \ -mln_accu_transform \ mln_accu_transform_line \ mln_accu_transform_snake \ mln_accu_transform_stop \ @@ -97,19 +97,21 @@ mln_border_fill \ mln_border_find \ mln_border_get \ mln_border_mirror \ -mln_border_resize_equal \ mln_border_resize \ +mln_border_resize_equal \ mln_border_thickness \ mln_canvas_all \ mln_canvas_browsing_all \ mln_canvas_browsing_backdiagonal2d \ +mln_canvas_browsing_breadth_first_search \ mln_canvas_browsing_depth_first_search \ mln_canvas_browsing_diagonal2d \ -mln_canvas_browsing_directional \ mln_canvas_browsing_dir_struct_elt_incr_update \ +mln_canvas_browsing_directional \ mln_canvas_browsing_essential \ mln_canvas_browsing_fwd \ mln_canvas_browsing_hyper_directional \ +mln_canvas_browsing_internal_graph_first_search \ mln_canvas_browsing_snake_fwd \ mln_canvas_browsing_snake_generic \ mln_canvas_browsing_snake_vert \ @@ -133,14 +135,15 @@ mln_convert_impl_from_int_to_value \ mln_convert_impl_from_site_set_to_image \ mln_convert_impl_from_unsigned_to_value \ mln_convert_impl_from_value_to_value \ +mln_convert_to \ mln_convert_to_dpoint \ mln_convert_to_fun \ -mln_convert_to \ mln_convert_to_image \ mln_convert_to_p_array \ mln_convert_to_p_set \ mln_convert_to_upper_window \ mln_convert_to_window \ +mln_core_a_point_of \ mln_core_alias_all \ mln_core_alias_box1d \ mln_core_alias_box2d \ @@ -155,29 +158,28 @@ mln_core_alias_dpoint3d \ mln_core_alias_neighb1d \ mln_core_alias_neighb2d \ mln_core_alias_neighb3d \ +mln_core_alias_p_run2d \ +mln_core_alias_p_runs2d \ mln_core_alias_point1d \ mln_core_alias_point2d \ mln_core_alias_point2d_h \ mln_core_alias_point3d \ -mln_core_alias_p_run2d \ -mln_core_alias_p_runs2d \ mln_core_alias_vec2d \ mln_core_alias_vec3d \ -mln_core_alias_window1d \ -mln_core_alias_window2d \ -mln_core_alias_window3d \ mln_core_alias_w_window1d_float \ mln_core_alias_w_window1d_int \ mln_core_alias_w_window2d_float \ mln_core_alias_w_window2d_int \ mln_core_alias_w_window3d_float \ mln_core_alias_w_window3d_int \ +mln_core_alias_window1d \ +mln_core_alias_window2d \ +mln_core_alias_window3d \ mln_core_all \ -mln_core_a_point_of \ mln_core_box_runstart_piter \ mln_core_category \ -mln_core_clock_neighb2d \ mln_core_clock_neighb \ +mln_core_clock_neighb2d \ mln_core_concept_accumulator \ mln_core_concept_all \ mln_core_concept_box \ @@ -194,8 +196,8 @@ mln_core_concept_iterator \ mln_core_concept_literal \ mln_core_concept_mesh \ mln_core_concept_meta_accumulator \ -mln_core_concept_meta_function \ mln_core_concept_meta_fun \ +mln_core_concept_meta_function \ mln_core_concept_neighborhood \ mln_core_concept_object \ mln_core_concept_pixel_iterator \ @@ -215,8 +217,8 @@ mln_core_concept_weighted_window \ mln_core_concept_window \ mln_core_contract \ mln_core_def_all \ -mln_core_def_coordf \ mln_core_def_coord \ +mln_core_def_coordf \ mln_core_def_essential \ mln_core_def_low_quant_nbits \ mln_core_dpoint \ @@ -275,9 +277,9 @@ mln_core_image_sparse_encode \ mln_core_image_sparse_image \ mln_core_image_sub_image \ mln_core_image_sub_image_if \ -mln_core_image_thrubin_morpher \ -mln_core_image_thru_morpher \ mln_core_image_t_image \ +mln_core_image_thru_morpher \ +mln_core_image_thrubin_morpher \ mln_core_image_tr_image \ mln_core_image_tr_mesh \ mln_core_image_unproject_image \ @@ -367,8 +369,8 @@ mln_core_site_set_p_line2d \ mln_core_site_set_p_mutable_array_of \ mln_core_site_set_p_n_faces_piter \ mln_core_site_set_p_priority \ -mln_core_site_set_p_queue_fast \ mln_core_site_set_p_queue \ +mln_core_site_set_p_queue_fast \ mln_core_site_set_p_run \ mln_core_site_set_p_run_piter \ mln_core_site_set_p_set \ @@ -383,8 +385,8 @@ mln_core_trait_op_mult \ mln_core_trait_pixter \ mln_core_trait_qlf_value \ mln_core_var \ -mln_core_window \ mln_core_w_window \ +mln_core_window \ mln_data_all \ mln_data_essential \ mln_data_fill \ @@ -422,9 +424,9 @@ mln_estim_essential \ mln_estim_mean \ mln_estim_min_max \ mln_estim_sum \ +mln_extension_adjust \ mln_extension_adjust_duplicate \ mln_extension_adjust_fill \ -mln_extension_adjust \ mln_extension_all \ mln_extension_duplicate \ mln_extension_essential \ @@ -443,11 +445,11 @@ mln_fun_accu_result \ mln_fun_all \ mln_fun_binary \ mln_fun_binary_param \ -mln_fun_cast \ mln_fun_c \ +mln_fun_cast \ mln_fun_component_blue \ -mln_fun_component_comp_count \ mln_fun_component_comp \ +mln_fun_component_comp_count \ mln_fun_component_green \ mln_fun_component_ithcomp \ mln_fun_component_red \ @@ -634,18 +636,17 @@ mln_io_pgm_load \ mln_io_pgm_save \ mln_io_plot_save \ mln_io_pnm_all \ -mln_io_pnm_load_header \ mln_io_pnm_load \ +mln_io_pnm_load_header \ mln_io_pnm_macros \ mln_io_pnm_max_component \ -mln_io_pnm_save_header \ mln_io_pnm_save \ +mln_io_pnm_save_header \ mln_io_ppm_all \ mln_io_ppm_load \ mln_io_ppm_save \ mln_io_tiff_all \ mln_io_tiff_load \ -mln_io_tiff_save \ mln_io_txt_all \ mln_io_txt_save \ mln_labeling_all \ @@ -692,16 +693,16 @@ mln_level_update \ mln_level_was_median \ mln_linear_all \ mln_linear_ch_convolve \ +mln_linear_convolve \ mln_linear_convolve_2x1d \ mln_linear_convolve_directional \ -mln_linear_convolve \ mln_linear_essential \ -mln_linear_gaussian_1d \ -mln_linear_gaussian_directional_2d \ -mln_linear_gaussian_filter \ mln_linear_gaussian \ +mln_linear_gaussian_filter \ mln_linear_gaussian_impl \ mln_linear_gaussian_internal_coefficients \ +mln_linear_gaussian_1d \ +mln_linear_gaussian_directional_2d \ mln_linear_lap \ mln_linear_local_convolve \ mln_linear_log \ @@ -743,23 +744,23 @@ mln_make_dummy_p_vertices \ mln_make_edge_image \ mln_make_essential \ mln_make_h_mat \ +mln_make_image \ mln_make_image2d \ mln_make_image3d \ -mln_make_image \ mln_make_influence_zone_adjacency_graph \ mln_make_mat \ mln_make_p_edges_with_mass_centers \ -mln_make_pixel \ +mln_make_p_vertices_with_mass_centers \ mln_make_pix \ +mln_make_pixel \ mln_make_point2d_h \ -mln_make_p_vertices_with_mass_centers \ mln_make_rag_and_labeled_wsl \ mln_make_region_adjacency_graph \ mln_make_relabelfun \ mln_make_vec \ mln_make_vertex_image \ mln_make_voronoi \ -mln_make_win_chamfer \ +mln_make_w_window \ mln_make_w_window1d \ mln_make_w_window1d_int \ mln_make_w_window2d \ @@ -767,7 +768,7 @@ mln_make_w_window2d_int \ mln_make_w_window3d \ mln_make_w_window3d_int \ mln_make_w_window_directional \ -mln_make_w_window \ +mln_make_win_chamfer \ mln_math_abs \ mln_math_acos \ mln_math_all \ @@ -787,10 +788,10 @@ mln_math_sqrt \ mln_metal_abort \ mln_metal_all \ mln_metal_ands \ +mln_metal_array \ mln_metal_array1d \ mln_metal_array2d \ mln_metal_array3d \ -mln_metal_array \ mln_metal_bexpr \ mln_metal_bool \ mln_metal_const \ @@ -801,17 +802,17 @@ mln_metal_fix_return \ mln_metal_goes_to \ mln_metal_if \ mln_metal_int \ +mln_metal_is \ mln_metal_is_a \ mln_metal_is_const \ -mln_metal_is \ +mln_metal_is_not \ mln_metal_is_not_a \ mln_metal_is_not_const \ -mln_metal_is_not \ mln_metal_is_not_ref \ mln_metal_is_ref \ mln_metal_is_unqualif \ -mln_metal_math_all \ mln_metal_mat \ +mln_metal_math_all \ mln_metal_math_max \ mln_metal_math_pow \ mln_metal_math_root \ @@ -828,6 +829,7 @@ mln_metal_unptr \ mln_metal_unqualif \ mln_metal_unref \ mln_metal_vec \ +mln_morpho_Rd \ mln_morpho_algebraic_filter \ mln_morpho_all \ mln_morpho_approx_all \ @@ -859,8 +861,8 @@ mln_morpho_elementary_closing \ mln_morpho_elementary_dilation \ mln_morpho_elementary_erosion \ mln_morpho_elementary_essential \ -mln_morpho_elementary_gradient_external \ mln_morpho_elementary_gradient \ +mln_morpho_elementary_gradient_external \ mln_morpho_elementary_gradient_internal \ mln_morpho_elementary_laplacian \ mln_morpho_elementary_like_ero_fun \ @@ -893,10 +895,12 @@ mln_morpho_opening_structural \ mln_morpho_opening_volume \ mln_morpho_plus \ mln_morpho_rank_filter \ -mln_morpho_Rd \ +mln_morpho_reconstruction_all \ +mln_morpho_reconstruction_by_dilation_all \ +mln_morpho_reconstruction_by_dilation_union_find \ mln_morpho_skeleton_constrained \ -mln_morpho_thickening \ mln_morpho_thick_miss \ +mln_morpho_thickening \ mln_morpho_thin_fit \ mln_morpho_thinning \ mln_morpho_top_hat \ @@ -967,14 +971,14 @@ mln_topo_algebraic_face \ mln_topo_algebraic_n_face \ mln_topo_all \ mln_topo_attic_faces_iter \ -mln_topo_centered_iter_adapter \ mln_topo_center_only_iter \ +mln_topo_centered_iter_adapter \ mln_topo_complex \ mln_topo_complex_iterators \ mln_topo_detach \ mln_topo_essential \ -mln_topo_face_data \ mln_topo_face \ +mln_topo_face_data \ mln_topo_face_iter \ mln_topo_internal_complex_iterator_base \ mln_topo_internal_complex_relative_iterator_base \ @@ -1006,13 +1010,13 @@ mln_trait_ch_value \ mln_trait_concrete \ mln_trait_essential \ mln_trait_functions \ -mln_trait_image_from_grid \ mln_trait_image_print \ mln_trait_image_props \ +mln_trait_image_from_grid \ mln_trait_images \ mln_trait_neighborhood \ -mln_trait_next_solve_binary \ mln_trait_next_solve \ +mln_trait_next_solve_binary \ mln_trait_next_solve_proxy \ mln_trait_next_solve_unary \ mln_trait_op_all \ @@ -1030,8 +1034,8 @@ mln_trait_op_minus \ mln_trait_op_mod \ mln_trait_op_neq \ mln_trait_op_not \ -mln_trait_op_ord \ mln_trait_op_or \ +mln_trait_op_ord \ mln_trait_op_plus \ mln_trait_op_postdec \ mln_trait_op_postinc \ @@ -1045,20 +1049,20 @@ mln_trait_promote \ mln_trait_site_set_print \ mln_trait_site_set_props \ mln_trait_site_sets \ -mln_trait_solve_binary \ mln_trait_solve \ +mln_trait_solve_binary \ mln_trait_solve_unary \ mln_trait_undef \ mln_trait_value_all \ mln_trait_value_comp \ mln_trait_value_essential \ -mln_trait_value_ \ mln_trait_value_internal_all \ mln_trait_value_internal_comp \ mln_trait_value_kind \ mln_trait_value_nature \ mln_trait_value_print \ mln_trait_value_quant \ +mln_trait_value_ \ mln_trait_window_print \ mln_trait_window_props \ mln_trait_windows \ @@ -1091,16 +1095,16 @@ mln_util_greater_point \ mln_util_greater_psite \ mln_util_ignore \ mln_util_index \ -mln_util_internal_boost_graph_access \ mln_util_internal_boost_graph \ +mln_util_internal_boost_graph_access \ mln_util_internal_boost_graph_property \ mln_util_internal_boost_graph_structure \ mln_util_internal_edge_impl \ mln_util_internal_graph_base \ -mln_util_internal_graph_iter_base \ mln_util_internal_graph_iter \ -mln_util_internal_graph_nbh_iter_base \ +mln_util_internal_graph_iter_base \ mln_util_internal_graph_nbh_iter \ +mln_util_internal_graph_nbh_iter_base \ mln_util_internal_id2element \ mln_util_internal_vertex_impl \ mln_util_lazy_set \ @@ -1118,9 +1122,9 @@ mln_util_site_pair \ mln_util_soft_heap \ mln_util_timer \ mln_util_tracked_ptr \ +mln_util_tree \ mln_util_tree_fast \ mln_util_tree_fast_to_image \ -mln_util_tree \ mln_util_tree_to_fast \ mln_util_tree_to_image \ mln_util_vertex \ @@ -1148,50 +1152,50 @@ mln_value_concept_symbolic \ mln_value_concept_vectorial \ mln_value_equiv \ mln_value_essential \ +mln_value_float01 \ +mln_value_float01_ \ mln_value_float01_16 \ mln_value_float01_8 \ mln_value_float01_f \ -mln_value_float01_ \ -mln_value_float01 \ mln_value_gl16 \ mln_value_gl8 \ mln_value_glf \ -mln_value_graylevel_f \ mln_value_graylevel \ +mln_value_graylevel_f \ mln_value_hsi \ mln_value_hsl \ +mln_value_int_s \ +mln_value_int_s16 \ +mln_value_int_s32 \ +mln_value_int_s8 \ +mln_value_int_u \ +mln_value_int_u12 \ +mln_value_int_u16 \ +mln_value_int_u32 \ +mln_value_int_u8 \ +mln_value_int_u_sat \ mln_value_internal_all \ mln_value_internal_convert \ mln_value_internal_encoding \ mln_value_internal_essential \ -mln_value_internal_gray_f \ mln_value_internal_gray_ \ +mln_value_internal_gray_f \ mln_value_internal_integer \ mln_value_internal_iterable_set \ mln_value_internal_limits \ mln_value_internal_value_like \ mln_value_interval \ -mln_value_int_s16 \ -mln_value_int_s32 \ -mln_value_int_s8 \ -mln_value_int_s \ -mln_value_int_u12 \ -mln_value_int_u16 \ -mln_value_int_u32 \ -mln_value_int_u8 \ -mln_value_int_u \ -mln_value_int_u_sat \ +mln_value_label \ mln_value_label_16 \ mln_value_label_8 \ -mln_value_label \ mln_value_lut_vec \ mln_value_mixin \ mln_value_ops \ mln_value_other \ mln_value_proxy \ +mln_value_rgb \ mln_value_rgb16 \ mln_value_rgb8 \ -mln_value_rgb \ mln_value_scalar \ mln_value_set \ mln_value_shell \ @@ -1245,8 +1249,8 @@ mln_accu_bbox_SOURCES = mln_accu_bbox.cc mln_accu_center_SOURCES = mln_accu_center.cc mln_accu_compute_SOURCES = mln_accu_compute.cc mln_accu_convolve_SOURCES = mln_accu_convolve.cc -mln_accu_count_adjacent_vertices_SOURCES = mln_accu_count_adjacent_vertices.cc mln_accu_count_SOURCES = mln_accu_count.cc +mln_accu_count_adjacent_vertices_SOURCES = mln_accu_count_adjacent_vertices.cc mln_accu_count_labels_SOURCES = mln_accu_count_labels.cc mln_accu_essential_SOURCES = mln_accu_essential.cc mln_accu_height_SOURCES = mln_accu_height.cc @@ -1255,8 +1259,8 @@ mln_accu_image_all_SOURCES = mln_accu_image_all.cc mln_accu_image_essential_SOURCES = mln_accu_image_essential.cc mln_accu_image_init_SOURCES = mln_accu_image_init.cc mln_accu_image_set_value_SOURCES = mln_accu_image_set_value.cc -mln_accu_image_take_as_init_SOURCES = mln_accu_image_take_as_init.cc mln_accu_image_take_SOURCES = mln_accu_image_take.cc +mln_accu_image_take_as_init_SOURCES = mln_accu_image_take_as_init.cc mln_accu_image_take_n_times_SOURCES = mln_accu_image_take_n_times.cc mln_accu_image_to_result_SOURCES = mln_accu_image_to_result.cc mln_accu_image_untake_SOURCES = mln_accu_image_untake.cc @@ -1264,11 +1268,11 @@ mln_accu_inf_SOURCES = mln_accu_inf.cc mln_accu_internal_base_SOURCES = mln_accu_internal_base.cc mln_accu_internal_couple_SOURCES = mln_accu_internal_couple.cc mln_accu_label_used_SOURCES = mln_accu_label_used.cc -mln_accu_land_basic_SOURCES = mln_accu_land_basic.cc mln_accu_land_SOURCES = mln_accu_land.cc +mln_accu_land_basic_SOURCES = mln_accu_land_basic.cc mln_accu_line_SOURCES = mln_accu_line.cc -mln_accu_lor_basic_SOURCES = mln_accu_lor_basic.cc mln_accu_lor_SOURCES = mln_accu_lor.cc +mln_accu_lor_basic_SOURCES = mln_accu_lor_basic.cc mln_accu_maj_h_SOURCES = mln_accu_maj_h.cc mln_accu_max_SOURCES = mln_accu_max.cc mln_accu_max_h_SOURCES = mln_accu_max_h.cc @@ -1279,10 +1283,10 @@ mln_accu_min_SOURCES = mln_accu_min.cc mln_accu_min_h_SOURCES = mln_accu_min_h.cc mln_accu_min_max_SOURCES = mln_accu_min_max.cc mln_accu_nil_SOURCES = mln_accu_nil.cc -mln_accu_pair_SOURCES = mln_accu_pair.cc mln_accu_p_SOURCES = mln_accu_p.cc -mln_accu_rank_bool_SOURCES = mln_accu_rank_bool.cc +mln_accu_pair_SOURCES = mln_accu_pair.cc mln_accu_rank_SOURCES = mln_accu_rank.cc +mln_accu_rank_bool_SOURCES = mln_accu_rank_bool.cc mln_accu_rank_high_quant_SOURCES = mln_accu_rank_high_quant.cc mln_accu_rms_SOURCES = mln_accu_rms.cc mln_accu_site_set_all_SOURCES = mln_accu_site_set_all.cc @@ -1295,9 +1299,9 @@ mln_accu_stat_variance_SOURCES = mln_accu_stat_variance.cc mln_accu_sum_SOURCES = mln_accu_sum.cc mln_accu_sup_SOURCES = mln_accu_sup.cc mln_accu_take_SOURCES = mln_accu_take.cc +mln_accu_transform_SOURCES = mln_accu_transform.cc mln_accu_transform_diagonal_SOURCES = mln_accu_transform_diagonal.cc mln_accu_transform_directional_SOURCES = mln_accu_transform_directional.cc -mln_accu_transform_SOURCES = mln_accu_transform.cc mln_accu_transform_line_SOURCES = mln_accu_transform_line.cc mln_accu_transform_snake_SOURCES = mln_accu_transform_snake.cc mln_accu_transform_stop_SOURCES = mln_accu_transform_stop.cc @@ -1336,19 +1340,21 @@ mln_border_fill_SOURCES = mln_border_fill.cc mln_border_find_SOURCES = mln_border_find.cc mln_border_get_SOURCES = mln_border_get.cc mln_border_mirror_SOURCES = mln_border_mirror.cc -mln_border_resize_equal_SOURCES = mln_border_resize_equal.cc mln_border_resize_SOURCES = mln_border_resize.cc +mln_border_resize_equal_SOURCES = mln_border_resize_equal.cc mln_border_thickness_SOURCES = mln_border_thickness.cc mln_canvas_all_SOURCES = mln_canvas_all.cc mln_canvas_browsing_all_SOURCES = mln_canvas_browsing_all.cc mln_canvas_browsing_backdiagonal2d_SOURCES = mln_canvas_browsing_backdiagonal2d.cc +mln_canvas_browsing_breadth_first_search_SOURCES = mln_canvas_browsing_breadth_first_search.cc mln_canvas_browsing_depth_first_search_SOURCES = mln_canvas_browsing_depth_first_search.cc mln_canvas_browsing_diagonal2d_SOURCES = mln_canvas_browsing_diagonal2d.cc -mln_canvas_browsing_directional_SOURCES = mln_canvas_browsing_directional.cc mln_canvas_browsing_dir_struct_elt_incr_update_SOURCES = mln_canvas_browsing_dir_struct_elt_incr_update.cc +mln_canvas_browsing_directional_SOURCES = mln_canvas_browsing_directional.cc mln_canvas_browsing_essential_SOURCES = mln_canvas_browsing_essential.cc mln_canvas_browsing_fwd_SOURCES = mln_canvas_browsing_fwd.cc mln_canvas_browsing_hyper_directional_SOURCES = mln_canvas_browsing_hyper_directional.cc +mln_canvas_browsing_internal_graph_first_search_SOURCES = mln_canvas_browsing_internal_graph_first_search.cc mln_canvas_browsing_snake_fwd_SOURCES = mln_canvas_browsing_snake_fwd.cc mln_canvas_browsing_snake_generic_SOURCES = mln_canvas_browsing_snake_generic.cc mln_canvas_browsing_snake_vert_SOURCES = mln_canvas_browsing_snake_vert.cc @@ -1372,14 +1378,15 @@ mln_convert_impl_from_int_to_value_SOURCES = mln_convert_impl_from_int_to_value. mln_convert_impl_from_site_set_to_image_SOURCES = mln_convert_impl_from_site_set_to_image.cc mln_convert_impl_from_unsigned_to_value_SOURCES = mln_convert_impl_from_unsigned_to_value.cc mln_convert_impl_from_value_to_value_SOURCES = mln_convert_impl_from_value_to_value.cc +mln_convert_to_SOURCES = mln_convert_to.cc mln_convert_to_dpoint_SOURCES = mln_convert_to_dpoint.cc mln_convert_to_fun_SOURCES = mln_convert_to_fun.cc -mln_convert_to_SOURCES = mln_convert_to.cc mln_convert_to_image_SOURCES = mln_convert_to_image.cc mln_convert_to_p_array_SOURCES = mln_convert_to_p_array.cc mln_convert_to_p_set_SOURCES = mln_convert_to_p_set.cc mln_convert_to_upper_window_SOURCES = mln_convert_to_upper_window.cc mln_convert_to_window_SOURCES = mln_convert_to_window.cc +mln_core_a_point_of_SOURCES = mln_core_a_point_of.cc mln_core_alias_all_SOURCES = mln_core_alias_all.cc mln_core_alias_box1d_SOURCES = mln_core_alias_box1d.cc mln_core_alias_box2d_SOURCES = mln_core_alias_box2d.cc @@ -1394,29 +1401,28 @@ mln_core_alias_dpoint3d_SOURCES = mln_core_alias_dpoint3d.cc mln_core_alias_neighb1d_SOURCES = mln_core_alias_neighb1d.cc mln_core_alias_neighb2d_SOURCES = mln_core_alias_neighb2d.cc mln_core_alias_neighb3d_SOURCES = mln_core_alias_neighb3d.cc +mln_core_alias_p_run2d_SOURCES = mln_core_alias_p_run2d.cc +mln_core_alias_p_runs2d_SOURCES = mln_core_alias_p_runs2d.cc mln_core_alias_point1d_SOURCES = mln_core_alias_point1d.cc mln_core_alias_point2d_SOURCES = mln_core_alias_point2d.cc mln_core_alias_point2d_h_SOURCES = mln_core_alias_point2d_h.cc mln_core_alias_point3d_SOURCES = mln_core_alias_point3d.cc -mln_core_alias_p_run2d_SOURCES = mln_core_alias_p_run2d.cc -mln_core_alias_p_runs2d_SOURCES = mln_core_alias_p_runs2d.cc mln_core_alias_vec2d_SOURCES = mln_core_alias_vec2d.cc mln_core_alias_vec3d_SOURCES = mln_core_alias_vec3d.cc -mln_core_alias_window1d_SOURCES = mln_core_alias_window1d.cc -mln_core_alias_window2d_SOURCES = mln_core_alias_window2d.cc -mln_core_alias_window3d_SOURCES = mln_core_alias_window3d.cc mln_core_alias_w_window1d_float_SOURCES = mln_core_alias_w_window1d_float.cc mln_core_alias_w_window1d_int_SOURCES = mln_core_alias_w_window1d_int.cc mln_core_alias_w_window2d_float_SOURCES = mln_core_alias_w_window2d_float.cc mln_core_alias_w_window2d_int_SOURCES = mln_core_alias_w_window2d_int.cc mln_core_alias_w_window3d_float_SOURCES = mln_core_alias_w_window3d_float.cc mln_core_alias_w_window3d_int_SOURCES = mln_core_alias_w_window3d_int.cc +mln_core_alias_window1d_SOURCES = mln_core_alias_window1d.cc +mln_core_alias_window2d_SOURCES = mln_core_alias_window2d.cc +mln_core_alias_window3d_SOURCES = mln_core_alias_window3d.cc mln_core_all_SOURCES = mln_core_all.cc -mln_core_a_point_of_SOURCES = mln_core_a_point_of.cc mln_core_box_runstart_piter_SOURCES = mln_core_box_runstart_piter.cc mln_core_category_SOURCES = mln_core_category.cc -mln_core_clock_neighb2d_SOURCES = mln_core_clock_neighb2d.cc mln_core_clock_neighb_SOURCES = mln_core_clock_neighb.cc +mln_core_clock_neighb2d_SOURCES = mln_core_clock_neighb2d.cc mln_core_concept_accumulator_SOURCES = mln_core_concept_accumulator.cc mln_core_concept_all_SOURCES = mln_core_concept_all.cc mln_core_concept_box_SOURCES = mln_core_concept_box.cc @@ -1433,8 +1439,8 @@ mln_core_concept_iterator_SOURCES = mln_core_concept_iterator.cc mln_core_concept_literal_SOURCES = mln_core_concept_literal.cc mln_core_concept_mesh_SOURCES = mln_core_concept_mesh.cc mln_core_concept_meta_accumulator_SOURCES = mln_core_concept_meta_accumulator.cc -mln_core_concept_meta_function_SOURCES = mln_core_concept_meta_function.cc mln_core_concept_meta_fun_SOURCES = mln_core_concept_meta_fun.cc +mln_core_concept_meta_function_SOURCES = mln_core_concept_meta_function.cc mln_core_concept_neighborhood_SOURCES = mln_core_concept_neighborhood.cc mln_core_concept_object_SOURCES = mln_core_concept_object.cc mln_core_concept_pixel_iterator_SOURCES = mln_core_concept_pixel_iterator.cc @@ -1454,8 +1460,8 @@ mln_core_concept_weighted_window_SOURCES = mln_core_concept_weighted_window.cc mln_core_concept_window_SOURCES = mln_core_concept_window.cc mln_core_contract_SOURCES = mln_core_contract.cc mln_core_def_all_SOURCES = mln_core_def_all.cc -mln_core_def_coordf_SOURCES = mln_core_def_coordf.cc mln_core_def_coord_SOURCES = mln_core_def_coord.cc +mln_core_def_coordf_SOURCES = mln_core_def_coordf.cc mln_core_def_essential_SOURCES = mln_core_def_essential.cc mln_core_def_low_quant_nbits_SOURCES = mln_core_def_low_quant_nbits.cc mln_core_dpoint_SOURCES = mln_core_dpoint.cc @@ -1514,9 +1520,9 @@ mln_core_image_sparse_encode_SOURCES = mln_core_image_sparse_encode.cc mln_core_image_sparse_image_SOURCES = mln_core_image_sparse_image.cc mln_core_image_sub_image_SOURCES = mln_core_image_sub_image.cc mln_core_image_sub_image_if_SOURCES = mln_core_image_sub_image_if.cc -mln_core_image_thrubin_morpher_SOURCES = mln_core_image_thrubin_morpher.cc -mln_core_image_thru_morpher_SOURCES = mln_core_image_thru_morpher.cc mln_core_image_t_image_SOURCES = mln_core_image_t_image.cc +mln_core_image_thru_morpher_SOURCES = mln_core_image_thru_morpher.cc +mln_core_image_thrubin_morpher_SOURCES = mln_core_image_thrubin_morpher.cc mln_core_image_tr_image_SOURCES = mln_core_image_tr_image.cc mln_core_image_tr_mesh_SOURCES = mln_core_image_tr_mesh.cc mln_core_image_unproject_image_SOURCES = mln_core_image_unproject_image.cc @@ -1606,8 +1612,8 @@ mln_core_site_set_p_line2d_SOURCES = mln_core_site_set_p_line2d.cc mln_core_site_set_p_mutable_array_of_SOURCES = mln_core_site_set_p_mutable_array_of.cc mln_core_site_set_p_n_faces_piter_SOURCES = mln_core_site_set_p_n_faces_piter.cc mln_core_site_set_p_priority_SOURCES = mln_core_site_set_p_priority.cc -mln_core_site_set_p_queue_fast_SOURCES = mln_core_site_set_p_queue_fast.cc mln_core_site_set_p_queue_SOURCES = mln_core_site_set_p_queue.cc +mln_core_site_set_p_queue_fast_SOURCES = mln_core_site_set_p_queue_fast.cc mln_core_site_set_p_run_SOURCES = mln_core_site_set_p_run.cc mln_core_site_set_p_run_piter_SOURCES = mln_core_site_set_p_run_piter.cc mln_core_site_set_p_set_SOURCES = mln_core_site_set_p_set.cc @@ -1622,8 +1628,8 @@ mln_core_trait_op_mult_SOURCES = mln_core_trait_op_mult.cc mln_core_trait_pixter_SOURCES = mln_core_trait_pixter.cc mln_core_trait_qlf_value_SOURCES = mln_core_trait_qlf_value.cc mln_core_var_SOURCES = mln_core_var.cc -mln_core_window_SOURCES = mln_core_window.cc mln_core_w_window_SOURCES = mln_core_w_window.cc +mln_core_window_SOURCES = mln_core_window.cc mln_data_all_SOURCES = mln_data_all.cc mln_data_essential_SOURCES = mln_data_essential.cc mln_data_fill_SOURCES = mln_data_fill.cc @@ -1661,9 +1667,9 @@ mln_estim_essential_SOURCES = mln_estim_essential.cc mln_estim_mean_SOURCES = mln_estim_mean.cc mln_estim_min_max_SOURCES = mln_estim_min_max.cc mln_estim_sum_SOURCES = mln_estim_sum.cc +mln_extension_adjust_SOURCES = mln_extension_adjust.cc mln_extension_adjust_duplicate_SOURCES = mln_extension_adjust_duplicate.cc mln_extension_adjust_fill_SOURCES = mln_extension_adjust_fill.cc -mln_extension_adjust_SOURCES = mln_extension_adjust.cc mln_extension_all_SOURCES = mln_extension_all.cc mln_extension_duplicate_SOURCES = mln_extension_duplicate.cc mln_extension_essential_SOURCES = mln_extension_essential.cc @@ -1682,11 +1688,11 @@ mln_fun_accu_result_SOURCES = mln_fun_accu_result.cc mln_fun_all_SOURCES = mln_fun_all.cc mln_fun_binary_SOURCES = mln_fun_binary.cc mln_fun_binary_param_SOURCES = mln_fun_binary_param.cc -mln_fun_cast_SOURCES = mln_fun_cast.cc mln_fun_c_SOURCES = mln_fun_c.cc +mln_fun_cast_SOURCES = mln_fun_cast.cc mln_fun_component_blue_SOURCES = mln_fun_component_blue.cc -mln_fun_component_comp_count_SOURCES = mln_fun_component_comp_count.cc mln_fun_component_comp_SOURCES = mln_fun_component_comp.cc +mln_fun_component_comp_count_SOURCES = mln_fun_component_comp_count.cc mln_fun_component_green_SOURCES = mln_fun_component_green.cc mln_fun_component_ithcomp_SOURCES = mln_fun_component_ithcomp.cc mln_fun_component_red_SOURCES = mln_fun_component_red.cc @@ -1873,18 +1879,17 @@ mln_io_pgm_load_SOURCES = mln_io_pgm_load.cc mln_io_pgm_save_SOURCES = mln_io_pgm_save.cc mln_io_plot_save_SOURCES = mln_io_plot_save.cc mln_io_pnm_all_SOURCES = mln_io_pnm_all.cc -mln_io_pnm_load_header_SOURCES = mln_io_pnm_load_header.cc mln_io_pnm_load_SOURCES = mln_io_pnm_load.cc +mln_io_pnm_load_header_SOURCES = mln_io_pnm_load_header.cc mln_io_pnm_macros_SOURCES = mln_io_pnm_macros.cc mln_io_pnm_max_component_SOURCES = mln_io_pnm_max_component.cc -mln_io_pnm_save_header_SOURCES = mln_io_pnm_save_header.cc mln_io_pnm_save_SOURCES = mln_io_pnm_save.cc +mln_io_pnm_save_header_SOURCES = mln_io_pnm_save_header.cc mln_io_ppm_all_SOURCES = mln_io_ppm_all.cc mln_io_ppm_load_SOURCES = mln_io_ppm_load.cc mln_io_ppm_save_SOURCES = mln_io_ppm_save.cc mln_io_tiff_all_SOURCES = mln_io_tiff_all.cc mln_io_tiff_load_SOURCES = mln_io_tiff_load.cc -mln_io_tiff_save_SOURCES = mln_io_tiff_save.cc mln_io_txt_all_SOURCES = mln_io_txt_all.cc mln_io_txt_save_SOURCES = mln_io_txt_save.cc mln_labeling_all_SOURCES = mln_labeling_all.cc @@ -1931,16 +1936,16 @@ mln_level_update_SOURCES = mln_level_update.cc mln_level_was_median_SOURCES = mln_level_was_median.cc mln_linear_all_SOURCES = mln_linear_all.cc mln_linear_ch_convolve_SOURCES = mln_linear_ch_convolve.cc +mln_linear_convolve_SOURCES = mln_linear_convolve.cc mln_linear_convolve_2x1d_SOURCES = mln_linear_convolve_2x1d.cc mln_linear_convolve_directional_SOURCES = mln_linear_convolve_directional.cc -mln_linear_convolve_SOURCES = mln_linear_convolve.cc mln_linear_essential_SOURCES = mln_linear_essential.cc -mln_linear_gaussian_1d_SOURCES = mln_linear_gaussian_1d.cc -mln_linear_gaussian_directional_2d_SOURCES = mln_linear_gaussian_directional_2d.cc -mln_linear_gaussian_filter_SOURCES = mln_linear_gaussian_filter.cc mln_linear_gaussian_SOURCES = mln_linear_gaussian.cc +mln_linear_gaussian_filter_SOURCES = mln_linear_gaussian_filter.cc mln_linear_gaussian_impl_SOURCES = mln_linear_gaussian_impl.cc mln_linear_gaussian_internal_coefficients_SOURCES = mln_linear_gaussian_internal_coefficients.cc +mln_linear_gaussian_1d_SOURCES = mln_linear_gaussian_1d.cc +mln_linear_gaussian_directional_2d_SOURCES = mln_linear_gaussian_directional_2d.cc mln_linear_lap_SOURCES = mln_linear_lap.cc mln_linear_local_convolve_SOURCES = mln_linear_local_convolve.cc mln_linear_log_SOURCES = mln_linear_log.cc @@ -1982,23 +1987,23 @@ mln_make_dummy_p_vertices_SOURCES = mln_make_dummy_p_vertices.cc mln_make_edge_image_SOURCES = mln_make_edge_image.cc mln_make_essential_SOURCES = mln_make_essential.cc mln_make_h_mat_SOURCES = mln_make_h_mat.cc +mln_make_image_SOURCES = mln_make_image.cc mln_make_image2d_SOURCES = mln_make_image2d.cc mln_make_image3d_SOURCES = mln_make_image3d.cc -mln_make_image_SOURCES = mln_make_image.cc mln_make_influence_zone_adjacency_graph_SOURCES = mln_make_influence_zone_adjacency_graph.cc mln_make_mat_SOURCES = mln_make_mat.cc mln_make_p_edges_with_mass_centers_SOURCES = mln_make_p_edges_with_mass_centers.cc -mln_make_pixel_SOURCES = mln_make_pixel.cc +mln_make_p_vertices_with_mass_centers_SOURCES = mln_make_p_vertices_with_mass_centers.cc mln_make_pix_SOURCES = mln_make_pix.cc +mln_make_pixel_SOURCES = mln_make_pixel.cc mln_make_point2d_h_SOURCES = mln_make_point2d_h.cc -mln_make_p_vertices_with_mass_centers_SOURCES = mln_make_p_vertices_with_mass_centers.cc mln_make_rag_and_labeled_wsl_SOURCES = mln_make_rag_and_labeled_wsl.cc mln_make_region_adjacency_graph_SOURCES = mln_make_region_adjacency_graph.cc mln_make_relabelfun_SOURCES = mln_make_relabelfun.cc mln_make_vec_SOURCES = mln_make_vec.cc mln_make_vertex_image_SOURCES = mln_make_vertex_image.cc mln_make_voronoi_SOURCES = mln_make_voronoi.cc -mln_make_win_chamfer_SOURCES = mln_make_win_chamfer.cc +mln_make_w_window_SOURCES = mln_make_w_window.cc mln_make_w_window1d_SOURCES = mln_make_w_window1d.cc mln_make_w_window1d_int_SOURCES = mln_make_w_window1d_int.cc mln_make_w_window2d_SOURCES = mln_make_w_window2d.cc @@ -2006,7 +2011,7 @@ mln_make_w_window2d_int_SOURCES = mln_make_w_window2d_int.cc mln_make_w_window3d_SOURCES = mln_make_w_window3d.cc mln_make_w_window3d_int_SOURCES = mln_make_w_window3d_int.cc mln_make_w_window_directional_SOURCES = mln_make_w_window_directional.cc -mln_make_w_window_SOURCES = mln_make_w_window.cc +mln_make_win_chamfer_SOURCES = mln_make_win_chamfer.cc mln_math_abs_SOURCES = mln_math_abs.cc mln_math_acos_SOURCES = mln_math_acos.cc mln_math_all_SOURCES = mln_math_all.cc @@ -2026,10 +2031,10 @@ mln_math_sqrt_SOURCES = mln_math_sqrt.cc mln_metal_abort_SOURCES = mln_metal_abort.cc mln_metal_all_SOURCES = mln_metal_all.cc mln_metal_ands_SOURCES = mln_metal_ands.cc +mln_metal_array_SOURCES = mln_metal_array.cc mln_metal_array1d_SOURCES = mln_metal_array1d.cc mln_metal_array2d_SOURCES = mln_metal_array2d.cc mln_metal_array3d_SOURCES = mln_metal_array3d.cc -mln_metal_array_SOURCES = mln_metal_array.cc mln_metal_bexpr_SOURCES = mln_metal_bexpr.cc mln_metal_bool_SOURCES = mln_metal_bool.cc mln_metal_const_SOURCES = mln_metal_const.cc @@ -2040,17 +2045,17 @@ mln_metal_fix_return_SOURCES = mln_metal_fix_return.cc mln_metal_goes_to_SOURCES = mln_metal_goes_to.cc mln_metal_if_SOURCES = mln_metal_if.cc mln_metal_int_SOURCES = mln_metal_int.cc +mln_metal_is_SOURCES = mln_metal_is.cc mln_metal_is_a_SOURCES = mln_metal_is_a.cc mln_metal_is_const_SOURCES = mln_metal_is_const.cc -mln_metal_is_SOURCES = mln_metal_is.cc +mln_metal_is_not_SOURCES = mln_metal_is_not.cc mln_metal_is_not_a_SOURCES = mln_metal_is_not_a.cc mln_metal_is_not_const_SOURCES = mln_metal_is_not_const.cc -mln_metal_is_not_SOURCES = mln_metal_is_not.cc mln_metal_is_not_ref_SOURCES = mln_metal_is_not_ref.cc mln_metal_is_ref_SOURCES = mln_metal_is_ref.cc mln_metal_is_unqualif_SOURCES = mln_metal_is_unqualif.cc -mln_metal_math_all_SOURCES = mln_metal_math_all.cc mln_metal_mat_SOURCES = mln_metal_mat.cc +mln_metal_math_all_SOURCES = mln_metal_math_all.cc mln_metal_math_max_SOURCES = mln_metal_math_max.cc mln_metal_math_pow_SOURCES = mln_metal_math_pow.cc mln_metal_math_root_SOURCES = mln_metal_math_root.cc @@ -2067,6 +2072,7 @@ mln_metal_unptr_SOURCES = mln_metal_unptr.cc mln_metal_unqualif_SOURCES = mln_metal_unqualif.cc mln_metal_unref_SOURCES = mln_metal_unref.cc mln_metal_vec_SOURCES = mln_metal_vec.cc +mln_morpho_Rd_SOURCES = mln_morpho_Rd.cc mln_morpho_algebraic_filter_SOURCES = mln_morpho_algebraic_filter.cc mln_morpho_all_SOURCES = mln_morpho_all.cc mln_morpho_approx_all_SOURCES = mln_morpho_approx_all.cc @@ -2098,8 +2104,8 @@ mln_morpho_elementary_closing_SOURCES = mln_morpho_elementary_closing.cc mln_morpho_elementary_dilation_SOURCES = mln_morpho_elementary_dilation.cc mln_morpho_elementary_erosion_SOURCES = mln_morpho_elementary_erosion.cc mln_morpho_elementary_essential_SOURCES = mln_morpho_elementary_essential.cc -mln_morpho_elementary_gradient_external_SOURCES = mln_morpho_elementary_gradient_external.cc mln_morpho_elementary_gradient_SOURCES = mln_morpho_elementary_gradient.cc +mln_morpho_elementary_gradient_external_SOURCES = mln_morpho_elementary_gradient_external.cc mln_morpho_elementary_gradient_internal_SOURCES = mln_morpho_elementary_gradient_internal.cc mln_morpho_elementary_laplacian_SOURCES = mln_morpho_elementary_laplacian.cc mln_morpho_elementary_like_ero_fun_SOURCES = mln_morpho_elementary_like_ero_fun.cc @@ -2132,10 +2138,12 @@ mln_morpho_opening_structural_SOURCES = mln_morpho_opening_structural.cc mln_morpho_opening_volume_SOURCES = mln_morpho_opening_volume.cc mln_morpho_plus_SOURCES = mln_morpho_plus.cc mln_morpho_rank_filter_SOURCES = mln_morpho_rank_filter.cc -mln_morpho_Rd_SOURCES = mln_morpho_Rd.cc +mln_morpho_reconstruction_all_SOURCES = mln_morpho_reconstruction_all.cc +mln_morpho_reconstruction_by_dilation_all_SOURCES = mln_morpho_reconstruction_by_dilation_all.cc +mln_morpho_reconstruction_by_dilation_union_find_SOURCES = mln_morpho_reconstruction_by_dilation_union_find.cc mln_morpho_skeleton_constrained_SOURCES = mln_morpho_skeleton_constrained.cc -mln_morpho_thickening_SOURCES = mln_morpho_thickening.cc mln_morpho_thick_miss_SOURCES = mln_morpho_thick_miss.cc +mln_morpho_thickening_SOURCES = mln_morpho_thickening.cc mln_morpho_thin_fit_SOURCES = mln_morpho_thin_fit.cc mln_morpho_thinning_SOURCES = mln_morpho_thinning.cc mln_morpho_top_hat_SOURCES = mln_morpho_top_hat.cc @@ -2206,14 +2214,14 @@ mln_topo_algebraic_face_SOURCES = mln_topo_algebraic_face.cc mln_topo_algebraic_n_face_SOURCES = mln_topo_algebraic_n_face.cc mln_topo_all_SOURCES = mln_topo_all.cc mln_topo_attic_faces_iter_SOURCES = mln_topo_attic_faces_iter.cc -mln_topo_centered_iter_adapter_SOURCES = mln_topo_centered_iter_adapter.cc mln_topo_center_only_iter_SOURCES = mln_topo_center_only_iter.cc +mln_topo_centered_iter_adapter_SOURCES = mln_topo_centered_iter_adapter.cc mln_topo_complex_SOURCES = mln_topo_complex.cc mln_topo_complex_iterators_SOURCES = mln_topo_complex_iterators.cc mln_topo_detach_SOURCES = mln_topo_detach.cc mln_topo_essential_SOURCES = mln_topo_essential.cc -mln_topo_face_data_SOURCES = mln_topo_face_data.cc mln_topo_face_SOURCES = mln_topo_face.cc +mln_topo_face_data_SOURCES = mln_topo_face_data.cc mln_topo_face_iter_SOURCES = mln_topo_face_iter.cc mln_topo_internal_complex_iterator_base_SOURCES = mln_topo_internal_complex_iterator_base.cc mln_topo_internal_complex_relative_iterator_base_SOURCES = mln_topo_internal_complex_relative_iterator_base.cc @@ -2245,13 +2253,13 @@ mln_trait_ch_value_SOURCES = mln_trait_ch_value.cc mln_trait_concrete_SOURCES = mln_trait_concrete.cc mln_trait_essential_SOURCES = mln_trait_essential.cc mln_trait_functions_SOURCES = mln_trait_functions.cc -mln_trait_image_from_grid_SOURCES = mln_trait_image_from_grid.cc mln_trait_image_print_SOURCES = mln_trait_image_print.cc mln_trait_image_props_SOURCES = mln_trait_image_props.cc +mln_trait_image_from_grid_SOURCES = mln_trait_image_from_grid.cc mln_trait_images_SOURCES = mln_trait_images.cc mln_trait_neighborhood_SOURCES = mln_trait_neighborhood.cc -mln_trait_next_solve_binary_SOURCES = mln_trait_next_solve_binary.cc mln_trait_next_solve_SOURCES = mln_trait_next_solve.cc +mln_trait_next_solve_binary_SOURCES = mln_trait_next_solve_binary.cc mln_trait_next_solve_proxy_SOURCES = mln_trait_next_solve_proxy.cc mln_trait_next_solve_unary_SOURCES = mln_trait_next_solve_unary.cc mln_trait_op_all_SOURCES = mln_trait_op_all.cc @@ -2269,8 +2277,8 @@ mln_trait_op_minus_SOURCES = mln_trait_op_minus.cc mln_trait_op_mod_SOURCES = mln_trait_op_mod.cc mln_trait_op_neq_SOURCES = mln_trait_op_neq.cc mln_trait_op_not_SOURCES = mln_trait_op_not.cc -mln_trait_op_ord_SOURCES = mln_trait_op_ord.cc mln_trait_op_or_SOURCES = mln_trait_op_or.cc +mln_trait_op_ord_SOURCES = mln_trait_op_ord.cc mln_trait_op_plus_SOURCES = mln_trait_op_plus.cc mln_trait_op_postdec_SOURCES = mln_trait_op_postdec.cc mln_trait_op_postinc_SOURCES = mln_trait_op_postinc.cc @@ -2284,20 +2292,20 @@ mln_trait_promote_SOURCES = mln_trait_promote.cc mln_trait_site_set_print_SOURCES = mln_trait_site_set_print.cc mln_trait_site_set_props_SOURCES = mln_trait_site_set_props.cc mln_trait_site_sets_SOURCES = mln_trait_site_sets.cc -mln_trait_solve_binary_SOURCES = mln_trait_solve_binary.cc mln_trait_solve_SOURCES = mln_trait_solve.cc +mln_trait_solve_binary_SOURCES = mln_trait_solve_binary.cc mln_trait_solve_unary_SOURCES = mln_trait_solve_unary.cc mln_trait_undef_SOURCES = mln_trait_undef.cc mln_trait_value_all_SOURCES = mln_trait_value_all.cc mln_trait_value_comp_SOURCES = mln_trait_value_comp.cc mln_trait_value_essential_SOURCES = mln_trait_value_essential.cc -mln_trait_value__SOURCES = mln_trait_value_.cc mln_trait_value_internal_all_SOURCES = mln_trait_value_internal_all.cc mln_trait_value_internal_comp_SOURCES = mln_trait_value_internal_comp.cc mln_trait_value_kind_SOURCES = mln_trait_value_kind.cc mln_trait_value_nature_SOURCES = mln_trait_value_nature.cc mln_trait_value_print_SOURCES = mln_trait_value_print.cc mln_trait_value_quant_SOURCES = mln_trait_value_quant.cc +mln_trait_value__SOURCES = mln_trait_value_.cc mln_trait_window_print_SOURCES = mln_trait_window_print.cc mln_trait_window_props_SOURCES = mln_trait_window_props.cc mln_trait_windows_SOURCES = mln_trait_windows.cc @@ -2330,16 +2338,16 @@ mln_util_greater_point_SOURCES = mln_util_greater_point.cc mln_util_greater_psite_SOURCES = mln_util_greater_psite.cc mln_util_ignore_SOURCES = mln_util_ignore.cc mln_util_index_SOURCES = mln_util_index.cc -mln_util_internal_boost_graph_access_SOURCES = mln_util_internal_boost_graph_access.cc mln_util_internal_boost_graph_SOURCES = mln_util_internal_boost_graph.cc +mln_util_internal_boost_graph_access_SOURCES = mln_util_internal_boost_graph_access.cc mln_util_internal_boost_graph_property_SOURCES = mln_util_internal_boost_graph_property.cc mln_util_internal_boost_graph_structure_SOURCES = mln_util_internal_boost_graph_structure.cc mln_util_internal_edge_impl_SOURCES = mln_util_internal_edge_impl.cc mln_util_internal_graph_base_SOURCES = mln_util_internal_graph_base.cc -mln_util_internal_graph_iter_base_SOURCES = mln_util_internal_graph_iter_base.cc mln_util_internal_graph_iter_SOURCES = mln_util_internal_graph_iter.cc -mln_util_internal_graph_nbh_iter_base_SOURCES = mln_util_internal_graph_nbh_iter_base.cc +mln_util_internal_graph_iter_base_SOURCES = mln_util_internal_graph_iter_base.cc mln_util_internal_graph_nbh_iter_SOURCES = mln_util_internal_graph_nbh_iter.cc +mln_util_internal_graph_nbh_iter_base_SOURCES = mln_util_internal_graph_nbh_iter_base.cc mln_util_internal_id2element_SOURCES = mln_util_internal_id2element.cc mln_util_internal_vertex_impl_SOURCES = mln_util_internal_vertex_impl.cc mln_util_lazy_set_SOURCES = mln_util_lazy_set.cc @@ -2357,9 +2365,9 @@ mln_util_site_pair_SOURCES = mln_util_site_pair.cc mln_util_soft_heap_SOURCES = mln_util_soft_heap.cc mln_util_timer_SOURCES = mln_util_timer.cc mln_util_tracked_ptr_SOURCES = mln_util_tracked_ptr.cc +mln_util_tree_SOURCES = mln_util_tree.cc mln_util_tree_fast_SOURCES = mln_util_tree_fast.cc mln_util_tree_fast_to_image_SOURCES = mln_util_tree_fast_to_image.cc -mln_util_tree_SOURCES = mln_util_tree.cc mln_util_tree_to_fast_SOURCES = mln_util_tree_to_fast.cc mln_util_tree_to_image_SOURCES = mln_util_tree_to_image.cc mln_util_vertex_SOURCES = mln_util_vertex.cc @@ -2387,50 +2395,50 @@ mln_value_concept_symbolic_SOURCES = mln_value_concept_symbolic.cc mln_value_concept_vectorial_SOURCES = mln_value_concept_vectorial.cc mln_value_equiv_SOURCES = mln_value_equiv.cc mln_value_essential_SOURCES = mln_value_essential.cc +mln_value_float01_SOURCES = mln_value_float01.cc +mln_value_float01__SOURCES = mln_value_float01_.cc mln_value_float01_16_SOURCES = mln_value_float01_16.cc mln_value_float01_8_SOURCES = mln_value_float01_8.cc mln_value_float01_f_SOURCES = mln_value_float01_f.cc -mln_value_float01__SOURCES = mln_value_float01_.cc -mln_value_float01_SOURCES = mln_value_float01.cc mln_value_gl16_SOURCES = mln_value_gl16.cc mln_value_gl8_SOURCES = mln_value_gl8.cc mln_value_glf_SOURCES = mln_value_glf.cc -mln_value_graylevel_f_SOURCES = mln_value_graylevel_f.cc mln_value_graylevel_SOURCES = mln_value_graylevel.cc +mln_value_graylevel_f_SOURCES = mln_value_graylevel_f.cc mln_value_hsi_SOURCES = mln_value_hsi.cc mln_value_hsl_SOURCES = mln_value_hsl.cc +mln_value_int_s_SOURCES = mln_value_int_s.cc +mln_value_int_s16_SOURCES = mln_value_int_s16.cc +mln_value_int_s32_SOURCES = mln_value_int_s32.cc +mln_value_int_s8_SOURCES = mln_value_int_s8.cc +mln_value_int_u_SOURCES = mln_value_int_u.cc +mln_value_int_u12_SOURCES = mln_value_int_u12.cc +mln_value_int_u16_SOURCES = mln_value_int_u16.cc +mln_value_int_u32_SOURCES = mln_value_int_u32.cc +mln_value_int_u8_SOURCES = mln_value_int_u8.cc +mln_value_int_u_sat_SOURCES = mln_value_int_u_sat.cc mln_value_internal_all_SOURCES = mln_value_internal_all.cc mln_value_internal_convert_SOURCES = mln_value_internal_convert.cc mln_value_internal_encoding_SOURCES = mln_value_internal_encoding.cc mln_value_internal_essential_SOURCES = mln_value_internal_essential.cc -mln_value_internal_gray_f_SOURCES = mln_value_internal_gray_f.cc mln_value_internal_gray__SOURCES = mln_value_internal_gray_.cc +mln_value_internal_gray_f_SOURCES = mln_value_internal_gray_f.cc mln_value_internal_integer_SOURCES = mln_value_internal_integer.cc mln_value_internal_iterable_set_SOURCES = mln_value_internal_iterable_set.cc mln_value_internal_limits_SOURCES = mln_value_internal_limits.cc mln_value_internal_value_like_SOURCES = mln_value_internal_value_like.cc mln_value_interval_SOURCES = mln_value_interval.cc -mln_value_int_s16_SOURCES = mln_value_int_s16.cc -mln_value_int_s32_SOURCES = mln_value_int_s32.cc -mln_value_int_s8_SOURCES = mln_value_int_s8.cc -mln_value_int_s_SOURCES = mln_value_int_s.cc -mln_value_int_u12_SOURCES = mln_value_int_u12.cc -mln_value_int_u16_SOURCES = mln_value_int_u16.cc -mln_value_int_u32_SOURCES = mln_value_int_u32.cc -mln_value_int_u8_SOURCES = mln_value_int_u8.cc -mln_value_int_u_SOURCES = mln_value_int_u.cc -mln_value_int_u_sat_SOURCES = mln_value_int_u_sat.cc +mln_value_label_SOURCES = mln_value_label.cc mln_value_label_16_SOURCES = mln_value_label_16.cc mln_value_label_8_SOURCES = mln_value_label_8.cc -mln_value_label_SOURCES = mln_value_label.cc mln_value_lut_vec_SOURCES = mln_value_lut_vec.cc mln_value_mixin_SOURCES = mln_value_mixin.cc mln_value_ops_SOURCES = mln_value_ops.cc mln_value_other_SOURCES = mln_value_other.cc mln_value_proxy_SOURCES = mln_value_proxy.cc +mln_value_rgb_SOURCES = mln_value_rgb.cc mln_value_rgb16_SOURCES = mln_value_rgb16.cc mln_value_rgb8_SOURCES = mln_value_rgb8.cc -mln_value_rgb_SOURCES = mln_value_rgb.cc mln_value_scalar_SOURCES = mln_value_scalar.cc mln_value_set_SOURCES = mln_value_set.cc mln_value_shell_SOURCES = mln_value_shell.cc -- 1.6.1.2

1 0

[PATCH 30/31] Get compilation flags for applications from configure.
by Roland Levillain 15 May '09

15 May '09

* apps/statues/Makefile.am (APPS_CXXFLAGS): New. Use it... (AM_CXXFLAGS): ...here. --- milena/ChangeLog | 8 ++++++++ milena/apps/statues/Makefile.am | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a9b57ab..5325ab4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-05-15 Roland Levillain <roland(a)lrde.epita.fr> + Get compilation flags for applications from configure. + + * apps/statues/Makefile.am (APPS_CXXFLAGS): New. + Use it... + (AM_CXXFLAGS): ...here. + +2009-05-15 Roland Levillain <roland(a)lrde.epita.fr> + Fix tests/io/magick/Makefile. * tests/io/magick/Makefile.am (magick_LDFLAGS): Rename as... diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index bf0aa4c..417b1e7 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -8,8 +8,8 @@ include $(top_srcdir)/external/trimesh/gluit/gluit.mk AM_CPPFLAGS = -I$(top_srcdir)/milena CPPFLAGS_trimesh = -I$(top_srcdir)/external/trimesh/include # Produce fast code. -# FIXME: This is GCC-dependent; use a variable computed by configure instead. -AM_CXXFLAGS = -Wall -Wextra -ggdb -O3 -DNDEBUG +APPS_CXXFLAGS = @APPS_CXXFLAGS@ +AM_CXXFLAGS = $(APPS_CXXFLAGS) # Find the trimesh library and its dependencies. # # Don't use TRIMESH_LDFLAGS, since it looks like the LDFLAGS of the -- 1.6.1.2

1 0

[PATCH 29/31] Fix tests/io/magick/Makefile.
by Roland Levillain 15 May '09

15 May '09

* tests/io/magick/Makefile.am (magick_LDFLAGS): Rename as... (AM_LDFLAGS): ...this. --- milena/ChangeLog | 7 +++++++ milena/tests/io/magick/Makefile.am | 4 +++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 974b11a..a9b57ab 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-05-15 Roland Levillain <roland(a)lrde.epita.fr> + Fix tests/io/magick/Makefile. + + * tests/io/magick/Makefile.am (magick_LDFLAGS): Rename as... + (AM_LDFLAGS): ...this. + +2009-05-15 Roland Levillain <roland(a)lrde.epita.fr> + Fix the manual regeneration of headers.mk. * Makefile.am ($(srcdir)/headers.mk): Move action... diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index 6bc0b93..e6bab71 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -2,7 +2,9 @@ include $(top_srcdir)/milena/tests/tests.mk -magick_LDFLAGS = -lMagick++ +# FIXME: We should not use a hard-coded value. Rely on a variable set +# by configure instead. +AM_LDFLAGS = -lMagick++ check_PROGRAMS = \ load -- 1.6.1.2

1 0