* mln/core/internal/check/image_fastest.hh: Fix an issue with ICC. * mln/make/box3d.hh: Fix an invalid inline (gcc-3.3). * mln/make/win_chamfer.hh: Fix a warning (gcc-3.3). --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/internal/check/image_fastest.hh | 2 +- milena/mln/make/box3d.hh | 12 ++++++------ milena/mln/make/win_chamfer.hh | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6c34ae1..4613180 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2009-06-08 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + + Fix few compiler specific issues. + + * mln/core/internal/check/image_fastest.hh: Fix an issue with ICC. + + * mln/make/box3d.hh: Fix an invalid inline (gcc-3.3). + + * mln/make/win_chamfer.hh: Fix a warning (gcc-3.3). + 2009-06-05 Edwin Carlinet <carlinet@lrde.epita.fr> Move min, max, min_h, max_h, min_max accus in accu/stat. diff --git a/milena/mln/core/internal/check/image_fastest.hh b/milena/mln/core/internal/check/image_fastest.hh index 7acfbd8..bf07f27 100644 --- a/milena/mln/core/internal/check/image_fastest.hh +++ b/milena/mln/core/internal/check/image_fastest.hh @@ -121,7 +121,7 @@ namespace mln unsigned (E::*m8)() const = & E::nelements; m8 = 0; -# if defined(__GNUC__) && __GNUC__ >= 3 +# if (defined(__GNUC__) && __GNUC__ >= 3) || !defined(__INTEL_COMPILER) unsigned (E::*m9)(const psite& p) const = & E::index_of_point; m9 = 0; # endif diff --git a/milena/mln/make/box3d.hh b/milena/mln/make/box3d.hh index 9941eb5..980c0f4 100644 --- a/milena/mln/make/box3d.hh +++ b/milena/mln/make/box3d.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -72,9 +72,9 @@ namespace mln * * \return A 3D box. */ - mln::box3d box3d(def::coord min_sli, def::coord min_row, def::coord min_col, + mln::box3d box3d(def::coord min_sli, def::coord min_row, def::coord min_col, def::coord max_sli, def::coord max_row, def::coord max_col); - + # ifndef MLN_INCLUDE_ONLY @@ -89,9 +89,9 @@ namespace mln return tmp; } - mln::box3d inline - box3d(def::coord min_sli, def::coord min_row, def::coord min_col, + mln::box3d + box3d(def::coord min_sli, def::coord min_row, def::coord min_col, def::coord max_sli, def::coord max_row, def::coord max_col) { mln_precondition(max_row >= min_row && max_sli >= min_sli && max_col >= min_col); diff --git a/milena/mln/make/win_chamfer.hh b/milena/mln/make/win_chamfer.hh index c493939..a369308 100644 --- a/milena/mln/make/win_chamfer.hh +++ b/milena/mln/make/win_chamfer.hh @@ -121,7 +121,7 @@ namespace mln mln::w_window2d_float mk_chamfer_exact() { - float r2 = static_cast<float>(std::sqrt(2)); + float r2 = static_cast<float>(std::sqrt(2.0f)); float ws[] = { r2, 1, r2, 1, 0, 0, 0, 0, 0 }; -- 1.5.6.5