[Olena-patches] last-svn-commit-757-gc4bfdc8 Deactivate erroneous assertion in regional_maxima.hh.

--- ChangeLog | 6 ++++++ milena/mln/labeling/regional_maxima.hh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 686b84a..3eb76e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-03-14 Thierry GERAUD <thierry.geraud(a)lrde.epita.fr> + + * milena/mln/labeling/regional_maxima.hh + (do_no_union_): Deactivate assertion since it is + not verified for all cases. + 2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Make Boost dependency optional. diff --git a/milena/mln/labeling/regional_maxima.hh b/milena/mln/labeling/regional_maxima.hh index a3c12eb..861066f 100644 --- a/milena/mln/labeling/regional_maxima.hh +++ b/milena/mln/labeling/regional_maxima.hh @@ -97,8 +97,8 @@ namespace mln bool labels_(unsigned p) const { return attr.element(p); } bool equiv_(unsigned n, unsigned p) const { return input.element(n) == input.element(p); } - void do_no_union_(unsigned n, unsigned p) { mln_invariant(input.element(n) > - input.element(p)); + void do_no_union_(unsigned n, unsigned p) { // mln_invariant(input.element(n) > + // input.element(p)); attr.element(p) = false; (void) n; } -- 1.5.6.5