Optimize Q*FontEngine*::stringToCMap()
authorKonstantin Ritt <ritt.ks@gmail.com>
Mon, 9 Jul 2012 14:06:33 +0000 (17:06 +0300)
committerQt by Nokia <qt-info@nokia.com>
Tue, 10 Jul 2012 01:23:43 +0000 (03:23 +0200)
commit98c1eb1750498cdff9d3b26658e5e5be9c026c92
treeca8b225bcd476d526cfa5c7afd3c6e759bf3e79a
parent1db99a6250f96892362f57180b3cccfd09bf7ff4
Optimize Q*FontEngine*::stringToCMap()

by avoiding the glyph metrics calculation when those metrics weren't requested
(QFontEngine::GlyphIndicesOnly flag has been passed).

As a side effect, this fixes a crash in case QGlyphLayout
was initialized only partially (with the glyphs array and the size).

Change-Id: I7d67abc2a74683131361fa21f8be203f61f247bc
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
src/gui/text/qfontengine.cpp
src/gui/text/qfontengine_qpa.cpp
src/gui/text/qfontengine_qpf.cpp