[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 8f5568b: * src/base/ftobjs.c (FT_Load_Glyph): Relocat
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2] master 8f5568b: * src/base/ftobjs.c (FT_Load_Glyph): Relocate condition. |
Date: |
Mon, 6 Nov 2017 21:43:26 -0500 (EST) |
branch: master
commit 8f5568bfc4fd5fe707f0e41915b57affc1bff0e3
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
* 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 620cebc..1ce5029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2017-11-01 Alexei Podtelezhnikov <address@hidden>
+2017-11-06 Alexei Podtelezhnikov <address@hidden>
+
+ * src/base/ftobjs.c (FT_Load_Glyph): Relocate condition.
+
+2017-11-06 Alexei Podtelezhnikov <address@hidden>
* src/smooth/ftgrays.c (gray_set_cell): Fix uninitialized variables.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 5108253..c85d060 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 );
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 8f5568b: * src/base/ftobjs.c (FT_Load_Glyph): Relocate condition.,
Alexei Podtelezhnikov <=