diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-07-26 18:13:00 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-07-26 18:13:00 +0000 |
| commit | 1e2a822b0ab4ca453f49f5496ddb3f504a49e2a8 (patch) | |
| tree | bd02201d2cf5851c1f2aeba6544c9e963c1a599a | |
| parent | 8d45583fa1f13d77feb5d96abeae59d21ad5fe65 (diff) | |
| download | pango-1e2a822b0ab4ca453f49f5496ddb3f504a49e2a8.tar.gz | |
Fix mixed code and declarations (#311626, Kazuki IWAMOTO)
2005-07-26 Owen Taylor <otaylor@redhat.com>
* pango/pangocairo-fontmap.c (pango_cairo_context_get_font_options):
Fix mixed code and declarations (#311626, Kazuki IWAMOTO)
* pango/pangocairo-win32font.c (pango_cairo_win32_font_install):
Fix typo (#311627, Kazuki IWAMOTO)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | pango/pangocairo-fontmap.c | 8 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 2 |
4 files changed, 23 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2005-07-26 Owen Taylor <otaylor@redhat.com> + * pango/pangocairo-fontmap.c (pango_cairo_context_get_font_options): + Fix mixed code and declarations (#311626, Kazuki IWAMOTO) + + * pango/pangocairo-win32font.c (pango_cairo_win32_font_install): + Fix typo (#311627, Kazuki IWAMOTO) + +2005-07-26 Owen Taylor <otaylor@redhat.com> + Fixes for signed/unsigned in PangoAttrIterator ((#166700, Morten Welinder) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index f44cd861..13338621 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,13 @@ 2005-07-26 Owen Taylor <otaylor@redhat.com> + * pango/pangocairo-fontmap.c (pango_cairo_context_get_font_options): + Fix mixed code and declarations (#311626, Kazuki IWAMOTO) + + * pango/pangocairo-win32font.c (pango_cairo_win32_font_install): + Fix typo (#311627, Kazuki IWAMOTO) + +2005-07-26 Owen Taylor <otaylor@redhat.com> + Fixes for signed/unsigned in PangoAttrIterator ((#166700, Morten Welinder) diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 14114f7c..c71d1f13 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -350,9 +350,11 @@ void pango_cairo_context_set_font_options (PangoContext *context, const cairo_font_options_t *options) { + PangoCairoContextInfo *info; + g_return_if_fail (PANGO_IS_CONTEXT (context)); - PangoCairoContextInfo *info = get_context_info (context, TRUE); + info = get_context_info (context, TRUE); if (info->set_options) cairo_font_options_destroy (info->set_options); @@ -384,9 +386,11 @@ pango_cairo_context_set_font_options (PangoContext *context, const cairo_font_options_t * pango_cairo_context_get_font_options (PangoContext *context) { + PangoCairoContextInfo *info; + g_return_val_if_fail (PANGO_IS_CONTEXT (context), NULL); - PangoCairoContextInfo *info = get_context_info (context, FALSE); + info = get_context_info (context, FALSE); if (info) return info->set_options; diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index ad37cc06..9dcbe335 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -138,7 +138,7 @@ pango_cairo_win32_font_install (PangoCairoFont *font, cairo_set_font_face (cr, pango_cairo_win32_font_get_font_face (font)); cairo_set_font_matrix (cr, &cwfont->font_matrix); - cairo_set_font_optoins (cr, cwfont->options); + cairo_set_font_options (cr, cwfont->options); } static void |