diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2005-11-04 23:55:38 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2005-11-04 23:55:38 +0000 |
| commit | b6942a337fd03b0f24a49f3b7336b9137828c5f4 (patch) | |
| tree | ad95f548fbe6765cdea8bfcae095e42652697e26 /pango/pango-renderer.c | |
| parent | 933f541030f770b446d95bb0b5b3c85d561a63e5 (diff) | |
| download | pango-b6942a337fd03b0f24a49f3b7336b9137828c5f4.tar.gz | |
Turn various gcc warnings off. Adding const, adding static, fully
2005-11-04 Behdad Esfahbod <behdad@gnome.org>
* configure.in, examples/argcontext.c examples/cairoview.c,
examples/renderdemo.c, examples/renderdemo.h examples/xftview.c,
modules/basic/basic-x.c, modules/hangul/hangul-fc.c,
modules/hebrew/hebrew-shaper.c, modules/hebrew/hebrew-shaper.h,
modules/indic/indic-fc.c, modules/indic/mprefixups.c,
modules/syriac/syriac-fc.c, pango/break.c pango/fonts.c,
pango/modules.c, pango/pango-coverage.c pango/pango-engine.c,
pango/pango-engine.h, pango/pango-fontmap.c,
pango/pango-fontset.c, pango/pango-impl-utils.h,
pango/pango-layout.c, pango/pango-layout.h,
pango/pango-renderer.c, pango/pango-script.c,
pango/pango-utils.c, pango/pangocairo-fc.h,
pango/pangocairo-font.c, pango/pangocairo-fontmap.c,
pango/pangocairo-private.h, pango/pangofc-decoder.c,
pango/pangofc-font.c, pango/pangofc-fontmap.c pango/pangoft2.c,
pango/pangox-fontcache.c, pango/pangox-fontmap.c pango/pangox.c,
pango/pangoxft-font.c, pango/querymodules.c,
pango/opentype/ftglue.c, pango/opentype/ftxgpos.c,
pango/opentype/ftxopen.c, pango/opentype/pango-ot-buffer.c,
pango/opentype/pango-ot-info.c,
pango/opentype/pango-ot-ruleset.c, tests/dump-boundaries.c,
tests/testboundaries.c, tests/testcolor.c tests/testiter.c,
tests/testscript.c: Turn various gcc warnings off. Adding const,
adding static, fully initializing structs, match signedness in
comparisons. (#317804)
* tests/testscript.c, tools/gen-script-for-lang.c:
(scripts_for_file): Pass error->message instead of error to fail(),
which was wrong.
(compare_lang): Fix typo comparing a and a instead of a and b.
Diffstat (limited to 'pango/pango-renderer.c')
| -rw-r--r-- | pango/pango-renderer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c index 346d435a..c549d682 100644 --- a/pango/pango-renderer.c +++ b/pango/pango-renderer.c @@ -300,6 +300,7 @@ add_underline (PangoRenderer *renderer, new_rect.x = base_x + ink_rect->x; new_rect.width = ink_rect->width; new_rect.height = underline_thickness; + new_rect.y = base_y; switch (renderer->underline) { @@ -309,10 +310,10 @@ add_underline (PangoRenderer *renderer, case PANGO_UNDERLINE_SINGLE: case PANGO_UNDERLINE_DOUBLE: case PANGO_UNDERLINE_ERROR: - new_rect.y = base_y - underline_position; + new_rect.y -= underline_position; break; case PANGO_UNDERLINE_LOW: - new_rect.y = base_y + ink_rect->y + ink_rect->height + underline_thickness; + new_rect.y += ink_rect->y + ink_rect->height + underline_thickness; break; } |