diff options
author | Owen Taylor <otaylor@redhat.com> | 2004-11-21 05:00:22 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2004-11-21 05:00:22 +0000 |
commit | 49f1502b5ccc88f8592dd217b28a04af52a2d691 (patch) | |
tree | c0130c0469f4914f0524e106c6e82996932d65e5 /pango/pangoxft-font.c | |
parent | f6d966476dfe3a3fcd44941cd698b8153460a9ca (diff) | |
download | pango-49f1502b5ccc88f8592dd217b28a04af52a2d691.tar.gz |
Fix double multiplication by PANGO_SCALE. (#157419, Matthias Clasen)
Sat Nov 20 23:50:40 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (get_glyph_extents_missing): Fix double
multiplication by PANGO_SCALE. (#157419, Matthias Clasen)
* pango/pangoxft-render.c (box_in_bounds): Fix sign typo.
* pango/pangoxft-render.c (pango_xft_renderer_draw_glyphs):
* pango/pangoxft-font.c (get_glyph_extents_missing):
Adjust vertical positioning so that we get integral positioning of
the box without a transform.
Diffstat (limited to 'pango/pangoxft-font.c')
-rw-r--r-- | pango/pangoxft-font.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 884d49a5..0080ba81 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -197,16 +197,16 @@ get_glyph_extents_missing (PangoXftFont *xfont, if (ink_rect) { ink_rect->x = 0; - ink_rect->y = PANGO_SCALE * (- xft_font->ascent + (xft_font->ascent + xft_font->descent - xfont->mini_height * 2 - xfont->mini_pad * 5) / 2); - ink_rect->width = PANGO_SCALE * (xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 1)); - ink_rect->height = PANGO_SCALE * (xfont->mini_height * 2 + xfont->mini_pad * 5); + ink_rect->y = - PANGO_SCALE * xft_font->ascent + PANGO_SCALE * (((xft_font->ascent + xft_font->descent) - (xfont->mini_height * 2 + xfont->mini_pad * 5 + PANGO_SCALE / 2) / PANGO_SCALE) / 2); + ink_rect->width = xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 1); + ink_rect->height = xfont->mini_height * 2 + xfont->mini_pad * 5; } if (logical_rect) { logical_rect->x = 0; logical_rect->y = - PANGO_SCALE * xft_font->ascent; - logical_rect->width = PANGO_SCALE * (xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 2)); + logical_rect->width = xfont->mini_width * cols + xfont->mini_pad * (2 * cols + 2); logical_rect->height = (xft_font->ascent + xft_font->descent) * PANGO_SCALE; } } |