[Olena-patches] olena-2.0-96-g5fa4728 Fix compilation.

* tests/linear/convolve.cc, * tests/linear/convolve_2x1d.cc, * tests/linear/convolve_directional.cc: Change math::round function to fun::v2v::round. --- milena/ChangeLog | 9 +++++++++ milena/tests/linear/convolve.cc | 8 ++++---- milena/tests/linear/convolve_2x1d.cc | 6 +++--- milena/tests/linear/convolve_directional.cc | 10 +++++----- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c5042e4..db74c75 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-02-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix compilation. + + * tests/linear/convolve.cc, + * tests/linear/convolve_2x1d.cc, + * tests/linear/convolve_directional.cc: Change math::round + function to fun::v2v::round. + +2012-02-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Set up documentation groups in Milena documentation. * doc/Doxyfile.in, diff --git a/milena/tests/linear/convolve.cc b/milena/tests/linear/convolve.cc index f01096b..fda2194 100644 --- a/milena/tests/linear/convolve.cc +++ b/milena/tests/linear/convolve.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -29,7 +29,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/math/round.hh> +#include <mln/fun/v2v/round.hh> #include <mln/data/transform.hh> #include <mln/core/alias/w_window2d_float.hh> @@ -58,6 +58,6 @@ int main() w_window2d_float w_win = make::w_window2d(ws); image2d<float> tmp = linear::convolve(lena, w_win); - io::pgm::save(data::transform(tmp, math::round<int_u8>()), + io::pgm::save(data::transform(tmp, fun::v2v::round<int_u8>()), "convolve-out.pgm"); } diff --git a/milena/tests/linear/convolve_2x1d.cc b/milena/tests/linear/convolve_2x1d.cc index 17e8c45..f58e699 100644 --- a/milena/tests/linear/convolve_2x1d.cc +++ b/milena/tests/linear/convolve_2x1d.cc @@ -29,7 +29,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/math/round.hh> +#include <mln/fun/v2v/round.hh> #include <mln/data/transform.hh> #include <mln/core/alias/w_window2d_float.hh> @@ -55,7 +55,7 @@ int main() float hws[] = { w, w, w, w, w, w, w, w, w, w, w }; float vws[] = { v, v, v }; image2d<float> tmp = linear::convolve_2x1d(lena, hws, vws); - - io::pgm::save(data::transform(tmp, math::round<int_u8>()), + + io::pgm::save(data::transform(tmp, fun::v2v::round<int_u8>()), "convolve_2x1d-out.pgm"); } diff --git a/milena/tests/linear/convolve_directional.cc b/milena/tests/linear/convolve_directional.cc index 7ddb358..b4c781a 100644 --- a/milena/tests/linear/convolve_directional.cc +++ b/milena/tests/linear/convolve_directional.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -29,7 +29,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/math/round.hh> +#include <mln/fun/v2v/round.hh> #include <mln/data/transform.hh> #include <mln/core/alias/w_window2d_float.hh> @@ -52,7 +52,7 @@ int main() float w = .11f; float ws[] = { w, w, w, w, w, w, w, w, w }; image2d<float> tmp = linear::convolve_directional(lena, 1, ws); - - io::pgm::save(data::transform(tmp, math::round<int_u8>()), + + io::pgm::save(data::transform(tmp, fun::v2v::round<int_u8>()), "convolve_directional-out.pgm"); } -- 1.7.2.5