From 70b45632204431300bf6acf91a48860ec37ae7af Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 1 Mar 2005 21:34:09 +0000 Subject: Delete FC_SPACING value out of pattern before passing it to Xft, to 2005-03-01 Owen Taylor * pango/pangoxft-font.c (xft_font_get_font): Delete FC_SPACING value out of pattern before passing it to Xft, to prevent Xft clipping characters and trashing metrics. (#164879, Billy Biggs) --- ChangeLog | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ pango/pangoxft-font.c | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 381ecd6d..39c78de0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-03-01 Owen Taylor + + * pango/pangoxft-font.c (xft_font_get_font): Delete + FC_SPACING value out of pattern before passing it + to Xft, to prevent Xft clipping characters and + trashing metrics. (#164879, Billy Biggs) + 2005-03-01 Owen Taylor Build fixes from Andrew P. Lentvorski, Jr, #164655 diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 381ecd6d..39c78de0 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +2005-03-01 Owen Taylor + + * pango/pangoxft-font.c (xft_font_get_font): Delete + FC_SPACING value out of pattern before passing it + to Xft, to prevent Xft clipping characters and + trashing metrics. (#164879, Billy Biggs) + 2005-03-01 Owen Taylor Build fixes from Andrew P. Lentvorski, Jr, #164655 diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 632ec433..c8fab24c 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -381,9 +381,12 @@ xft_font_get_font (PangoFont *font) if (xfont->xft_font == NULL) { + FcPattern *pattern = FcPatternDuplicate (fcfont->font_pattern); + FcPatternDel (pattern, FC_SPACING); + _pango_xft_font_map_get_info (fcfont->fontmap, &display, &screen); - xfont->xft_font = XftFontOpenPattern (display, FcPatternDuplicate (fcfont->font_pattern)); + font->xft_font = XftFontOpenPattern (display, pattern); if (!xfont->xft_font) { gchar *name = pango_font_description_to_string (fcfont->description); -- cgit v1.2.1