diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-03 13:40:02 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-03 13:46:02 +0300 |
commit | 56d71710d5c87047815c2f2a3686ecb01332da7c (patch) | |
tree | 4ba14151b6b0f321b1eea2a84371ce3399140679 /src/datavisualization/utils/texturehelper_p.h | |
parent | eca4f57c854874ec6e4f616e663b43675d76cff4 (diff) |
Selection fixed for Android surface
Task-number: QTRD-2368
Change-Id: I7b6bf5f16111a7dfdb49cb391b29872bf12ac8fd
Change-Id: I7b6bf5f16111a7dfdb49cb391b29872bf12ac8fd
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/utils/texturehelper_p.h')
-rw-r--r-- | src/datavisualization/utils/texturehelper_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h index e5f54d00..f7779b59 100644 --- a/src/datavisualization/utils/texturehelper_p.h +++ b/src/datavisualization/utils/texturehelper_p.h @@ -43,8 +43,7 @@ class TextureHelper : protected QOpenGLFunctions // Ownership of created texture is transferred to caller GLuint create2DTexture(const QImage &image, bool useTrilinearFiltering = false, - bool convert = true); - GLuint create2DTexture(const uchar *image, int width, int height); + bool convert = true, bool smoothScale = true); GLuint createCubeMapTexture(const QImage &image, bool useTrilinearFiltering = false); // Returns selection framebuffer and inserts generated texture id to texture parameters GLuint createSelectionBuffer(const QSize &size, GLuint &texture, GLuint &depthTexture); |