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

Fix bug from previous commit. Must check for NULL backend function pointers before calling them.

Browse source
This commit is contained in:
Carl Worth 2003-10-28 12:13:35 +00:00
parent 9d052aa9ca
commit 01378dab3e
3 changed files with 60 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2003-10-28 Carl Worth <cworth@isi.edu>
* src/cairo_surface.c (_cairo_surface_composite):
(_cairo_surface_fill_rectangles):
(_cairo_surface_composite_trapezoids): Fix bug introduced in last
commit: must check for NULL backend function before calling
through it.
2003-10-27 Carl Worth <cworth@isi.edu>
* src/cairo_surface.c (_cairo_surface_composite):

46
src/cairo-surface.c
View file

@ -345,14 +345,16 @@ _cairo_surface_composite (cairo_operator_t operator,
{
cairo_int_status_t status;
status = dst->backend->composite (operator,
src, mask, dst,
src_x, src_y,
mask_x, mask_y,
dst_x, dst_y,
width, height);
if (status == CAIRO_STATUS_SUCCESS)
return;
if (dst->backend->composite) {
status = dst->backend->composite (operator,
src, mask, dst,
src_x, src_y,
mask_x, mask_y,
dst_x, dst_y,
width, height);
if (status == CAIRO_STATUS_SUCCESS)
return;
}
_cairo_surface_pull_image (src);
if (mask)
@ -403,12 +405,14 @@ _cairo_surface_fill_rectangles (cairo_surface_t *surface,
if (num_rects == 0)
return;
status = surface->backend->fill_rectangles (surface,
operator,
color,
rects, num_rects);
if (status == CAIRO_STATUS_SUCCESS)
return;
if (surface->backend->fill_rectangles) {
status = surface->backend->fill_rectangles (surface,
operator,
color,
rects, num_rects);
if (status == CAIRO_STATUS_SUCCESS)
return;
}
ic_color.red = color->red_short;
ic_color.green = color->green_short;
@ -435,12 +439,14 @@ _cairo_surface_composite_trapezoids (cairo_operator_t operator,
{
cairo_int_status_t status;
status = dst->backend->composite_trapezoids (operator,
src, dst,
xSrc, ySrc,
traps, num_traps);
if (status == CAIRO_STATUS_SUCCESS)
return;
if (dst->backend->composite_trapezoids) {
status = dst->backend->composite_trapezoids (operator,
src, dst,
xSrc, ySrc,
traps, num_traps);
if (status == CAIRO_STATUS_SUCCESS)
return;
}
_cairo_surface_pull_image (src);
_cairo_surface_pull_image (dst);

46
src/cairo_surface.c
View file

@ -345,14 +345,16 @@ _cairo_surface_composite (cairo_operator_t operator,
{
cairo_int_status_t status;
status = dst->backend->composite (operator,
src, mask, dst,
src_x, src_y,
mask_x, mask_y,
dst_x, dst_y,
width, height);
if (status == CAIRO_STATUS_SUCCESS)
return;
if (dst->backend->composite) {
status = dst->backend->composite (operator,
src, mask, dst,
src_x, src_y,
mask_x, mask_y,
dst_x, dst_y,
width, height);
if (status == CAIRO_STATUS_SUCCESS)
return;
}
_cairo_surface_pull_image (src);
if (mask)
@ -403,12 +405,14 @@ _cairo_surface_fill_rectangles (cairo_surface_t *surface,
if (num_rects == 0)
return;
status = surface->backend->fill_rectangles (surface,
operator,
color,
rects, num_rects);
if (status == CAIRO_STATUS_SUCCESS)
return;
if (surface->backend->fill_rectangles) {
status = surface->backend->fill_rectangles (surface,
operator,
color,
rects, num_rects);
if (status == CAIRO_STATUS_SUCCESS)
return;
}
ic_color.red = color->red_short;
ic_color.green = color->green_short;
@ -435,12 +439,14 @@ _cairo_surface_composite_trapezoids (cairo_operator_t operator,
{
cairo_int_status_t status;
status = dst->backend->composite_trapezoids (operator,
src, dst,
xSrc, ySrc,
traps, num_traps);
if (status == CAIRO_STATUS_SUCCESS)
return;
if (dst->backend->composite_trapezoids) {
status = dst->backend->composite_trapezoids (operator,
src, dst,
xSrc, ySrc,
traps, num_traps);
if (status == CAIRO_STATUS_SUCCESS)
return;
}
_cairo_surface_pull_image (src);
_cairo_surface_pull_image (dst);