diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-07-08 22:15:32 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-07-08 22:15:32 +0000 |
| commit | b9f7b88e3d100b87a856e077b5f2fdbf49c73ebb (patch) | |
| tree | e51a0fd2de7833ca1e05722f870a92d8f25d0a14 /pango/pango-layout.c | |
| parent | d54f97cea6ac3136621fc06a5239ad4bf142fde9 (diff) | |
| download | pango-b9f7b88e3d100b87a856e077b5f2fdbf49c73ebb.tar.gz | |
Fix silly error in implementation of pango_glyph_string_get_width(), and
2006-07-08 Behdad Esfahbod <behdad@gnome.org>
* pango/glyphstring.c (pango_glyph_string_get_width):
* pango/pango-glyph.h:
* pango/pango-layout.c (pango_layout_line_index_to_x),
(pango_layout_line_x_to_index), (pango_layout_line_get_x_ranges):
* pango/pango-renderer.c (pango_renderer_draw_layout_line): Fix silly
error in implementation of pango_glyph_string_get_width(), and also
remove unused font parameter from its signature.
Diffstat (limited to 'pango/pango-layout.c')
| -rw-r--r-- | pango/pango-layout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 69e6b95d..bd76a265 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -1168,7 +1168,7 @@ pango_layout_line_index_to_x (PangoLayoutLine *line, } if (!properties.shape_set) - width += pango_glyph_string_get_width (run->glyphs, run->item->analysis.font); + width += pango_glyph_string_get_width (run->glyphs); else width += properties.shape_logical_rect->width; @@ -3577,7 +3577,7 @@ pango_layout_line_x_to_index (PangoLayoutLine *line, if (properties.shape_set) logical_width = properties.shape_logical_rect->width; else - logical_width = pango_glyph_string_get_width (run->glyphs, run->item->analysis.font); + logical_width = pango_glyph_string_get_width (run->glyphs); if (x_pos >= start_pos && x_pos < start_pos + logical_width) { @@ -3782,7 +3782,7 @@ pango_layout_line_get_x_ranges (PangoLayoutLine *line, } if (tmp_list->next) - accumulated_width += pango_glyph_string_get_width (run->glyphs, run->item->analysis.font); + accumulated_width += pango_glyph_string_get_width (run->glyphs); tmp_list = tmp_list->next; } |