From a0dc49b57520f9a41ab58d23f6ae378249488c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 23 Jul 2015 14:53:49 +0200 Subject: [PATCH] Doc++ --- src/Magnum/BufferImage.h | 5 ++--- src/Magnum/CubeMapTexture.h | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Magnum/BufferImage.h b/src/Magnum/BufferImage.h index eedb32651..344367fec 100644 --- a/src/Magnum/BufferImage.h +++ b/src/Magnum/BufferImage.h @@ -62,8 +62,7 @@ template class BufferImage: public AbstractImage { * @param data Image data * @param usage Image buffer usage * - * Note that the image data are not copied on construction, but they - * are deleted on class destruction. + * The data are *not* deleted after filling the buffer. * @todo Make it more flexible (usable with * @extension{ARB,buffer_storage}, avoiding relocations...) */ @@ -110,7 +109,7 @@ template class BufferImage: public AbstractImage { * @param data Image data * @param usage Image buffer usage * - * Updates the image buffer with given data. The data are not deleted + * Updates the image buffer with given data. The data are *not* deleted * after filling the buffer. * @see @ref Buffer::setData() * @todo Make it more flexible (usable with diff --git a/src/Magnum/CubeMapTexture.h b/src/Magnum/CubeMapTexture.h index 76bc1eaaf..60b9b243a 100644 --- a/src/Magnum/CubeMapTexture.h +++ b/src/Magnum/CubeMapTexture.h @@ -443,7 +443,7 @@ class MAGNUM_EXPORT CubeMapTexture: public AbstractTexture { * @ref imageSize(). * @see @fn_gl2{GetTextureLevelParameter,GetTexLevelParameter} with * @def_gl{TEXTURE_WIDTH}, @def_gl{TEXTURE_HEIGHT}, then - * @fn_gl{GetTextureImage} + * @fn_gl2{GetTextureImage,GetTexImage} * @requires_gl45 Extension @extension{ARB,direct_state_access} * @requires_gl Texture image queries are not available in OpenGL ES or * WebGL. See @ref Framebuffer::read() for possible workaround. @@ -625,8 +625,8 @@ class MAGNUM_EXPORT CubeMapTexture: public AbstractTexture { * @brief Set image subdata * @param level Mip level * @param offset Offset where to put data in the texture - * @param image @ref Image, @ref ImageReference or - * @ref Trade::ImageData of the same dimension count + * @param image @ref Image3D, @ref ImageReference3D or + * @ref Trade::ImageData3D * @return Reference to self (for method chaining) * * @see @ref setStorage(), @fn_gl2{TextureSubImage3D,TexSubImage3D}