diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 06:24:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 06:24:08 (GMT) |
| commit | 26c6d79e21ef614b8dc6ec325b5a2a59c7027637 (patch) | |
| tree | a9f1aec4f0a78a29c58647ac45c9bb599ed3143a | |
| parent | 4074b7ff641bfc252b691d9c8bf8ae97edda4d81 (diff) | |
| parent | 1de8a46d1e11a5fe0eec80ada7592b0f16c17d06 (diff) | |
| download | Qt-26c6d79e21ef614b8dc6ec325b5a2a59c7027637.zip Qt-26c6d79e21ef614b8dc6ec325b5a2a59c7027637.tar.gz Qt-26c6d79e21ef614b8dc6ec325b5a2a59c7027637.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix missing glyphs for large fonts with QStaticText/GL/Freetype
| -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 312d66f..0ffc7af 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp @@ -306,7 +306,7 @@ void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph) // time. for (int i = 0; i < maskHeight; ++i) - glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, maskWidth, 1, GL_ALPHA, GL_UNSIGNED_BYTE, mask.scanLine(i)); + glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, qMin(c.w, maskWidth), 1, GL_ALPHA, GL_UNSIGNED_BYTE, mask.scanLine(i)); } } |