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

[cairo-xlib] Some code reshuffling, in preparation for a fix

Browse source
This commit is contained in:
Behdad Esfahbod 2008-05-23 20:43:08 -04:00
parent d947ee0ef6
commit 74818d2b00
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/cairo-xlib-surface.c
View file

@ -3351,19 +3351,11 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst,
scaled_font,
&scaled_glyph);
if (status) {
if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
/* Glyph image too big to send to server. Flush what we
* got and let fallback code handle the rest.
*/
if (num_elts)
status = _cairo_xlib_surface_emit_glyphs_chunk (dst, glyphs, i,
scaled_font, op, src, attributes,
num_elts, width, glyphset_info);
*remaining_glyphs = num_glyphs - i;
if (status == CAIRO_INT_STATUS_UNSUPPORTED)
/* Break so we flush glyphs so far and let fallback code
* handle the rest */
break;
if (status == CAIRO_STATUS_SUCCESS)
status = CAIRO_INT_STATUS_UNSUPPORTED;
}
return status;
}
}
@ -3436,10 +3428,16 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst,
request_size += width;
}
if (num_elts)
status = _cairo_xlib_surface_emit_glyphs_chunk (dst, glyphs, num_glyphs,
scaled_font, op, src, attributes,
num_elts, width, glyphset_info);
if (num_elts) {
/* status may be UNSUPPORTED. Shouldn't override that to SUCCESS */
cairo_status_t status2;
status2 = _cairo_xlib_surface_emit_glyphs_chunk (dst, glyphs, num_glyphs,
scaled_font, op, src, attributes,
num_elts, width, glyphset_info);
if (status2 != CAIRO_STATUS_SUCCESS)
status = status2;
}
*remaining_glyphs = num_glyphs - i;
return status;
}