summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2012-03-18 11:15:40 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2012-03-18 11:15:40 +0000
commit8a86cea99876b66ec41374a360fbfd75bb9f609c (patch)
tree8f02716c56e7b69c7c5d1b9570ce6493ed81e98d
parentf8d4b68978f9fcb968c740a907b2f59529de77c3 (diff)
Merge patch from git master: Fixup for 550b2f76401c2 which broke bold fonts
-rw-r--r--lib/libXft/src/xftglyphs.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/libXft/src/xftglyphs.c b/lib/libXft/src/xftglyphs.c
index 4a3b9d606..2f3dc5a6b 100644
--- a/lib/libXft/src/xftglyphs.c
+++ b/lib/libXft/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