[Olena-patches] olena: olena-2.0-567-gfbed673 Fix mln::value::hsl_'s dependencies.

* mln/value/hsl.hh: Here. [MLN_INCLUDE_ONLY]: Fix closing #endif statement. --- milena/ChangeLog | 7 +++++++ milena/mln/value/hsl.hh | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e48a450..93c5893 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-06-20 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Fix mln::value::hsl_'s dependencies. + + * mln/value/hsl.hh: Here. + [MLN_INCLUDE_ONLY]: Fix closing #endif statement. + +2013-06-20 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Fix mutual dependencies between value::int_u and value::qt::rgb32. * mln/value/int_u.hh: Move definitions... diff --git a/milena/mln/value/hsl.hh b/milena/mln/value/hsl.hh index 2cbcbe0..344d644 100644 --- a/milena/mln/value/hsl.hh +++ b/milena/mln/value/hsl.hh @@ -30,7 +30,6 @@ #include <mln/value/ops.hh> #include <mln/value/concept/vectorial.hh> -#include <mln/value/int_u.hh> #include <mln/algebra/vec.hh> @@ -42,6 +41,7 @@ namespace mln namespace qt { struct rgb32; } + template <unsigned n> struct int_u; template <typename H, typename S, typename L> class hsl_; } @@ -291,8 +291,9 @@ namespace mln } // end of namespace mln -// Used in from_to +// Required by mln::values::hsl_'s from_to_ routines. # include <mln/value/rgb.hh> +# include <mln/value/qt/rgb32.hh> # include <mln/fun/v2v/hsl_to_rgb.hh> @@ -425,10 +426,8 @@ namespace mln } // end of namespace mln::value +} // end of namespace mln # endif // ! MLN_INCLUDE_ONLY - -} // end of namespace mln - #endif // ! MLN_VALUE_HSL_HH -- 1.7.10.4