Browse Source

Trade: TextureData constructor was not explicit for some reason.

It's a breaking change so it's listed in the changelog, but I don't
expect anybody to actually use this constructor implicitly so all fine.
euler-xxx
Vladimír Vondruš 5 years ago
parent
commit
329ccc9db7
  1. 2
      doc/changelog.dox
  2. 2
      src/Magnum/Trade/TextureData.h

2
doc/changelog.dox

@ -566,6 +566,8 @@ See also:
interfaces, which are also @cpp const @ce and can't fail. Documentation of
each function was expanded to suggest a recommended place for potential
error handling.
- @ref Trade::TextureData constructor was not @cpp explicit @ce by mistake,
now it is
@subsection changelog-latest-documentation Documentation

2
src/Magnum/Trade/TextureData.h

@ -64,7 +64,7 @@ class TextureData {
* @param image Texture image ID
* @param importerState Importer-specific state
*/
TextureData(Type type, SamplerFilter minificationFilter, SamplerFilter magnificationFilter, SamplerMipmap mipmapFilter, Array3D<SamplerWrapping> wrapping, UnsignedInt image, const void* importerState = nullptr) noexcept: _type{type}, _minificationFilter{minificationFilter}, _magnificationFilter{magnificationFilter}, _mipmapFilter{mipmapFilter}, _wrapping{wrapping}, _image{image}, _importerState{importerState} {}
explicit TextureData(Type type, SamplerFilter minificationFilter, SamplerFilter magnificationFilter, SamplerMipmap mipmapFilter, Array3D<SamplerWrapping> wrapping, UnsignedInt image, const void* importerState = nullptr) noexcept: _type{type}, _minificationFilter{minificationFilter}, _magnificationFilter{magnificationFilter}, _mipmapFilter{mipmapFilter}, _wrapping{wrapping}, _image{image}, _importerState{importerState} {}
/** @brief Copying is not allowed */
TextureData(const TextureData&) = delete;

Loading…
Cancel
Save