--- milena/ChangeLog | 5 +++++ milena/mln/core/image/vmorph/fun_image.hh | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f9b40f9..7dccad8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-09-22 Guillaume Lazzara <z@lrde.epita.fr> + + * milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid + function call. + 2010-10-22 Roland Levillain <roland@lrde.epita.fr> * headers.mk, tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/mln/core/image/vmorph/fun_image.hh b/milena/mln/core/image/vmorph/fun_image.hh index 3934725..30ac44e 100644 --- a/milena/mln/core/image/vmorph/fun_image.hh +++ b/milena/mln/core/image/vmorph/fun_image.hh @@ -132,8 +132,6 @@ namespace mln /// Mutable access is for reading only. mln_result(F) operator()(const mln_psite(I)& p); // lvalue operator()(const mln_psite(I)& p); De-activated for 1.0 - - F f; }; @@ -211,7 +209,7 @@ namespace mln fun_image<F,I>::operator()(const mln_psite(I)& p) const { mln_precondition(this->data_->ima_.has(p)); - return f( this->data_->ima_(p) ); + return this->data_->f_( this->data_->ima_(p) ); } template <typename F, typename I> @@ -220,7 +218,7 @@ namespace mln fun_image<F,I>::operator()(const mln_psite(I)& p) { mln_precondition(this->data_->ima_.has(p)); - return f( this->data_->ima_(p) ); + return this->data_->f_( this->data_->ima_(p) ); // return mln::value::shell<F, I>( this->data_->ima_, p ); De-activated for 1.0 } -- 1.5.6.5