* mln/fun/v2v/saturate.hh: Add a missing include. * mln/subsampling/antialiased.hh: Increment pointer after the call to convert::from_to. * tests/subsampling/antialiased.cc: Fix references according to last changes on 'round factor'. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/fun/v2v/saturate.hh | 1 + milena/mln/subsampling/antialiased.hh | 3 ++- milena/tests/subsampling/antialiased.cc | 10 +++++----- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2aec6aa..5ae192f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2010-08-11 Guillaume Lazzara <z@lrde.epita.fr> + Fix more tests in Milena. + + * mln/fun/v2v/saturate.hh: Add a missing include. + + * mln/subsampling/antialiased.hh: Increment pointer after the call + to convert::from_to. + + * tests/subsampling/antialiased.cc: Fix references according to + last changes on 'round factor'. + +2010-08-11 Guillaume Lazzara <z@lrde.epita.fr> + Fix warnings with g++-4.1 in Milena. * mln/fun/v2v/saturate.hh, diff --git a/milena/mln/fun/v2v/saturate.hh b/milena/mln/fun/v2v/saturate.hh index 0b73269..3c38062 100644 --- a/milena/mln/fun/v2v/saturate.hh +++ b/milena/mln/fun/v2v/saturate.hh @@ -36,6 +36,7 @@ # include <mln/metal/converts_to.hh> # include <mln/trait/value_.hh> # include <mln/value/cast.hh> +# include <mln/convert/from_to.hh> namespace mln diff --git a/milena/mln/subsampling/antialiased.hh b/milena/mln/subsampling/antialiased.hh index f6f2c1d..cb6bbca 100644 --- a/milena/mln/subsampling/antialiased.hh +++ b/milena/mln/subsampling/antialiased.hh @@ -194,7 +194,8 @@ namespace mln for (unsigned k = 0; k < factor; ++k) s += *ptrs[j]++; - convert::from_to((s + factor_round) / factor_2, *po++); + convert::from_to((s + factor_round) / factor_2, *po); + ++po; } for (unsigned j = 0; j < factor; ++j) diff --git a/milena/tests/subsampling/antialiased.cc b/milena/tests/subsampling/antialiased.cc index 871a063..769f03f 100644 --- a/milena/tests/subsampling/antialiased.cc +++ b/milena/tests/subsampling/antialiased.cc @@ -40,13 +40,13 @@ int main() using namespace mln; using namespace mln::value; - int_u8 refgl[3][3] = { { 123, 152, 115 }, + int_u8 refgl[3][3] = { { 124, 153, 116 }, { 105, 116, 158 }, - { 92, 136, 106 } }; + { 93, 136, 106 } }; - rgb8 refrgb[3][3] = { { rgb8(197, 93, 91), rgb8(206, 131, 127), rgb8(170, 94, 101) }, - { rgb8(163, 78, 95), rgb8(173, 90, 105), rgb8(203, 143, 127) }, - { rgb8(135, 70, 96), rgb8(201, 111, 109), rgb8(158, 80, 90) } }; + rgb8 refrgb[3][3] = { { rgb8(197, 93, 92), rgb8(206, 131, 128), rgb8(171, 94, 101) }, + { rgb8(164, 78, 96), rgb8(174, 91, 105), rgb8(204, 143, 128) }, + { rgb8(135, 70, 96), rgb8(201, 112, 109), rgb8(159, 80, 90) } }; image2d<int_u8> refgl_ima = make::image(refgl); image2d<rgb8> refrgb_ima = make::image(refrgb); -- 1.5.6.5