[Olena-patches] olena: olena-2.0-597-gad20949 Merge branch 'exp/magick-improvements' into exp/TL

This is a merge commit message of the following branches: Merge: 018a18b 4376a9c milena/ChangeLog | 18 ++ milena/mln/convert/impl/from_value_to_value.hh | 44 +++--- milena/mln/io/magick/load.hh | 206 +++++++++++++++--------- milena/mln/io/magick/save.hh | 9 +- milena/mln/value/rgb.hh | 26 +++- 5 files changed, 201 insertions(+), 102 deletions(-) diff --cc milena/mln/value/rgb.hh index 1a38c18,24bf438..30941e2 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@@ -360,17 -360,11 +360,17 @@@ namespace ml namespace value { - /// \internal Conversion: rgb -> bool. + /*! + \brief Conversion: rgb -> bool. + \ingroup fromto + */ template <unsigned m> - void from_to_(const value::rgb<m>& from, bool& to); + void from_to_(const rgb<m>& from, bool& to); - /// \internal Conversion: rgb to hsl_ + /*! + \brief Conversion: rgb to hsl_ + \ingroup fromto + */ void from_to_(const rgb<16>& from, hsl_<float,float,float>& to); @@@ -381,12 -372,18 +381,21 @@@ void from_to_(const rgb<8>& from, hsl_<float,float,float>& to); - /// \internal Conversion: bool -> rgb. + /*! + \brief Conversion: bool -> rgb. + \ingroup fromto + */ template <unsigned m> - void from_to_(bool from, value::rgb<m>& to); + void from_to_(bool from, rgb<m>& to); + + /*! + \brief Conversion: rgb -> rgb. + \pre n <= m + \ingroup fromto + */ + template <unsigned n, unsigned m> + void + from_to_(const rgb<n>& from, rgb<m>& to); } // end of namespace mln::value hooks/post-receive -- Olena, a generic and efficient image processing platform