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

glitz: further fix for clone_similar.

Browse source 
Don't try to get pixels outside image extent. The failure number of
tests cut down to 19 with this fix, not too bad;).
This commit is contained in:
Jinghua Luo 2006-10-25 13:29:06 +08:00
parent 69f740913d
commit 804e5b58cd
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/cairo-glitz-surface.c
View file

@ -391,6 +391,8 @@ _cairo_glitz_surface_clone_similar (void *abstract_surface,
{
cairo_image_surface_t *image_src = (cairo_image_surface_t *) src;
cairo_content_t content;
cairo_rectangle_int16_t image_extent;
cairo_rectangle_int16_t extent;
content = _cairo_content_from_format (image_src->format);
@ -401,8 +403,21 @@ _cairo_glitz_surface_clone_similar (void *abstract_surface,
if (clone->base.status)
return CAIRO_STATUS_NO_MEMORY;
_cairo_glitz_surface_set_image (clone, image_src, src_x, src_y,
width, height, src_x, src_y);
image_extent.x = 0;
image_extent.y = 0;
image_extent.width = image_src->width;
image_extent.height = image_src->height;
extent.x = src_x;
extent.y = src_y;
extent.width = width;
extent.height = height;
_cairo_rectangle_intersect(&extent, &image_extent);
_cairo_glitz_surface_set_image (clone, image_src,
extent.x, extent.y,
extent.width, extent.height,
extent.x, extent.y);
*clone_out = &clone->base;