URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-07-08 Edwin Carlinet <carlinet@lrde.epita.fr> Minor fixes in labeling/compute_image.hh. * labeling/compute_image.hh: Minor fixes. --- compute_image.hh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Index: trunk/milena/mln/labeling/compute_image.hh =================================================================== --- trunk/milena/mln/labeling/compute_image.hh (revision 4255) +++ trunk/milena/mln/labeling/compute_image.hh (revision 4256) @@ -99,7 +99,7 @@ /// template <typename A, typename I, typename L> inline - mln_ch_value(L, mln_accu_result(A, mln_value(I))) + mln_ch_value(L, mln_meta_accu_result(A, mln_value(I))) compute_image(const Meta_Accumulator<A>& accu, const Image<I>& input, const Image<L>& labels, @@ -176,7 +176,7 @@ template <typename A, typename I, typename L> inline - mln_ch_value(L, mln_accu_result(A, mln_value(I))) + mln_ch_value(L, mln_meta_accu_result(A, mln_value(I))) compute_image(const Meta_Accumulator<A>& accu, const Image<I>& input, const Image<L>& labels, @@ -184,10 +184,12 @@ { trace::entering("labeling::compute_image"); - util::array<mln_accu_result(A, mln_value(I))> res = + typedef mln_meta_accu_result(A, mln_value(I)) T; + + util::array<T> res = compute(accu, input, labels, nlabels); - mln_ch_value(L, mln_accu_result(A, mln_value(I))) output = + mln_ch_value(L, T) output = labeling::internal::compute_image(res, labels, nlabels); trace::exiting("labeling::compute_image");