assume default format does not equal Format_None in QFontEngineFT::loadGlyph()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-12-25 01:14:34 +02:00
parent 8a1f8d5abf
commit f6204c0552

View file

@ -564,14 +564,8 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(glyph_t glyph,
GlyphFormat format, GlyphFormat format,
bool fetchMetricsOnly) const bool fetchMetricsOnly) const
{ {
// Q_ASSERT(freetype->lock == 1);
if (format == Format_None) { if (format == Format_None) {
if (defaultFormat != Format_None) { format = defaultFormat;
format = defaultFormat;
} else {
format = Format_Mono;
}
} }
Glyph *g = defaultGlyphSet.getGlyph(glyph); Glyph *g = defaultGlyphSet.getGlyph(glyph);