Commit a903e8da authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

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'.
parent 696503df
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.
......@@ -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
......
......@@ -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)
......
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment