From bf43767531f385246642267efcbd6e3e73a09926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 20 Nov 2019 17:12:54 +0100 Subject: [PATCH] doc: mark these as new in 2019.10. --- src/Magnum/Image.h | 20 ++++++++++++++------ src/Magnum/Trade/ImageData.h | 20 ++++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/Magnum/Image.h b/src/Magnum/Image.h index a334c0d96..eab6aa2e5 100644 --- a/src/Magnum/Image.h +++ b/src/Magnum/Image.h @@ -315,12 +315,16 @@ template class Image { /** @brief Move assignment */ Image& operator=(Image&& other) noexcept; - /** @brief Conversion to view */ + /** @brief Conversion to a view */ + /*implicit*/ operator BasicImageView() const; + + /** + * @brief Conversion to a mutable view + * @m_since{2019,10} + */ /* Not restricted to const&, because we might want to pass the view to another function in an oneliner (e.g. saving screenshot) */ /*implicit*/ operator BasicMutableImageView(); - /** @overload */ - /*implicit*/ operator BasicImageView() const; /** @brief Storage of pixel data */ PixelStorage storage() const { return _storage; } @@ -591,12 +595,16 @@ template class CompressedImage { /** @brief Move assignment */ CompressedImage& operator=(CompressedImage&& other) noexcept; - /** @brief Conversion to view */ + /** @brief Conversion to a view */ + /*implicit*/ operator BasicCompressedImageView() const; + + /** + * @brief Conversion to a mutable view + * @m_since{2019,10} + */ /* Not restricted to const&, because we might want to pass the view to another function in an oneliner (e.g. saving screenshot) */ /*implicit*/ operator BasicMutableCompressedImageView(); - /** @overload */ - /*implicit*/ operator BasicCompressedImageView() const; /** @brief Storage of compressed pixel data */ CompressedPixelStorage storage() const { return _storage; } diff --git a/src/Magnum/Trade/ImageData.h b/src/Magnum/Trade/ImageData.h index a59fb1d56..b5cbc471b 100644 --- a/src/Magnum/Trade/ImageData.h +++ b/src/Magnum/Trade/ImageData.h @@ -230,29 +230,37 @@ template class ImageData { bool isCompressed() const { return _compressed; } /** - * @brief Conversion to view + * @brief Conversion to a view * * The image is expected to be uncompressed. * @see @ref isCompressed() */ /* Not restricted to const&, because we might want to pass the view to another function in an oneliner (e.g. saving screenshot) */ - /*implicit*/ operator BasicMutableImageView(); - /** @overload */ /*implicit*/ operator BasicImageView() const; /** - * @brief Conversion to compressed view + * @brief Conversion to a mutable view + * @m_since{2019,10} + */ + /*implicit*/ operator BasicMutableImageView(); + + /** + * @brief Conversion to a compressed view * * The image is expected to be compressed. * @see @ref isCompressed() */ /* Not restricted to const&, because we might want to pass the view to another function in an oneliner (e.g. saving screenshot) */ - /*implicit*/ operator BasicMutableCompressedImageView(); - /** @overload */ /*implicit*/ operator BasicCompressedImageView() const; + /** + * @brief Conversion to a mutable compressed view + * @m_since{2019,10} + */ + /*implicit*/ operator BasicMutableCompressedImageView(); + /** * @brief Storage of pixel data *