Browse Source

doc: mark these as new in 2019.10.

mousecapture
Vladimír Vondruš 7 years ago
parent
commit
bf43767531
  1. 20
      src/Magnum/Image.h
  2. 20
      src/Magnum/Trade/ImageData.h

20
src/Magnum/Image.h

@ -315,12 +315,16 @@ template<UnsignedInt dimensions> class Image {
/** @brief Move assignment */ /** @brief Move assignment */
Image<dimensions>& operator=(Image<dimensions>&& other) noexcept; Image<dimensions>& operator=(Image<dimensions>&& other) noexcept;
/** @brief Conversion to view */ /** @brief Conversion to a view */
/*implicit*/ operator BasicImageView<dimensions>() const;
/**
* @brief Conversion to a mutable view
* @m_since{2019,10}
*/
/* Not restricted to const&, because we might want to pass the view to /* Not restricted to const&, because we might want to pass the view to
another function in an oneliner (e.g. saving screenshot) */ another function in an oneliner (e.g. saving screenshot) */
/*implicit*/ operator BasicMutableImageView<dimensions>(); /*implicit*/ operator BasicMutableImageView<dimensions>();
/** @overload */
/*implicit*/ operator BasicImageView<dimensions>() const;
/** @brief Storage of pixel data */ /** @brief Storage of pixel data */
PixelStorage storage() const { return _storage; } PixelStorage storage() const { return _storage; }
@ -591,12 +595,16 @@ template<UnsignedInt dimensions> class CompressedImage {
/** @brief Move assignment */ /** @brief Move assignment */
CompressedImage<dimensions>& operator=(CompressedImage<dimensions>&& other) noexcept; CompressedImage<dimensions>& operator=(CompressedImage<dimensions>&& other) noexcept;
/** @brief Conversion to view */ /** @brief Conversion to a view */
/*implicit*/ operator BasicCompressedImageView<dimensions>() const;
/**
* @brief Conversion to a mutable view
* @m_since{2019,10}
*/
/* Not restricted to const&, because we might want to pass the view to /* Not restricted to const&, because we might want to pass the view to
another function in an oneliner (e.g. saving screenshot) */ another function in an oneliner (e.g. saving screenshot) */
/*implicit*/ operator BasicMutableCompressedImageView<dimensions>(); /*implicit*/ operator BasicMutableCompressedImageView<dimensions>();
/** @overload */
/*implicit*/ operator BasicCompressedImageView<dimensions>() const;
/** @brief Storage of compressed pixel data */ /** @brief Storage of compressed pixel data */
CompressedPixelStorage storage() const { return _storage; } CompressedPixelStorage storage() const { return _storage; }

20
src/Magnum/Trade/ImageData.h

@ -230,29 +230,37 @@ template<UnsignedInt dimensions> class ImageData {
bool isCompressed() const { return _compressed; } bool isCompressed() const { return _compressed; }
/** /**
* @brief Conversion to view * @brief Conversion to a view
* *
* The image is expected to be uncompressed. * The image is expected to be uncompressed.
* @see @ref isCompressed() * @see @ref isCompressed()
*/ */
/* Not restricted to const&, because we might want to pass the view to /* Not restricted to const&, because we might want to pass the view to
another function in an oneliner (e.g. saving screenshot) */ another function in an oneliner (e.g. saving screenshot) */
/*implicit*/ operator BasicMutableImageView<dimensions>();
/** @overload */
/*implicit*/ operator BasicImageView<dimensions>() const; /*implicit*/ operator BasicImageView<dimensions>() const;
/** /**
* @brief Conversion to compressed view * @brief Conversion to a mutable view
* @m_since{2019,10}
*/
/*implicit*/ operator BasicMutableImageView<dimensions>();
/**
* @brief Conversion to a compressed view
* *
* The image is expected to be compressed. * The image is expected to be compressed.
* @see @ref isCompressed() * @see @ref isCompressed()
*/ */
/* Not restricted to const&, because we might want to pass the view to /* Not restricted to const&, because we might want to pass the view to
another function in an oneliner (e.g. saving screenshot) */ another function in an oneliner (e.g. saving screenshot) */
/*implicit*/ operator BasicMutableCompressedImageView<dimensions>();
/** @overload */
/*implicit*/ operator BasicCompressedImageView<dimensions>() const; /*implicit*/ operator BasicCompressedImageView<dimensions>() const;
/**
* @brief Conversion to a mutable compressed view
* @m_since{2019,10}
*/
/*implicit*/ operator BasicMutableCompressedImageView<dimensions>();
/** /**
* @brief Storage of pixel data * @brief Storage of pixel data
* *

Loading…
Cancel
Save