[FONT][WIN32SS] Follow-up of #1184

This commit is contained in:
Katayama Hirofumi MZ 2018-12-25 21:51:58 +09:00
parent e6cd48809a
commit be84465883

View file

@ -5813,10 +5813,13 @@ GreExtTextOutW(
{ {
glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions);
// FIXME: Use FT_LOAD_BITMAP_METRICS_ONLY or cache.
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (error) if (error)
{ {
DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); DPRINT1("Failed to load glyph! [index: %d]\n", glyph_index);
IntUnLockFreeType();
goto Cleanup;
} }
glyph = face->glyph; glyph = face->glyph;
@ -5828,6 +5831,8 @@ GreExtTextOutW(
if (!realglyph) if (!realglyph)
{ {
DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index);
IntUnLockFreeType();
goto Cleanup;
} }
/* retrieve kerning distance and move pen position */ /* retrieve kerning distance and move pen position */