Browse Source

Return a const& from CompressedImage[View]::size() as well.

Ahem, missed those in 36ee7835d6. 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.
pull/578/head
Vladimír Vondruš 4 years ago
parent
commit
e422a8a2e0
  1. 8
      doc/changelog.dox
  2. 4
      src/Magnum/Image.h
  3. 4
      src/Magnum/ImageView.h

8
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

4
src/Magnum/Image.h

@ -620,7 +620,7 @@ template<UnsignedInt dimensions> class CompressedImage {
CompressedPixelFormat format() const { return _format; }
/** @brief Image size in pixels */
VectorTypeFor<dimensions, Int> size() const { return _size; }
const VectorTypeFor<dimensions, Int>& size() const { return _size; }
/**
* @brief Compressed image data properties
@ -695,7 +695,7 @@ template<UnsignedInt dimensions> class CompressedImage {
CompressedPixelStorage _storage;
CompressedPixelFormat _format;
Math::Vector<Dimensions, Int> _size;
VectorTypeFor<dimensions, Int> _size;
Containers::Array<char> _data;
};

4
src/Magnum/ImageView.h

@ -776,7 +776,7 @@ template<UnsignedInt dimensions, class T> class CompressedImageView {
CompressedPixelFormat format() const { return _format; }
/** @brief Image size in pixels */
constexpr VectorTypeFor<dimensions, Int> size() const { return _size; }
constexpr const VectorTypeFor<dimensions, Int>& size() const { return _size; }
/**
* @brief Compressed image data properties
@ -822,7 +822,7 @@ template<UnsignedInt dimensions, class T> class CompressedImageView {
CompressedPixelStorage _storage;
CompressedPixelFormat _format;
Math::Vector<Dimensions, Int> _size;
VectorTypeFor<dimensions, Int> _size;
Containers::ArrayView<Type> _data;
};

Loading…
Cancel
Save