diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-07 07:59:50 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-12 07:43:15 +0000 |
| commit | fd826c112e01226f40bbfad7e20bdb5461b7ace6 (patch) | |
| tree | d2bb1def4c7072243e8a06e4d43b4b1098f21076 /src/gui | |
| parent | 69504803a9b73140644f2b746689667edde6a773 (diff) | |
[QFontEngineFT] Fix alphamap creation for a cached glyph with no data
In case the loadGlyph() was called for a glyph to fetch metrics only,
loadGlyphFor() never fetches the data for that glyph
but returns a non-null result.
Change-Id: I2b258c4b7880059d41dc02f1e5a43903706d3888
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 630161ee28..8ae178c6ad 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -1844,7 +1844,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyphFor(glyph_t g, return 0; Glyph *glyph = glyphSet != 0 ? glyphSet->getGlyph(g, subPixelPosition) : 0; - if (!glyph || glyph->format != format) { + if (!glyph || glyph->format != format || (!fetchBoundingBox && !glyph->data)) { lockFace(); FT_Matrix m = this->matrix; FT_Matrix ftMatrix = glyphSet != 0 ? glyphSet->transformationMatrix : QTransformToFTMatrix(t); |