https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Minor modifications + fix. * mln/morpho/tree/data.hh (mln_site_piter, mln_node_piter, mln_leaf_piter): New. * mln/morpho/attribute/height.hh: Layout. * mln/morpho/general.spe.hh (general_dispatch_for_generic): Fix unwanted trace. * mln/labeling/blobs.hh (todo): New. labeling/blobs.hh | 2 ++ morpho/attribute/height.hh | 16 ++++++++++++---- morpho/general.spe.hh | 6 ++---- morpho/tree/data.hh | 9 +++++++-- 4 files changed, 23 insertions(+), 10 deletions(-) Index: mln/morpho/tree/data.hh --- mln/morpho/tree/data.hh (revision 3645) +++ mln/morpho/tree/data.hh (working copy) @@ -31,9 +31,8 @@ /// \file mln/morpho/tree/data.hh /// -/// TODO: think about site iterator (using image site iterator instead +/// \todo Think about site iterator (using image site iterator instead /// of S container iterator) to go faster. -/// # include <mln/morpho/tree/compute_parent.hh> # include <mln/core/site_set/p_array.hh> @@ -52,6 +51,10 @@ # define mln_leaf_piter(T) typename T::leaf_piter # define mln_preorder_piter(T) typename T::preorder_piter +# define mln_site_piter(T) typename T::up_site_piter +# define mln_node_piter(T) typename T::up_node_piter +# define mln_leaf_piter(T) typename T::up_leaf_piter + # define mln_up_site_piter_(T) T::up_site_piter # define mln_dn_site_piter_(T) T::dn_site_piter # define mln_up_node_piter_(T) T::up_node_piter @@ -63,6 +66,7 @@ # define mln_leaf_piter_(T) T::leaf_piter # define mln_preorder_piter_(T) T::preorder_piter + namespace mln { @@ -134,6 +138,7 @@ typedef mln::morpho::tree::preorder_piter<self_> preorder_piter; + /// Constructor. template <typename N> data(const Image<I>& f, const Site_Set<S>& s, const Neighborhood<N>& nbh); Index: mln/morpho/attribute/height.hh --- mln/morpho/attribute/height.hh (revision 3645) +++ mln/morpho/attribute/height.hh (working copy) @@ -41,7 +41,8 @@ # include <mln/math/max.hh> -namespace mln { +namespace mln +{ // Forward declaration. namespace morpho { @@ -53,7 +54,8 @@ // Traits. - namespace trait { + namespace trait + { template <typename I> struct accumulator_< morpho::attribute::height<I> > @@ -67,8 +69,11 @@ } // end of namespace mln::trait - namespace morpho { - namespace attribute { + namespace morpho + { + + namespace attribute + { /// Height accumulator class. /// @@ -211,8 +216,11 @@ } # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::morpho::attribute + } // end of namespace mln::morpho + } // end of namespace mln Index: mln/morpho/general.spe.hh --- mln/morpho/general.spe.hh (revision 3645) +++ mln/morpho/general.spe.hh (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -330,12 +330,10 @@ mln_concrete(I) general_dispatch_for_generic(const Op& op, const I& input, const W& win) // Entry point. { - trace::entering("morpho::general_dispatch_for_generic"); mln_concrete(I) ima = general_dispatch_for_generic(mln_trait_image_kind(I)(), mln_trait_image_speed(I)(), op, input, win); - trace::entering("morpho::general_dispatch_for_generic"); return ima; } Index: mln/labeling/blobs.hh --- mln/labeling/blobs.hh (revision 3645) +++ mln/labeling/blobs.hh (working copy) @@ -35,6 +35,8 @@ /// image using a queue-based algorithm. /// /// \todo Handle abort in a nice way... +/// +/// \todo Add a 2nd version precising the 'level' to label. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh>