[Olena-patches] 4150: Small fixes.

* mln/accu/math/inf.hh, * mln/accu/math/sup.hh, * mln/accu/shape/height.hh, * mln/accu/shape/volume.hh, * mln/accu/stat/median_alt.hh, * mln/value/stack.hh: fix invalid namespace closing. * mln/util/internal/graph_iter.hh, * mln/fun/v2v/rgb_to_hsl.hh: fix ambiguities with operators. * mln/value/internal/gray_f.hh: repair header. * tests/registration/Makefile.am: disable registration test. --- milena/ChangeLog | 18 ++++++++++++++++++ milena/mln/accu/math/inf.hh | 4 ++-- milena/mln/accu/math/sup.hh | 4 ++-- milena/mln/accu/shape/height.hh | 7 ++++--- milena/mln/accu/shape/volume.hh | 4 ++-- milena/mln/accu/stat/median_alt.hh | 6 +++--- milena/mln/fun/v2v/rgb_to_hsl.hh | 5 +++-- milena/mln/util/internal/graph_iter.hh | 8 ++++---- milena/mln/value/internal/gray_f.hh | 3 ++- milena/mln/value/stack.hh | 7 ++++--- milena/tests/registration/Makefile.am | 6 +++--- 11 files changed, 47 insertions(+), 25 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a7d79fa..7289e4b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,21 @@ +2009-06-16 Guillaume Lazzara &lt;guillaume.lazzara(a)lrde.epita.fr&gt; + + Small fixes. + + * mln/accu/math/inf.hh, + * mln/accu/math/sup.hh, + * mln/accu/shape/height.hh, + * mln/accu/shape/volume.hh, + * mln/accu/stat/median_alt.hh, + * mln/value/stack.hh: fix invalid namespace closing. + + * mln/util/internal/graph_iter.hh, + * mln/fun/v2v/rgb_to_hsl.hh: fix ambiguities with operators. + + * mln/value/internal/gray_f.hh: repair header. + + * tests/registration/Makefile.am: disable registration test. + 2009-06-15 Edwin Carlinet &lt;carlinet(a)lrde.epita.fr&gt; Move inf and sup accumulators into math directory. diff --git a/milena/mln/accu/math/inf.hh b/milena/mln/accu/math/inf.hh index e2bcfef..17780b9 100644 --- a/milena/mln/accu/math/inf.hh +++ b/milena/mln/accu/math/inf.hh @@ -166,10 +166,10 @@ namespace mln return true; } -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu::math +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::accu } // end of namespace mln diff --git a/milena/mln/accu/math/sup.hh b/milena/mln/accu/math/sup.hh index b4eb2d2..7ebcff2 100644 --- a/milena/mln/accu/math/sup.hh +++ b/milena/mln/accu/math/sup.hh @@ -168,10 +168,10 @@ namespace mln return true; } -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu::math +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::accu } // end of namespace mln diff --git a/milena/mln/accu/shape/height.hh b/milena/mln/accu/shape/height.hh index c3874de..596ccb8 100644 --- a/milena/mln/accu/shape/height.hh +++ b/milena/mln/accu/shape/height.hh @@ -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. // @@ -200,10 +201,10 @@ namespace mln return true; } -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu::shape +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::accu } // end of namespace mln diff --git a/milena/mln/accu/shape/volume.hh b/milena/mln/accu/shape/volume.hh index 6feb5bc..dbfc020 100644 --- a/milena/mln/accu/shape/volume.hh +++ b/milena/mln/accu/shape/volume.hh @@ -217,10 +217,10 @@ namespace mln return true; } -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu::shape +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::accu } // end of namespace mln diff --git a/milena/mln/accu/stat/median_alt.hh b/milena/mln/accu/stat/median_alt.hh index 8cfa39c..e22d4d6 100644 --- a/milena/mln/accu/stat/median_alt.hh +++ b/milena/mln/accu/stat/median_alt.hh @@ -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. // @@ -326,11 +327,10 @@ namespace mln return ostr << m.to_result(); } + } // end of namespace mln::accu::stat # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu::stat - } // end of namespace mln::accu } // end of namespace mln diff --git a/milena/mln/fun/v2v/rgb_to_hsl.hh b/milena/mln/fun/v2v/rgb_to_hsl.hh index 6619c60..11b4f38 100644 --- a/milena/mln/fun/v2v/rgb_to_hsl.hh +++ b/milena/mln/fun/v2v/rgb_to_hsl.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. // @@ -102,7 +103,7 @@ namespace mln else hsl.hue() = (60. * (rgb.red() - rgb.green()) / (rmax - rmin)) + 240; - hsl.lum() = ((double) rmax + rmin) / 2; + hsl.lum() = ((double) rmax + (double) rmin) / 2; // We want min and max between 0 and 1 rmax -= mln_min(typename T_rgb::red_t); diff --git a/milena/mln/util/internal/graph_iter.hh b/milena/mln/util/internal/graph_iter.hh index a5c3e9c..09e0bb4 100644 --- a/milena/mln/util/internal/graph_iter.hh +++ b/milena/mln/util/internal/graph_iter.hh @@ -189,7 +189,7 @@ namespace mln util::vertex_id_t vertex_fwd_iterator<G>::next_id_() const { - return this->p_.id() + 1; + return this->p_.id().value() + 1; } @@ -224,7 +224,7 @@ namespace mln util::vertex_id_t vertex_bkd_iterator<G>::next_id_() const { - return this->p_.id() - 1; + return this->p_.id().value() - 1; } @@ -259,7 +259,7 @@ namespace mln util::edge_id_t edge_fwd_iterator<G>::next_id_() const { - return this->p_.id() + 1; + return this->p_.id().value() + 1; } @@ -294,7 +294,7 @@ namespace mln util::edge_id_t edge_bkd_iterator<G>::next_id_() const { - return this->p_.id() - 1; + return this->p_.id().value() - 1; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/value/internal/gray_f.hh b/milena/mln/value/internal/gray_f.hh index c1f9f9c..0408ae4 100644 --- a/milena/mln/value/internal/gray_f.hh +++ b/milena/mln/value/internal/gray_f.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/value/stack.hh b/milena/mln/value/stack.hh index 93c893f..1782c1c 100644 --- a/milena/mln/value/stack.hh +++ b/milena/mln/value/stack.hh @@ -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. // @@ -323,10 +324,10 @@ namespace mln return imas; } -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::value +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am index f2a953c..79372c7 100644 --- a/milena/tests/registration/Makefile.am +++ b/milena/tests/registration/Makefile.am @@ -20,9 +20,9 @@ include $(top_srcdir)/milena/tests/tests.mk #<<lrde -# FIXME: Not distributed (yet). -check_PROGRAMS = registration -registration_SOURCES = registration.cc +# FIXME: Not distributed (yet) and currently disabled. +# check_PROGRAMS = registration +# registration_SOURCES = registration.cc #>> TESTS = $(check_PROGRAMS) -- 1.5.6.5