diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 12:50:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 12:50:22 (GMT) |
| commit | d1cbe465f3b00561738e3b7dc25b20cba0e4cac8 (patch) | |
| tree | 534e3068b791e761defeeedd42436320e5056a42 | |
| parent | 901ea45ca02dc8fbbf3f6112240c4e468c240b73 (diff) | |
| parent | 3874cd95e203da40d5205ef6455d7f56cba6923a (diff) | |
| download | Qt-d1cbe465f3b00561738e3b7dc25b20cba0e4cac8.zip Qt-d1cbe465f3b00561738e3b7dc25b20cba0e4cac8.tar.gz Qt-d1cbe465f3b00561738e3b7dc25b20cba0e4cac8.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix GL glyph cache with broken-fbo-fallback
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp index 9a15260..b8576cb 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp @@ -164,7 +164,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height) if (ctx->d_ptr->workaround_brokenFBOReadBack) { QImageTextureGlyphCache::resizeTextureData(width, height); Q_ASSERT(image().depth() == 8); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, oldWidth, oldHeight, GL_ALPHA, GL_UNSIGNED_BYTE, image().constBits()); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, oldHeight, GL_ALPHA, GL_UNSIGNED_BYTE, image().constBits()); glDeleteTextures(1, &oldTexture); return; } |