[Olena-patches] olena: olena-2.0-593-g2e93271 Small fixes in existing documentation.

* mln/data/convert.hh: Remove a duplicate \overload. * mln/core/macros.hh: Fix definitions. * mln/value/qt/rgb32.hh: Fix invalid cross reference. --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/macros.hh | 16 ++++++++-------- milena/mln/data/convert.hh | 1 - milena/mln/value/qt/rgb32.hh | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 35d0b5d..31a5976 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in existing documentation. + + * mln/data/convert.hh: Remove a duplicate \overload. + + * mln/core/macros.hh: Fix definitions. + + * mln/value/qt/rgb32.hh: Fix invalid cross reference. + +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/concept/iterator.hh: Document iterator macros. 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index 25bfcc1..681abfe 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -553,7 +553,7 @@ // g /*! - \def mln_fwd_geom(T) + \def mln_geom(T) \brief Shortcuts to access the geometry type associated to T. To be used in templated functions only. @@ -561,7 +561,7 @@ \relates mln::Image */ /*! - \def mln_fwd_geom_(T) + \def mln_geom_(T) \brief Shortcuts to access the geometry type associated to T. To be used in non-templated functions only. @@ -575,7 +575,7 @@ /// \} /*! - \def mln_fwd_grid(T) + \def mln_grid(T) \brief Shortcuts to access the grid type associated to T. To be used in templated functions only. @@ -583,7 +583,7 @@ \relates mln::Image */ /*! - \def mln_fwd_grid_(T) + \def mln_grid_(T) \brief Shortcuts to access the grid type associated to T. To be used in non-templated functions only. @@ -867,7 +867,7 @@ // q /*! - \def mln_qlt_value(T) + \def mln_qlf_value(T) \brief Shortcuts to access the qualified (const or mutable) value type associated to T. @@ -876,7 +876,7 @@ \relates mln::Image */ /*! - \def mln_qlt_value_(T) + \def mln_qlf_value_(T) \brief Shortcuts to access the qualified (const or mutable) value type associated to T. @@ -1050,7 +1050,7 @@ /// \} /*! - \def mln_value(T) + \def mln_rvalue(T) \brief Shortcuts to access the value type associated to T. To be used in templated functions only. @@ -1058,7 +1058,7 @@ \relates mln::Function */ /*! - \def mln_value_(T) + \def mln_rvalue_(T) \brief Shortcuts to access the value type associated to T. To be used in non-templated functions only. diff --git a/milena/mln/data/convert.hh b/milena/mln/data/convert.hh index e186423..749458a 100644 --- a/milena/mln/data/convert.hh +++ b/milena/mln/data/convert.hh @@ -72,7 +72,6 @@ namespace mln /*! \overload \brief Convert the image \p input by changing the value type. - \overload This overload allows to specify a specific conversion function thanks to parameter \p convert_function. diff --git a/milena/mln/value/qt/rgb32.hh b/milena/mln/value/qt/rgb32.hh index 0638180..02c53a9 100644 --- a/milena/mln/value/qt/rgb32.hh +++ b/milena/mln/value/qt/rgb32.hh @@ -172,7 +172,7 @@ namespace mln QImage::Format_RGB32 or QImage::Format_ARGB32. \ingroup valuergb - \sa to_qimage_nocopy_qt_rgb32 + \sa to_qimage_nocopy to_qimage */ struct rgb32 : -- 1.7.2.5