diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | pango/pangocairo-fontmap.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2005-11-09 Behdad Esfahbod <behdad@gnome.org> + * pango/pangocairo-fontmap.c (pango_cairo_update_context): Call + get_context_info after g_return_if_fail. + +2005-11-09 Behdad Esfahbod <behdad@gnome.org> + * pango/break.c (pango_break): Do not call strlen when length < 0. Leave it to language engines to handle NULL-terminated strings. diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index ff0db202..80a72b2f 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -261,7 +261,7 @@ void pango_cairo_update_context (cairo_t *cr, PangoContext *context) { - PangoCairoContextInfo *info = get_context_info (context, TRUE); + PangoCairoContextInfo *info; cairo_matrix_t cairo_matrix; cairo_surface_t *target; PangoMatrix pango_matrix; @@ -269,6 +269,8 @@ pango_cairo_update_context (cairo_t *cr, g_return_if_fail (cr != NULL); g_return_if_fail (PANGO_IS_CONTEXT (context)); + info = get_context_info (context, TRUE); + cairo_get_matrix (cr, &cairo_matrix); pango_matrix.xx = cairo_matrix.xx; pango_matrix.yx = cairo_matrix.yx; |