From e422a8a2e0b9374a6b8f6f7542196a999baaf8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 24 Jun 2022 10:57:34 +0200 Subject: [PATCH] Return a const& from CompressedImage[View]::size() as well. Ahem, missed those in 36ee7835d6570b5eb90a11877afa5d9a78284395. Yes, putting compressed images into atlases is a desirable thing to do as well, although it's now rather shitty due to lack of slicing. --- doc/changelog.dox | 8 ++++---- src/Magnum/Image.h | 4 ++-- src/Magnum/ImageView.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index a422bda3a..a3e1597ec 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -331,10 +331,10 @@ See also: - @ref MeshIndexType was enlarged to 32 bits and can now wrap implementation-specific values similar to @ref PixelFormat, @ref CompressedPixelFormat, @ref VertexFormat and @ref MeshPrimitive -- @ref Image::size(), @ref ImageView::size() as well as - @ref Trade::ImageData::size() now return a @cpp const& @ce instead of a - value to allow creating a @relativeref{Corrade,Containers::StridedArrayView} - slice onto this member. +- @ref Image::size(), @ref CompressedImage::size(), @ref ImageView::size(), + @ref CompressedImageView::size() as well as @ref Trade::ImageData::size() + now return a @cpp const& @ce instead of a value to allow creating a + @relativeref{Corrade,Containers::StridedArrayView} slice onto this member. @subsubsection changelog-latest-changes-debugtools DebugTools library diff --git a/src/Magnum/Image.h b/src/Magnum/Image.h index 9b5d86d82..10a332342 100644 --- a/src/Magnum/Image.h +++ b/src/Magnum/Image.h @@ -620,7 +620,7 @@ template class CompressedImage { CompressedPixelFormat format() const { return _format; } /** @brief Image size in pixels */ - VectorTypeFor size() const { return _size; } + const VectorTypeFor& size() const { return _size; } /** * @brief Compressed image data properties @@ -695,7 +695,7 @@ template class CompressedImage { CompressedPixelStorage _storage; CompressedPixelFormat _format; - Math::Vector _size; + VectorTypeFor _size; Containers::Array _data; }; diff --git a/src/Magnum/ImageView.h b/src/Magnum/ImageView.h index f644e557b..e6bd75a65 100644 --- a/src/Magnum/ImageView.h +++ b/src/Magnum/ImageView.h @@ -776,7 +776,7 @@ template class CompressedImageView { CompressedPixelFormat format() const { return _format; } /** @brief Image size in pixels */ - constexpr VectorTypeFor size() const { return _size; } + constexpr const VectorTypeFor& size() const { return _size; } /** * @brief Compressed image data properties @@ -822,7 +822,7 @@ template class CompressedImageView { CompressedPixelStorage _storage; CompressedPixelFormat _format; - Math::Vector _size; + VectorTypeFor _size; Containers::ArrayView _data; };