diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-03-22 16:06:14 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-03-22 16:07:21 (GMT) |
| commit | 8582d3b1ad7d879dcb55124933d0d93edb47b66b (patch) | |
| tree | 6dd37592377dc713536a91368bc736dcffbbe462 | |
| parent | 037e632d4b3884d06bf9e92de77d726c75fe7898 (diff) | |
| download | Qt-8582d3b1ad7d879dcb55124933d0d93edb47b66b.zip Qt-8582d3b1ad7d879dcb55124933d0d93edb47b66b.tar.gz Qt-8582d3b1ad7d879dcb55124933d0d93edb47b66b.tar.bz2 | |
unlockFace was put in the wrong place in previous patch
Should only unlock once after the loop.
Reviewed-by: TrustMe
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index a4211a9..e90a12f 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -1694,13 +1694,13 @@ void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlag g = loadGlyph(glyphs->glyphs[i], 0, Format_None, true); glyphs->advances_x[i] = design ? QFixed::fromFixed(face->glyph->linearHoriAdvance >> 10) : QFixed::fromFixed(face->glyph->metrics.horiAdvance).round(); - if (face) - unlockFace(); } if (fontDef.styleStrategy & QFont::ForceIntegerMetrics) glyphs->advances_x[i] = glyphs->advances_x[i].round(); glyphs->advances_y[i] = 0; } + if (face) + unlockFace(); } glyph_metrics_t QFontEngineFT::boundingBox(const QGlyphLayout &glyphs) |