summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2012-03-11 02:41:55 +0100
committerJeremy Huddleston <jeremyhu@apple.com>2012-03-10 23:07:07 -0800
commit84b8b5b46773f9b686d57f28092824b86bffed9d (patch)
tree6ff31230825e3fb33a27d3fa793f0640b0a1fb2d
parentb543efafefb71fb1f87ee9c1c261e86c8ca29e76 (diff)
downloadxorg-lib-libXft-84b8b5b46773f9b686d57f28092824b86bffed9d.tar.gz
Fixup for 550b2f76401c2 which broke bold fonts
The commit removed the line AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden) but failed to remove the #if lines that this commit removes, resulting in that code never being executed. Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280 Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/xftglyphs.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/xftglyphs.c b/src/xftglyphs.c
index 4a3b9d6..2f3dc5a 100644
--- a/src/xftglyphs.c
+++ b/src/xftglyphs.c
@@ -24,9 +24,7 @@
#include <freetype/ftoutln.h>
#include <freetype/ftlcdfil.h>
-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
#include <freetype/ftsynth.h>
-#endif
/*
* Validate the memory info for a font
@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display *dpy,
glyphslot = face->glyph;
-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
/*
* Embolden if required
*/
if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
-#endif
/*
* Compute glyph metrics from FreeType information