[Olena-patches] 4182: Fix compilation warnings.

* mln/core/image/vmorph/fun_image.hh: move inline keyword before return type. * mln/fun/v2v/hsl_to_rgb.hh: pass float arguments to sqrt. * tests/core/routine/exact.cc: avoid a warning. --- milena/ChangeLog | 11 +++++++++++ milena/mln/core/image/vmorph/fun_image.hh | 6 +++--- milena/mln/fun/v2v/hsl_to_rgb.hh | 9 +++++---- milena/tests/core/routine/exact.cc | 5 ++++- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d12ed5c..289810b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-23 Guillaume Lazzara &lt;guillaume.lazzara(a)lrde.epita.fr&gt; + Fix compilation warnings. + + * mln/core/image/vmorph/fun_image.hh: move inline keyword before + return type. + + * mln/fun/v2v/hsl_to_rgb.hh: pass float arguments to sqrt. + + * tests/core/routine/exact.cc: avoid a warning. + +2009-06-23 Guillaume Lazzara &lt;guillaume.lazzara(a)lrde.epita.fr&gt; + Update list of non distributed files. * mln/accu/math/all.hh: strip inclusion of non distributed files. diff --git a/milena/mln/core/image/vmorph/fun_image.hh b/milena/mln/core/image/vmorph/fun_image.hh index 27c85f3..3934725 100644 --- a/milena/mln/core/image/vmorph/fun_image.hh +++ b/milena/mln/core/image/vmorph/fun_image.hh @@ -84,7 +84,7 @@ namespace mln trait::image::quant::high, // Else undef) - ) + ) quant; }; @@ -142,14 +142,14 @@ namespace mln fun_image<F, I> operator << (const Function_v2v<F>& f, const Image<I>& ima); - + # ifndef MLN_INCLUDE_ONLY template <typename F, typename I> - fun_image<F, I> inline + fun_image<F, I> operator << (const Function_v2v<F>& f, const Image<I>& ima) { fun_image<F, I> tmp(exact(f), exact(ima)); diff --git a/milena/mln/fun/v2v/hsl_to_rgb.hh b/milena/mln/fun/v2v/hsl_to_rgb.hh index 2fd5fb8..ebc33d5 100644 --- a/milena/mln/fun/v2v/hsl_to_rgb.hh +++ b/milena/mln/fun/v2v/hsl_to_rgb.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -106,9 +107,9 @@ namespace mln static math::round<blue_t> to_b; static const float - sqrt3_3 = std::sqrt(3) / 3, - inv_sqrt6 = 1 / std::sqrt(6), - inv_sqrt2 = 1 / std::sqrt(2); + sqrt3_3 = std::sqrt(3.0f) / 3.0f, + inv_sqrt6 = 1 / std::sqrt(6.0f), + inv_sqrt2 = 1 / std::sqrt(2.0f); float h = hsl.hue() / 180.0 * 3.1415, diff --git a/milena/tests/core/routine/exact.cc b/milena/tests/core/routine/exact.cc index d26bfcf..fd95929 100644 --- a/milena/tests/core/routine/exact.cc +++ b/milena/tests/core/routine/exact.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,10 +43,12 @@ namespace mln void m() { int** i = exact(this)->m_impl(); + (void) i; } void m() const { int* i = exact(this)->m_impl(); + (void) i; } }; -- 1.5.6.5