From 2adcc56a4887eb8b454522b8f639fc734518f47c Mon Sep 17 00:00:00 2001 From: Morten Welinder Date: Mon, 12 Jul 2004 14:04:28 +0000 Subject: Fix C99ism. (#147415, self.) 2004-07-12 Morten Welinder * pango/pangoxft-font.c (get_glyph_extents_xft): Fix C99ism. (#147415, self.) --- ChangeLog | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/pangoxft-font.c | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a5772f92..23d47a90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-07-12 Morten Welinder + + * pango/pangoxft-font.c (get_glyph_extents_xft): Fix C99ism. + (#147415, self.) + 2004-07-12 Changwoo Ryu * modules/hangul/hangul-fc.c (render_basic): Render U+00A0 diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index a5772f92..23d47a90 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2004-07-12 Morten Welinder + + * pango/pangoxft-font.c (get_glyph_extents_xft): Fix C99ism. + (#147415, self.) + 2004-07-12 Changwoo Ryu * modules/hangul/hangul-fc.c (render_basic): Render U+00A0 diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index a5772f92..23d47a90 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2004-07-12 Morten Welinder + + * pango/pangoxft-font.c (get_glyph_extents_xft): Fix C99ism. + (#147415, self.) + 2004-07-12 Changwoo Ryu * modules/hangul/hangul-fc.c (render_basic): Render U+00A0 diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index a5772f92..23d47a90 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2004-07-12 Morten Welinder + + * pango/pangoxft-font.c (get_glyph_extents_xft): Fix C99ism. + (#147415, self.) + 2004-07-12 Changwoo Ryu * modules/hangul/hangul-fc.c (render_basic): Render U+00A0 diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 6634f353..cf32c1de 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -455,10 +455,10 @@ get_glyph_extents_xft (PangoFcFont *fcfont, XftFont *xft_font = xft_font_get_font ((PangoFont *)fcfont); XGlyphInfo extents; Display *display; + FT_UInt ft_glyph = glyph; _pango_xft_font_map_get_info (fcfont->fontmap, &display, NULL); - FT_UInt ft_glyph = glyph; XftGlyphExtents (display, xft_font, &ft_glyph, 1, &extents); if (ink_rect) -- cgit v1.2.1