AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize QFontMetrics:: boundingRect() and left/rightBearing()

Browse Source 
by avoiding unneeded metrics calculation.
Same optimization for QFontMetricsF.

Change-Id: I7fd0caa2ddb45862ee9e9c0519a71b03bcd0cb6f
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
Konstantin Ritt 2012-07-09 04:30:28 +03:00 committed by Qt by Nokia
parent 5cf93c4352
commit 917b0df633
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/text/qfontmetrics.cpp
View File

@ -453,7 +453,7 @@ int QFontMetrics::leftBearing(QChar ch) const
QGlyphLayoutArray<10> glyphs;
int nglyphs = 9;
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, 0);
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, QFontEngine::GlyphIndicesOnly);
// ### can nglyphs != 1 happen at all? Not currently I think
qreal lb;
engine->getGlyphBearings(glyphs.glyphs[0], &lb);
@ -488,7 +488,7 @@ int QFontMetrics::rightBearing(QChar ch) const
QGlyphLayoutArray<10> glyphs;
int nglyphs = 9;
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, 0);
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, QFontEngine::GlyphIndicesOnly);
// ### can nglyphs != 1 happen at all? Not currently I think
qreal rb;
engine->getGlyphBearings(glyphs.glyphs[0], 0, &rb);
@ -706,7 +706,7 @@ QRect QFontMetrics::boundingRect(QChar ch) const
QGlyphLayoutArray<10> glyphs;
int nglyphs = 9;
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, 0);
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, QFontEngine::GlyphIndicesOnly);
glyph_metrics_t gm = engine->boundingBox(glyphs.glyphs[0]);
return QRect(qRound(gm.x), qRound(gm.y), qRound(gm.width), qRound(gm.height));
}
@ -1324,7 +1324,7 @@ qreal QFontMetricsF::leftBearing(QChar ch) const
QGlyphLayoutArray<10> glyphs;
int nglyphs = 9;
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, 0);
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, QFontEngine::GlyphIndicesOnly);
// ### can nglyphs != 1 happen at all? Not currently I think
qreal lb;
engine->getGlyphBearings(glyphs.glyphs[0], &lb);
@ -1359,7 +1359,7 @@ qreal QFontMetricsF::rightBearing(QChar ch) const
QGlyphLayoutArray<10> glyphs;
int nglyphs = 9;
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, 0);
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, QFontEngine::GlyphIndicesOnly);
// ### can nglyphs != 1 happen at all? Not currently I think
qreal rb;
engine->getGlyphBearings(glyphs.glyphs[0], 0, &rb);
@ -1494,7 +1494,7 @@ QRectF QFontMetricsF::boundingRect(QChar ch) const
QGlyphLayoutArray<10> glyphs;
int nglyphs = 9;
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, 0);
engine->stringToCMap(&ch, 1, &glyphs, &nglyphs, QFontEngine::GlyphIndicesOnly);
glyph_metrics_t gm = engine->boundingBox(glyphs.glyphs[0]);
return QRectF(gm.x.toReal(), gm.y.toReal(), gm.width.toReal(), gm.height.toReal());
}