* src/base/ftobjs.c (FT_Load_Glyph): Relocate condition.

7 years ago · 8f5568bfc4
parent ab6fe0768f
commit 8f5568bfc4
2 changed files with 7 additions and 2 deletions
--- a/6
+++ b/6
@ -1,4 +1,8 @@
-2017-11-01  Alexei Podtelezhnikov  <apodtele@gmail.com>
+2017-11-06  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	* src/base/ftobjs.c (FT_Load_Glyph): Relocate condition.
+
+2017-11-06  Alexei Podtelezhnikov  <apodtele@gmail.com>

 	* 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 );
    }