* mln/labeling/compute.hh: Check if the image is a labeled image and fix a wrong dispatch. --- milena/ChangeLog | 7 +++++++ milena/mln/labeling/compute.hh | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4e2cfcb..959337a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-11-25 Guillaume Lazzara <z@lrde.epita.fr> + Fix labeling::compute tests. + + * mln/labeling/compute.hh: Check if the image is a labeled image and + fix a wrong dispatch. + +2008-11-25 Guillaume Lazzara <z@lrde.epita.fr> + Fix tutorial generation. * doc/tutorial/Makefile.am diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index dfc95f1..ececa18 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -127,6 +127,7 @@ namespace mln const mln_value(L)& nlabels) { mln_precondition(exact(label).has_data()); + mlc_is_a(mln_value(L), mln::value::Symbolic)::check(); (void) a; (void) label; (void) nlabels; @@ -143,7 +144,7 @@ namespace mln { mln_precondition(exact(input).has_data()); mln_precondition(exact(label).has_data()); - + mlc_is_a(mln_value(L), mln::value::Symbolic)::check(); (void) a; (void) input; (void) label; @@ -276,7 +277,7 @@ namespace mln typedef mln_accu_with(A, mln_value(I)) A_; A_ a_ = accu::unmeta(exact(a), mln_value(I)()); - return internal::compute_dispatch(a_, input, label, nlabels); + return compute(a_, input, label, nlabels); } @@ -309,7 +310,7 @@ namespace mln typedef mln_accu_with(A, mln_psite(L)) A_; A_ a_ = accu::unmeta(exact(a), mln_psite(L)()); - return internal::compute_dispatch(a_, label, nlabels); + return compute(a_, label, nlabels); } -- 1.5.6.5