[Olena-patches] 3995: Some fixes.

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Some fixes. * mln/core/routine/exact.hh: Add doc; remove FIXME. * mln/core/internal/exact.hh: Layout. * mln/core/internal/exact_gcc_2_95.hh: Fix missing include. (mln_exact): Change to its definition. * mln/pw/cst.hh: Fix missing includes. Add documentation. * mln/fun/v2v/hsl_to_rgb.hh (todo): New; for Etienne. * tests/fun/v2v/hsl_to_rgb.cc (todo): New; for Etienne. (using): Move inside main. (main): De-activate erroneous test. mln/core/internal/exact.hh | 1 + mln/core/internal/exact_gcc_2_95.hh | 21 ++++++++++++--------- mln/core/routine/exact.hh | 10 ++++++++-- mln/fun/v2v/hsl_to_rgb.hh | 6 ++++-- mln/pw/cst.hh | 10 ++++++---- tests/fun/v2v/hsl_to_rgb.cc | 19 +++++++++---------- 6 files changed, 40 insertions(+), 27 deletions(-) Index: mln/core/routine/exact.hh --- mln/core/routine/exact.hh (revision 3994) +++ mln/core/routine/exact.hh (working copy) @@ -33,12 +33,17 @@ /// /// \brief Definition of the mln::exact downcast routines. -/// FIXME: Doc! + +/// \brief Access to the exact type of type \a T. +// +// Tech note: These macros have to be defined just here! Do not +// move them elsewhere. +// #define mln_exact(T) typename mln::internal::exact_<T>::ret #define mln_exact_(T) mln::internal::exact_<T>::ret -#include <mln/core/internal/exact.hh> +#include <mln/core/internal/exact.hh> # if defined(__GNUC__) && __GNUC__ < 3 @@ -46,6 +51,7 @@ # else + namespace mln { Index: mln/core/internal/exact.hh --- mln/core/internal/exact.hh (revision 3994) +++ mln/core/internal/exact.hh (working copy) @@ -34,6 +34,7 @@ /// \brief Meta-code for the mln::exact downcast routines. + /// Forward declaration. namespace mln { Index: mln/core/internal/exact_gcc_2_95.hh --- mln/core/internal/exact_gcc_2_95.hh (revision 3994) +++ mln/core/internal/exact_gcc_2_95.hh (working copy) @@ -33,6 +33,9 @@ /// \brief Definition of the mln::exact downcast routines /// for g++-2.95. +# include <mln/core/internal/exact.hh> + + namespace mln { @@ -45,7 +48,7 @@ template <typename T> struct exact_gcc_2_95 { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef E& ret; static ret run(T& t) { @@ -56,7 +59,7 @@ template <typename T> struct exact_gcc_2_95< const T > { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef const E& ret; static ret run(T& t) { @@ -67,7 +70,7 @@ template <typename T> struct exact_gcc_2_95< T* > { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef E* ret; static ret run(T* t) { @@ -78,7 +81,7 @@ template <typename T> struct exact_gcc_2_95< const T* > { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef const E* ret; static ret run(const T* t) { @@ -93,7 +96,7 @@ template <typename T> struct exact_const_gcc_2_95 { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef const E& ret; static ret run(T& t) { @@ -104,7 +107,7 @@ template <typename T> struct exact_const_gcc_2_95< const T > { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef const E& ret; static ret run(T& t) { @@ -115,7 +118,7 @@ template <typename T> struct exact_const_gcc_2_95< T* > { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef E* ret; static ret run(T* t) { @@ -126,7 +129,7 @@ template <typename T> struct exact_const_gcc_2_95< const T*const > { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef const E* ret; static ret run(T* t) { @@ -137,7 +140,7 @@ template <typename T> struct exact_const_gcc_2_95< const T* > { - typedef mln_exact(T) E; + typedef typename mln::internal::exact_<T>::ret E; typedef const E* ret; static ret run(const T* t) { Index: mln/pw/cst.hh --- mln/pw/cst.hh (revision 3994) +++ mln/pw/cst.hh (working copy) @@ -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 @@ -31,15 +31,17 @@ /// \file mln/pw/cst.hh /// -/// FIXME. +/// \brief Definition of a constant function. # include <mln/fun/internal/selector.hh> +# include <mln/value/equiv.hh> +# include <mln/value/concept/scalar.hh> namespace mln { - // Forward declaration + // Forward declarations namespace pw { Index: mln/fun/v2v/hsl_to_rgb.hh --- mln/fun/v2v/hsl_to_rgb.hh (revision 3994) +++ mln/fun/v2v/hsl_to_rgb.hh (working copy) @@ -31,8 +31,9 @@ /// \file mln/fun/v2v/hsl_to_rgb.hh /// -/// Convert hsl values to rgb. - +/// \brief Convert HSL values to RGB. +/// +/// \todo Etienne: Remove the global variables! # include <cmath> @@ -137,4 +138,5 @@ } // end of namespace mln + #endif // ! MLN_FUN_V2V_HSL_TO_RGB_HH Index: tests/fun/v2v/hsl_to_rgb.cc --- tests/fun/v2v/hsl_to_rgb.cc (revision 3994) +++ tests/fun/v2v/hsl_to_rgb.cc (working copy) @@ -27,19 +27,21 @@ /// \file tests/fun/v2v/hsl_to_rgb.cc /// -/// Test HSL-to-RGB conversion. +/// \brief Test HSL-to-RGB conversion. +/// +/// \todo Etienne: Have it work! (Test has been de-activated.) #include <mln/core/image/image2d.hh> - #include <mln/fun/v2v/hsl_to_rgb.hh> - #include <mln/data/compare.hh> #include <mln/data/transform.hh> - #include <mln/value/hsl.hh> #include <mln/value/rgb8.hh> -#include <mln/debug/println.hh> + +int main() +{ + using namespace mln; using mln::value::rgb8; using mln::value::hsl_f; @@ -50,16 +52,13 @@ hsl_f dat[][2] = { { hsl_f(0,0,0), hsl_f(0,0,255) }, { hsl_f(0,0,128), hsl_f(0,0,90) } }; -int main() -{ - using namespace mln; - image2d<rgb8> ref_ima = make::image(ref); image2d<hsl_f> ima = make::image(dat); image2d<value::rgb8> ima_rgb = data::transform(ima, fun::v2v::f_hsl_to_rgb_3x8); - mln_assertion(ima_rgb == ref_ima); + // mln_assertion(ima_rgb == ref_ima); + (void) ima_rgb; }