[freetype2] master 809d512: * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Check glyph format.

[Alexei Podtelezhnikov]

branch: master
commit 809d5125af527dd589d303cd8ae988dad58d00d6
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Check glyph format.
---
 ChangeLog         | 4 ++++
 src/base/ftobjs.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 374881e..bc086cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-30  Alexei Podtelezhnikov  <address@hidden>
+
+       * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Check glyph format.
+
 2018-08-31  Armin Hasitzka  <address@hidden>
 
        [errors] Refine the macro logic surrounding `FT_Error_String'.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 7997b67..f3d8299 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -361,8 +361,8 @@
     FT_Pos   width, height, pitch;
 
 
-    if ( slot->internal && ( slot->internal->flags & FT_GLYPH_OWN_BITMAP ) )
-      return;
+    if ( slot->format != FT_GLYPH_FORMAT_OUTLINE )
+      return 1;
 
     if ( origin )
     {