blob: f7a6fdbfe604746de31822bf91e72b4bd5855a75 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
|
--- qt-everywhere-opensource-src-4.8.7/src/gui/text/qfontengine_ft.cpp 2015-05-07 16:14:43.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/gui/text/qfontengine_ft_unpatched.cpp 2016-03-08 09:04:37.886893948 +0100
@@ -1603,9 +1603,7 @@
(flags & HB_ShaperFlag_UseDesignMetrics)) && FT_IS_SCALABLE(freetype->face);
for (int i = 0; i < glyphs->numGlyphs; i++) {
Glyph *g = defaultGlyphSet.getGlyph(glyphs->glyphs[i]);
- // Since we are passing Format_None to loadGlyph, use same default format logic as loadGlyph
- GlyphFormat acceptableFormat = (defaultFormat != Format_None) ? defaultFormat : Format_Mono;
- if (g && g->format == acceptableFormat) {
+ if (g) {
glyphs->advances_x[i] = design ? QFixed::fromFixed(g->linearAdvance) : QFixed(g->advance);
} else {
if (!face)
|