diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-05-12 00:22:56 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-05-12 00:22:56 +0000 |
| commit | 868c04571452fd0b6b934b8032f2360b681b20a5 (patch) | |
| tree | 1843cd582f3ddb2c8b2d2a63895784d64e4fc020 | |
| parent | 70a5f5902542c231d6f42ce35674d43a60d2d190 (diff) | |
| download | pango-868c04571452fd0b6b934b8032f2360b681b20a5.tar.gz | |
Update for cairo API change. (pango_cairo_win32_font_get_metrics): Fix x/y
2005-05-11 Owen Taylor <otaylor@redhat.com>
* pango/pangocairo-win32font.c (pango_cairo_win32_font_install):
Update for cairo API change.
(pango_cairo_win32_font_get_metrics): Fix x/y typo.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 4 |
3 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-05-11 Owen Taylor <otaylor@redhat.com> + + * pango/pangocairo-win32font.c (pango_cairo_win32_font_install): + Update for cairo API change. + (pango_cairo_win32_font_get_metrics): Fix x/y typo. + 2005-05-07 Owen Taylor <otaylor@redhat.com> * examples/cairoview.c (update): Remove some accidentally diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index e25c2bb0..388b0034 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2005-05-11 Owen Taylor <otaylor@redhat.com> + + * pango/pangocairo-win32font.c (pango_cairo_win32_font_install): + Update for cairo API change. + (pango_cairo_win32_font_get_metrics): Fix x/y typo. + 2005-05-07 Owen Taylor <otaylor@redhat.com> * examples/cairoview.c (update): Remove some accidentally diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index 3807f1f1..93e0e0a3 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -135,7 +135,7 @@ pango_cairo_win32_font_install (PangoCairoFont *font, cairo_set_font_face (cr, pango_cairo_win32_font_get_font_face (font)); - cairo_transform_font (cr, &cffont->font_matrix); + cairo_set_font_matrix (cr, &cffont->font_matrix); } static void @@ -221,7 +221,7 @@ pango_cairo_win32_font_get_metrics (PangoFont *font, cwfont->metrics->ascent = font_extents.ascent * PANGO_SCALE; cwfont->metrics->descent = font_extents.ascent * PANGO_SCALE; cwfont->metrics->approximate_char_width = font_extents.max_x_advance * PANGO_SCALE; - cwfont->metrics->approximate_digit_width = font_extents.max_y_advance * PANGO_SCALE; + cwfont->metrics->approximate_digit_width = font_extents.max_x_advance * PANGO_SCALE; height = font_extents.ascent + font_extents.descent; |