From 8f5568bfc4fd5fe707f0e41915b57affc1bff0e3 Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Mon, 6 Nov 2017 21:42:46 -0500 Subject: [PATCH] * src/base/ftobjs.c (FT_Load_Glyph): Relocate condition. --- ChangeLog | 6 +++++- src/base/ftobjs.c | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 620cebc24..1ce5029a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2017-11-01 Alexei Podtelezhnikov +2017-11-06 Alexei Podtelezhnikov + + * src/base/ftobjs.c (FT_Load_Glyph): Relocate condition. + +2017-11-06 Alexei Podtelezhnikov * src/smooth/ftgrays.c (gray_set_cell): Fix uninitialized variables. diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 510825359..c85d06003 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -982,6 +982,7 @@ /* do we need to render the image or preset the bitmap now? */ if ( !error && + ( load_flags & FT_LOAD_NO_SCALE ) == 0 && slot->format != FT_GLYPH_FORMAT_BITMAP && slot->format != FT_GLYPH_FORMAT_COMPOSITE ) { @@ -994,7 +995,7 @@ if ( load_flags & FT_LOAD_RENDER ) error = FT_Render_Glyph( slot, mode ); - else if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 ) + else ft_glyphslot_preset_bitmap( slot, mode, NULL ); }