diff options
author | Trond Kjernåsen <trond@trolltech.com> | 2009-08-20 11:19:09 (GMT) |
---|---|---|
committer | Trond Kjernåsen <trond@trolltech.com> | 2009-08-20 11:21:06 (GMT) |
commit | 80ce368eec04bea154846dbf0f3f333089a5a015 (patch) | |
tree | 2b8b7e1b949f76cd657019d5a7a16e700947de80 | |
parent | 4a212d6c2ae82a1c5b7c9395e5a84dad8dd0b24c (diff) | |
download | Qt-80ce368eec04bea154846dbf0f3f333089a5a015.zip Qt-80ce368eec04bea154846dbf0f3f333089a5a015.tar.gz Qt-80ce368eec04bea154846dbf0f3f333089a5a015.tar.bz2 |
Fixed an assert in debug mode when drawing text with the
GL 2 engine on embedded.
Worked in release because we don't really use any internals in QDataBuffer
that sets the internal size correctly.
Reviewed-by: Samuel
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 34f7e7a..5b6a714 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -246,6 +246,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height) #ifdef QT_OPENGL_ES_2 QDataBuffer<uchar> buffer(4*oldWidth*oldHeight); + buffer.resize(4*oldWidth*oldHeight); glReadPixels(0, 0, oldWidth, oldHeight, GL_RGBA, GL_UNSIGNED_BYTE, buffer.data()); // do an in-place conversion from GL_RGBA to GL_ALPHA |