ref: 8f5568bfc4fd5fe707f0e41915b57affc1bff0e3
parent: ab6fe0768fd2a319d73adfd6cc1c8338bf2e669c
author: Alexei Podtelezhnikov <[email protected]>
date: Mon Nov 6 16:42:46 EST 2017
* src/base/ftobjs.c (FT_Load_Glyph): Relocate condition.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2017-11-01 Alexei Podtelezhnikov <[email protected]>
+2017-11-06 Alexei Podtelezhnikov <[email protected]>
+
+ * src/base/ftobjs.c (FT_Load_Glyph): Relocate condition.
+
+2017-11-06 Alexei Podtelezhnikov <[email protected]>
* src/smooth/ftgrays.c (gray_set_cell): Fix uninitialized variables.
--- 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 );
}