fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 15:48:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in show_text due to missing call to ensure_source.

Browse source
This commit is contained in:
Carl Worth 2003-09-05 07:16:45 +00:00
parent acb8ef11ce
commit 196388abe6
3 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-09-05 Carl Worth <cworth@isi.edu>
* src/cairo_gstate.c (_cairo_gstate_show_text): Fix crash due to
missing call to ensure_source.
2003-09-04 Carl Worth <cworth@isi.edu>
* src/cairo_gstate.c (_cairo_gstate_init): Combine gstate->pattern

19
src/cairo-gstate.c
View file

@ -1110,7 +1110,9 @@ _cairo_gstate_text_extents (cairo_gstate_t *gstate,
cairo_status_t
_cairo_gstate_show_text (cairo_gstate_t *gstate, const unsigned char *utf8)
{
cairo_status_t status;
XftFont *xft_font;
cairo_matrix_t user_to_source, device_to_source;
if (gstate->has_current_pt == 0)
return CAIRO_STATUS_NO_CURRENT_POINT;
@ -1120,6 +1122,19 @@ _cairo_gstate_show_text (cairo_gstate_t *gstate, const unsigned char *utf8)
_cairo_font_resolve_xft_font (&gstate->font, gstate, &xft_font);
status = _cairo_gstate_ensure_source (gstate);
if (status)
return status;
/* XXX: This same source matrix manipulation code shows up in
about 3 or 4 places. We should move that into a shared function
or two. */
if (! gstate->source_is_solid) {
cairo_surface_get_matrix (gstate->source, &user_to_source);
cairo_matrix_multiply (&device_to_source, &gstate->ctm_inverse, &user_to_source);
cairo_surface_set_matrix (gstate->source, &device_to_source);
}
/* XXX: Need to make a generic (non-Xft) backend for text. */
XftTextRenderUtf8 (gstate->surface->dpy,
gstate->operator,
@ -1132,6 +1147,10 @@ _cairo_gstate_show_text (cairo_gstate_t *gstate, const unsigned char *utf8)
utf8,
strlen ((char *) utf8));
/* restore the matrix originally in the source surface */
if (! gstate->source_is_solid)
cairo_surface_set_matrix (gstate->source, &user_to_source);
return CAIRO_STATUS_SUCCESS;
}

19
src/cairo_gstate.c
View file

@ -1110,7 +1110,9 @@ _cairo_gstate_text_extents (cairo_gstate_t *gstate,
cairo_status_t
_cairo_gstate_show_text (cairo_gstate_t *gstate, const unsigned char *utf8)
{
cairo_status_t status;
XftFont *xft_font;
cairo_matrix_t user_to_source, device_to_source;
if (gstate->has_current_pt == 0)
return CAIRO_STATUS_NO_CURRENT_POINT;
@ -1120,6 +1122,19 @@ _cairo_gstate_show_text (cairo_gstate_t *gstate, const unsigned char *utf8)
_cairo_font_resolve_xft_font (&gstate->font, gstate, &xft_font);
status = _cairo_gstate_ensure_source (gstate);
if (status)
return status;
/* XXX: This same source matrix manipulation code shows up in
about 3 or 4 places. We should move that into a shared function
or two. */
if (! gstate->source_is_solid) {
cairo_surface_get_matrix (gstate->source, &user_to_source);
cairo_matrix_multiply (&device_to_source, &gstate->ctm_inverse, &user_to_source);
cairo_surface_set_matrix (gstate->source, &device_to_source);
}
/* XXX: Need to make a generic (non-Xft) backend for text. */
XftTextRenderUtf8 (gstate->surface->dpy,
gstate->operator,
@ -1132,6 +1147,10 @@ _cairo_gstate_show_text (cairo_gstate_t *gstate, const unsigned char *utf8)
utf8,
strlen ((char *) utf8));
/* restore the matrix originally in the source surface */
if (! gstate->source_is_solid)
cairo_surface_set_matrix (gstate->source, &user_to_source);
return CAIRO_STATUS_SUCCESS;
}