* mln/accu/compute.hh, * mln/accu/transform.hh, * mln/accu/transform_diagonal.hh, * mln/accu/transform_directional.hh, * mln/accu/transform_line.hh, * mln/accu/transform_snake.hh, * mln/accu/transform_stop.hh, * mln/data/compute.hh, * mln/labeling/compute.hh, * mln/set/compute.hh, * mln/set/compute_with_weights.hh: update. --- milena/ChangeLog | 16 +++++++++ milena/mln/accu/compute.hh | 4 +- milena/mln/accu/transform.hh | 4 +- milena/mln/accu/transform_diagonal.hh | 10 +++--- milena/mln/accu/transform_directional.hh | 11 +++--- milena/mln/accu/transform_line.hh | 55 +++++++++++++++-------------- milena/mln/accu/transform_snake.hh | 8 ++-- milena/mln/accu/transform_stop.hh | 4 +- milena/mln/data/compute.hh | 4 +- milena/mln/labeling/compute.hh | 8 ++-- milena/mln/set/compute.hh | 6 ++-- milena/mln/set/compute_with_weights.hh | 6 ++-- 12 files changed, 77 insertions(+), 59 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 99015ff..7138445 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2009-07-06 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Use mln_accu_result() instead of mln_accu_with()::result. + + * mln/accu/compute.hh, + * mln/accu/transform.hh, + * mln/accu/transform_diagonal.hh, + * mln/accu/transform_directional.hh, + * mln/accu/transform_line.hh, + * mln/accu/transform_snake.hh, + * mln/accu/transform_stop.hh, + * mln/data/compute.hh, + * mln/labeling/compute.hh, + * mln/set/compute.hh, + * mln/set/compute_with_weights.hh: update. + +2009-07-06 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Small fixes. * demos/graph/region_adjacency_graph.cc: do not draw the vertex diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index 896e549..56413ac 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -72,7 +72,7 @@ namespace mln /// \warning This routine does not perform a.init(). /// template <typename A, typename I> - mln_accu_with(A, util::pix<I>)::result + mln_accu_result(A, util::pix<I>) compute(const Meta_Accumulator<A>& a, const Image<I>& input); @@ -140,7 +140,7 @@ namespace mln template <typename A, typename I> inline - mln_accu_with(A, util::pix<I>)::result + mln_accu_result(A, util::pix<I>) compute(const Meta_Accumulator<A>& a, const Image<I>& input) { trace::entering("accu::compute"); diff --git a/milena/mln/accu/transform.hh b/milena/mln/accu/transform.hh index 7ffdc98..7c0fbf9 100644 --- a/milena/mln/accu/transform.hh +++ b/milena/mln/accu/transform.hh @@ -50,7 +50,7 @@ namespace mln const Window<W>& win); template <typename I, typename A, typename W> - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform(const Image<I>& input, const Meta_Accumulator<A>& a, const Window<W>& win); @@ -197,7 +197,7 @@ namespace mln } template <typename I, typename A, typename W> - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform(const Image<I>& input, const Meta_Accumulator<A>& a, const Window<W>& win) { trace::entering("accu::transform"); diff --git a/milena/mln/accu/transform_diagonal.hh b/milena/mln/accu/transform_diagonal.hh index e705944..99000f4 100644 --- a/milena/mln/accu/transform_diagonal.hh +++ b/milena/mln/accu/transform_diagonal.hh @@ -65,7 +65,7 @@ namespace mln template <typename A, typename I, typename W> - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform_diagonal(const Meta_Accumulator<A>& a, const Image<I>& input, const Window<W>& win); @@ -381,7 +381,7 @@ namespace mln canvas::browsing::backdiagonal2d(f); return f.output; } - + template <typename A, typename I> inline mln_ch_value(I, mln_result(A)) @@ -394,7 +394,7 @@ namespace mln canvas::browsing::diagonal2d(f); return f.output; } - + template <typename A, typename I> inline mln_ch_value(I, mln_result(A)) @@ -407,7 +407,7 @@ namespace mln canvas::browsing::backdiagonal2d(f); return f.output; } - + template <typename A, typename I, typename W> inline mln_ch_value(I, mln_result(A)) @@ -444,7 +444,7 @@ namespace mln template <typename A, typename I, typename W> inline - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform_diagonal(const Meta_Accumulator<A>& a, const Image<I>& input, const Window<W>& win) { diff --git a/milena/mln/accu/transform_directional.hh b/milena/mln/accu/transform_directional.hh index 60ff537..46863cc 100644 --- a/milena/mln/accu/transform_directional.hh +++ b/milena/mln/accu/transform_directional.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. // @@ -62,7 +63,7 @@ namespace mln template <typename A, typename I, typename W> - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform_directional(const Meta_Accumulator<A>& a, const Image<I>& input, const Window<W>& win, unsigned dir); @@ -264,7 +265,7 @@ namespace mln canvas::browsing::directional(f); return f.output; } - + template <typename A, typename I, typename W> inline mln_ch_value(I, mln_result(A)) @@ -278,7 +279,7 @@ namespace mln canvas::browsing::directional(f); return f.output; } - + template <typename A, typename I, typename W> inline mln_ch_value(I, mln_result(A)) @@ -317,7 +318,7 @@ namespace mln template <typename A, typename I, typename W> inline - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform_directional(const Meta_Accumulator<A>& a, const Image<I>& input, const Window<W>& win, unsigned dir) diff --git a/milena/mln/accu/transform_line.hh b/milena/mln/accu/transform_line.hh index f77bd21..604853d 100644 --- a/milena/mln/accu/transform_line.hh +++ b/milena/mln/accu/transform_line.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. // @@ -50,15 +51,15 @@ namespace mln template <typename A, typename I> mln_ch_value(I, mln_result(A)) - transform_line(const Accumulator<A>& a, - const Image<I>& input, - unsigned length, unsigned dir); + transform_line(const Accumulator<A>& a, + const Image<I>& input, + unsigned length, unsigned dir); template <typename A, typename I> - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) - transform_line(const Meta_Accumulator<A>& a, - const Image<I>& input, - unsigned length, unsigned dir); + mln_ch_value(I, mln_accu_result(A, mln_value(I))) + transform_line(const Meta_Accumulator<A>& a, + const Image<I>& input, + unsigned length, unsigned dir); @@ -102,9 +103,9 @@ namespace mln template <typename A, typename I> inline mln_ch_value(I, mln_result(A)) - transform_line(const Accumulator<A>& a_, - const Image<I>& input_, - unsigned length, unsigned dir) + transform_line(const Accumulator<A>& a_, + const Image<I>& input_, + unsigned length, unsigned dir) { trace::entering("accu::impl::transform_line"); @@ -165,7 +166,7 @@ namespace mln qt_dir++; qu_dir++; } - + p_dir = pmin_dir; @@ -197,9 +198,9 @@ namespace mln template <typename A, typename I> inline mln_ch_value(I, mln_result(A)) - transform_line_fastest(const Accumulator<A>& a_, - const Image<I>& input_, - unsigned length, unsigned dir) + transform_line_fastest(const Accumulator<A>& a_, + const Image<I>& input_, + unsigned length, unsigned dir) { trace::entering("accu::impl::transform_line_fastest"); @@ -265,7 +266,7 @@ namespace mln output.element(o_p) = a.to_result(); } - + p_dir = pmin_dir; // Go to the next line. @@ -304,10 +305,10 @@ namespace mln template <typename A, typename I> inline mln_ch_value(I, mln_result(A)) - transform_line_dispatch(trait::image::speed::any, - const Accumulator<A>& a, - const Image<I>& input, - unsigned length, unsigned dir) + transform_line_dispatch(trait::image::speed::any, + const Accumulator<A>& a, + const Image<I>& input, + unsigned length, unsigned dir) { return impl::generic::transform_line(a, input, @@ -339,9 +340,9 @@ namespace mln template <typename A, typename I> inline mln_ch_value(I, mln_result(A)) - transform_line(const Accumulator<A>& a, - const Image<I>& input, - unsigned length, unsigned dir) + transform_line(const Accumulator<A>& a, + const Image<I>& input, + unsigned length, unsigned dir) { trace::entering("accu::transform_line"); @@ -359,10 +360,10 @@ namespace mln template <typename A, typename I> inline - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) - transform_line(const Meta_Accumulator<A>& a, - const Image<I>& input, - unsigned length, unsigned dir) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) + transform_line(const Meta_Accumulator<A>& a, + const Image<I>& input, + unsigned length, unsigned dir) { trace::entering("accu::transform_line"); diff --git a/milena/mln/accu/transform_snake.hh b/milena/mln/accu/transform_snake.hh index e04eaca..62140d4 100644 --- a/milena/mln/accu/transform_snake.hh +++ b/milena/mln/accu/transform_snake.hh @@ -62,7 +62,7 @@ namespace mln template <typename A, typename I, typename W> - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform_snake(const Meta_Accumulator<A>& a, const Image<I>& input, const Window<W>& win); @@ -402,7 +402,7 @@ namespace mln canvas::browsing::snake_generic(f); return f.output; } - + template <typename A, typename I, typename W> inline mln_ch_value(I, mln_result(A)) @@ -415,7 +415,7 @@ namespace mln canvas::browsing::snake_generic(f); return f.output; } - + template <typename A, typename I, typename W> inline mln_ch_value(I, mln_result(A)) @@ -452,7 +452,7 @@ namespace mln template <typename A, typename I, typename W> inline - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform_snake(const Meta_Accumulator<A>& a, const Image<I>& input, const Window<W>& win) { diff --git a/milena/mln/accu/transform_stop.hh b/milena/mln/accu/transform_stop.hh index a0853b5..e9c62e6 100644 --- a/milena/mln/accu/transform_stop.hh +++ b/milena/mln/accu/transform_stop.hh @@ -48,7 +48,7 @@ namespace mln transform_stop(const Image<I>& input, const Accumulator<A>& a, const Window<W>& win); template <typename I, typename A, typename W> - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform_stop(const Image<I>& input, const Meta_Accumulator<A>& a, const Window<W>& win); @@ -201,7 +201,7 @@ namespace mln } template <typename I, typename A, typename W> - mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) + mln_ch_value(I, mln_accu_result(A, mln_value(I))) transform_stop(const Image<I>& input, const Meta_Accumulator<A>& a, const Window<W>& win) { trace::entering("accu::transform_stop"); diff --git a/milena/mln/data/compute.hh b/milena/mln/data/compute.hh index bca7a38..63942cd 100644 --- a/milena/mln/data/compute.hh +++ b/milena/mln/data/compute.hh @@ -61,7 +61,7 @@ namespace mln /// \return The accumulator result. /// template <typename A, typename I> - mln_accu_with(A, mln_value(I))::result + mln_accu_result(A, mln_value(I)) compute(const Meta_Accumulator<A>& a, const Image<I>& input); @@ -90,7 +90,7 @@ namespace mln template <typename A, typename I> inline - mln_accu_with(A, mln_value(I))::result + mln_accu_result(A, mln_value(I)) compute(const Meta_Accumulator<A>& a, const Image<I>& input) { typedef mln_accu_with(A, mln_value(I)) A_; diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index 61f9829..eeede38 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -101,7 +101,7 @@ namespace mln /// \return A mln::p_array of accumulator result (one result per label). // template <typename A, typename I, typename L> - util::array<mln_accu_with(A, mln_value(I))::result> + util::array<mln_accu_result(A, mln_value(I))> compute(const Meta_Accumulator<A>& a, const Image<I>& input, const Image<L>& label, @@ -132,7 +132,7 @@ namespace mln /// \return A mln::p_array of accumulator result (one result per label). // template <typename A, typename L> - util::array<mln_accu_with(A, mln_psite(L))::result> + util::array<mln_accu_result(A, mln_psite(L))> compute(const Meta_Accumulator<A>& a, const Image<L>& label, const mln_value(L)& nlabels); @@ -390,7 +390,7 @@ namespace mln template <typename A, typename I, typename L> inline - util::array<mln_accu_with(A, mln_value(I))::result> + util::array<mln_accu_result(A, mln_value(I))> compute(const Meta_Accumulator<A>& a, const Image<I>& input, const Image<L>& label, @@ -426,7 +426,7 @@ namespace mln template <typename A, typename L> inline - util::array<mln_accu_with(A, mln_psite(L))::result> + util::array<mln_accu_result(A, mln_psite(L))> compute(const Meta_Accumulator<A>& a, const Image<L>& label, const mln_value(L)& nlabels) diff --git a/milena/mln/set/compute.hh b/milena/mln/set/compute.hh index 8ab5cbd..1828a8e 100644 --- a/milena/mln/set/compute.hh +++ b/milena/mln/set/compute.hh @@ -59,7 +59,7 @@ namespace mln // \return The accumulator result. // template <typename A, typename S> - mln_accu_with(A, mln_site(S))::result + mln_accu_result(A, mln_site(S)) compute(const Meta_Accumulator<A>& a, const Site_Set<S>& s); @@ -123,7 +123,7 @@ namespace mln template <typename A, typename S> - mln_accu_with(A, mln_site(S))::result + mln_accu_result(A, mln_site(S)) compute(const Meta_Accumulator<A>& a, const Site_Set<S>& s) { trace::entering("set::compute"); @@ -132,7 +132,7 @@ namespace mln A_ a_ = accu::unmeta(exact(a), mln_site(S)()); mln_result(A_) r = impl::generic::compute(a_, s); - + trace::exiting("set::compute"); return r; } diff --git a/milena/mln/set/compute_with_weights.hh b/milena/mln/set/compute_with_weights.hh index 39b0a29..de9c17b 100644 --- a/milena/mln/set/compute_with_weights.hh +++ b/milena/mln/set/compute_with_weights.hh @@ -80,7 +80,7 @@ namespace mln /// \return The accumulator result. // template <typename A, typename I> - mln_accu_with(A, mln_site(I))::result + mln_accu_result(A, mln_site(I)) compute_with_weights(const Meta_Accumulator<A>& a, const Image<I>& w); @@ -252,7 +252,7 @@ namespace mln template <typename A, typename I> inline - mln_accu_with(A, mln_site(I))::result + mln_accu_result(A, mln_site(I)) compute_with_weights(const Meta_Accumulator<A>& a, const Image<I>& w) { trace::entering("set::compute_with_weights"); @@ -266,7 +266,7 @@ namespace mln A_ a_ = accu::unmeta(exact(a), P()); mln_result(A_) r = impl::generic::compute_with_weights(a_, w); - + trace::exiting("set::compute_with_weights"); return r; } -- 1.5.6.5