[Olena-patches] 4394: Small fixes in Milena.

* mln/canvas/labeling/blobs.hh, * mln/canvas/labeling/internal/tests.hh: Add missing includes. * mln/morpho/closing/algebraic.hh, * mln/test/predicate.hh, * mln/morpho/algebraic_filter.hh, * mln/labeling/relabel.hh, * mln/data/compare.hh, * mln/canvas/morpho/attribute_filter.hh: cosmetic changes. * mln/core/concept/image.hh: Remove data/compare.hh include. * mln/core/internal/site_relative_iterator_base.hh: Remove deprecated todo. * mln/data/compute.hh: Avoid a warning. * mln/labeling/blobs.hh: Remove useless headers. * mln/make/edge_image.hh: Fix a syntax error. --- milena/ChangeLog | 27 +++++++++++++++++++- milena/mln/canvas/labeling/blobs.hh | 4 +++ milena/mln/canvas/labeling/internal/tests.hh | 4 +++ milena/mln/canvas/morpho/attribute_filter.hh | 10 +++--- milena/mln/core/concept/image.hh | 1 - .../core/internal/site_relative_iterator_base.hh | 2 - milena/mln/data/compare.hh | 3 +- milena/mln/data/compute.hh | 1 + milena/mln/labeling/blobs.hh | 2 - milena/mln/labeling/relabel.hh | 3 +- milena/mln/make/edge_image.hh | 3 +- milena/mln/morpho/algebraic_filter.hh | 18 ++++++++++--- milena/mln/morpho/closing/algebraic.hh | 3 +- milena/mln/test/predicate.hh | 3 +- 14 files changed, 64 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6785877..c996afc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,28 @@ +2009-08-24 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + + Small fixes in Milena. + + * mln/canvas/labeling/blobs.hh, + * mln/canvas/labeling/internal/tests.hh: Add missing includes. + + * mln/morpho/closing/algebraic.hh, + * mln/test/predicate.hh, + * mln/morpho/algebraic_filter.hh, + * mln/labeling/relabel.hh, + * mln/data/compare.hh, + * mln/canvas/morpho/attribute_filter.hh: cosmetic changes. + + * mln/core/concept/image.hh: Remove data/compare.hh include. + + * mln/core/internal/site_relative_iterator_base.hh: Remove + deprecated todo. + + * mln/data/compute.hh: Avoid a warning. + + * mln/labeling/blobs.hh: Remove useless headers. + + * mln/make/edge_image.hh: Fix a syntax error. + 2009-08-21 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; * mln/debug/superpose.hh: Add support for more image types. @@ -61,7 +86,7 @@ 2009-08-21 Yann Jacquelet &lt;jacquelet(a)lrde.epita.fr&gt; Remove extra ";" to compile. - + * mln/trait/functions.hh: Remove extra ";" l207 after "}" of compute. 2009-08-19 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; diff --git a/milena/mln/canvas/labeling/blobs.hh b/milena/mln/canvas/labeling/blobs.hh index 8f85541..bd6eeb5 100644 --- a/milena/mln/canvas/labeling/blobs.hh +++ b/milena/mln/canvas/labeling/blobs.hh @@ -31,6 +31,10 @@ /// Canvas for connected component labeling of the binary objects of a /// binary image using a queue-based algorithm. +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/data/fill.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <mln/util/pix.hh> diff --git a/milena/mln/canvas/labeling/internal/tests.hh b/milena/mln/canvas/labeling/internal/tests.hh index d1b9cf7..e91fcc9 100644 --- a/milena/mln/canvas/labeling/internal/tests.hh +++ b/milena/mln/canvas/labeling/internal/tests.hh @@ -30,6 +30,10 @@ /// /// Shared tests for labeling canvas arguments. +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> + + namespace mln { diff --git a/milena/mln/canvas/morpho/attribute_filter.hh b/milena/mln/canvas/morpho/attribute_filter.hh index 2e2d8cb..0e7cbb2 100644 --- a/milena/mln/canvas/morpho/attribute_filter.hh +++ b/milena/mln/canvas/morpho/attribute_filter.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -44,7 +45,6 @@ # include <mln/extension/adjust_fill.hh> # include <mln/data/sort_psites.hh> - namespace mln { @@ -263,7 +263,7 @@ namespace mln //////////////////////// /// Fastest version. /// //////////////////////// - + template <typename I> inline unsigned @@ -385,8 +385,8 @@ namespace mln // Dispatch. - - + + namespace internal { diff --git a/milena/mln/core/concept/image.hh b/milena/mln/core/concept/image.hh index 6c0d860..8c620bc 100644 --- a/milena/mln/core/concept/image.hh +++ b/milena/mln/core/concept/image.hh @@ -47,7 +47,6 @@ # include <mln/tag/init.hh> -# include <mln/data/compare.hh> namespace mln { diff --git a/milena/mln/core/internal/site_relative_iterator_base.hh b/milena/mln/core/internal/site_relative_iterator_base.hh index de4e5aa..4d9567f 100644 --- a/milena/mln/core/internal/site_relative_iterator_base.hh +++ b/milena/mln/core/internal/site_relative_iterator_base.hh @@ -34,8 +34,6 @@ /// /// \todo Add a method to get the site set (if the center is defined) or /// the site set at a given center. -/// -/// \todo In start_ and next_, think about the commented code... # include <vector> diff --git a/milena/mln/data/compare.hh b/milena/mln/data/compare.hh index df1018d..30ea9ce 100644 --- a/milena/mln/data/compare.hh +++ b/milena/mln/data/compare.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/data/compute.hh b/milena/mln/data/compute.hh index 6a234a9..0ab146e 100644 --- a/milena/mln/data/compute.hh +++ b/milena/mln/data/compute.hh @@ -92,6 +92,7 @@ namespace mln mln_result(A) compute(const Accumulator<A>& a_, const Image<I>& input) { + (void) a_; A a; return compute(a, input); } diff --git a/milena/mln/labeling/blobs.hh b/milena/mln/labeling/blobs.hh index f63430f..d58ef5d 100644 --- a/milena/mln/labeling/blobs.hh +++ b/milena/mln/labeling/blobs.hh @@ -38,8 +38,6 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> -# include <mln/data/fill.hh> -# include <mln/core/site_set/p_queue_fast.hh> # include <mln/canvas/labeling/blobs.hh> diff --git a/milena/mln/labeling/relabel.hh b/milena/mln/labeling/relabel.hh index 0e89e3c..b8ebc12 100644 --- a/milena/mln/labeling/relabel.hh +++ b/milena/mln/labeling/relabel.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/make/edge_image.hh b/milena/mln/make/edge_image.hh index b0d0465..2a429cb 100644 --- a/milena/mln/make/edge_image.hh +++ b/milena/mln/make/edge_image.hh @@ -34,6 +34,7 @@ # include <mln/core/image/vertex_image.hh> # include <mln/core/concept/function.hh> # include <mln/util/internal/id2element.hh> +# include <mln/data/fill.hh> namespace mln @@ -91,7 +92,7 @@ namespace mln /// /// \return an edge image. // - template <typename P, typename V, typename G, typename FP, typename + template <typename P, typename V, typename G, typename FP, typename FV> mln::edge_image<mln_result(FP),mln_result(FV),G> edge_image(const mln::vertex_image<P,V,G>& v_ima_, const p_edges<G,FP> pe, diff --git a/milena/mln/morpho/algebraic_filter.hh b/milena/mln/morpho/algebraic_filter.hh index c6c0d9e..eca2cc3 100644 --- a/milena/mln/morpho/algebraic_filter.hh +++ b/milena/mln/morpho/algebraic_filter.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,8 +43,11 @@ # include <mln/canvas/morpho/attribute_filter.hh> -namespace mln { - namespace morpho { +namespace mln +{ + + namespace morpho + { template <typename I, typename N, typename A> mln_concrete(I) @@ -74,7 +78,11 @@ namespace mln { trait::accumulator::when_pix::use_p))::check(); mln_concrete(I) output; - output = canvas::morpho::internal::attribute_filter_dispatch(input, nbh, a, lambda, increasing); + output = canvas::morpho::internal::attribute_filter_dispatch(input, + nbh, + a, + lambda, + increasing); trace::exiting("morpho::opening::algebraic_filter"); @@ -82,7 +90,9 @@ namespace mln { } # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::morpho + } // end of namespace mln #endif // ! MLN_MORPHO_ALGEBRAIC_FILTER_HH diff --git a/milena/mln/morpho/closing/algebraic.hh b/milena/mln/morpho/closing/algebraic.hh index 6d68a11..f8c8184 100644 --- a/milena/mln/morpho/closing/algebraic.hh +++ b/milena/mln/morpho/closing/algebraic.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/test/predicate.hh b/milena/mln/test/predicate.hh index de205cc..0cc587e 100644 --- a/milena/mln/test/predicate.hh +++ b/milena/mln/test/predicate.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // -- 1.5.6.5