diff options
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index a3d0489..371db92 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -4799,8 +4799,13 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine, if (it == cache->constEnd()) { // render new glyph and put it in the cache glyph_metrics_t metrics = fontEngine->boundingBox(glyphs[i]); - int glyph_width = qRound(metrics.width.toReal())+2; - int glyph_height = qRound(fontEngine->ascent().toReal() + fontEngine->descent().toReal())+2; + QImage glyph_im(fontEngine->alphaMapForGlyph(glyphs[i])); + int glyph_width = glyph_im.width(); + int glyph_height = qRound(fontEngine->ascent().toReal() + fontEngine->descent().toReal()) + 2; + Q_ASSERT(glyph_width >= 0); + // pad the glyph width to an even number + if (glyph_width % 2 != 0) + ++glyph_width; if (font_tex->x_offset + glyph_width + x_margin > font_tex->width) { int strip_height = qt_next_power_of_two(qRound(fontEngine->ascent().toReal() + fontEngine->descent().toReal())+2); @@ -4834,13 +4839,6 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine, } } - QImage glyph_im(fontEngine->alphaMapForGlyph(glyphs[i])); - glyph_width = glyph_im.width(); - Q_ASSERT(glyph_width >= 0); - // pad the glyph width to an even number - if (glyph_width%2 != 0) - ++glyph_width; - QGLGlyphCoord *qgl_glyph = new QGLGlyphCoord; qgl_glyph->x = qreal(font_tex->x_offset) / font_tex->width; qgl_glyph->y = qreal(font_tex->y_offset) / font_tex->height; |