diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-12-10 14:26:05 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2016-01-26 14:13:36 +0000 |
| commit | f5e02d4128bdd9fef5b0073097050cd20a90bf57 (patch) | |
| tree | b114044cf53e74d245eb25098a12e5d9f6614454 | |
| parent | 088eef57566cb59b9c3b10e218a80b0516cb7e8a (diff) | |
Avoid needless string comparison
by inlining and reordering the condition.
Change-Id: I68a91e75071975a4cc26333094db3433afbaeb72
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index aae84dc988..f20f574bc6 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -945,9 +945,10 @@ QFontEngine *loadSingleEngine(int script, // If the font data's native stretch matches the requested stretch we need to set stretch to 100 // to avoid the fontengine synthesizing stretch. If they didn't match exactly we need to calculate // the new stretch factor. This only done if not matched by styleName. - bool styleNameMatch = !request.styleName.isEmpty() && request.styleName == style->styleName; - if (!styleNameMatch && style->key.stretch != 0 && request.stretch != 0) + if (style->key.stretch != 0 && request.stretch != 0 + && (request.styleName.isEmpty() || request.styleName != style->styleName)) { def.stretch = (request.stretch * 100 + 50) / style->key.stretch; + } engine = pfdb->fontEngine(def, size->handle); if (engine) { |