--- milena/ChangeLog | 4 ++++ milena/mln/data/compute_in_window.hh | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 96019b5..5ad6a19 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-08-23 Guillaume Lazzara <z@lrde.epita.fr> + + * mln/data/compute_in_window.hh: Fix warnings. + 2012-05-10 Guillaume Lazzara <z@lrde.epita.fr> Rely on Argument-Dependent Lookup (ADL) in from_to_ overloads. diff --git a/milena/mln/data/compute_in_window.hh b/milena/mln/data/compute_in_window.hh index 297a923..c47501c 100644 --- a/milena/mln/data/compute_in_window.hh +++ b/milena/mln/data/compute_in_window.hh @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_DATA_COMPUTE_HH -# define MLN_DATA_COMPUTE_HH +#ifndef MLN_DATA_COMPUTE_IN_WINDOW_HH +# define MLN_DATA_COMPUTE_IN_WINDOW_HH /// \file /// @@ -76,10 +76,13 @@ namespace mln compute_in_window_tests(const Accumulator<A>& a, const Image<I>& input_, const Window<W>& win_) { - (void) a; const W& win = exact(win_); const I& input = exact(input_); + (void) a; + (void) win; + (void) input; + mln_assertion(win.is_valid()); mln_assertion(input.is_valid()); } @@ -142,15 +145,15 @@ namespace mln internal::compute_in_window_tests(a, input, win); + extension::adjust(input, win); + border::mirror(input); + typedef mln_ch_value(I, A) J; J accu; initialize(accu, input); accu::image::init(accu); - extension::adjust(input, win); - border::mirror(input); - mln_pixter(J) p(accu); mln_qixter(J, W) q(p, win); @@ -245,4 +248,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_DATA_COMPUTE_HH +#endif // ! MLN_DATA_COMPUTE_IN_WINDOW_HH -- 1.7.2.5