Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/glyphs: Fix clip detection for small masks 

-ENOCOFFEE.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-11-05 12:36:53 +00:00
parent d21c30d0b8
commit 0cf29afda9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sna/sna_glyphs.c
View File

@ -731,17 +731,22 @@ glyphs_via_mask(struct sna *sna,
__FUNCTION__));
pixmap = sna_pixmap_create_upload(screen,
width, height,
format->depth);
width, height,
format->depth);
if (!pixmap)
return FALSE;
memset(pixmap->devPrivate.ptr, 0, pixmap->devKind*height);
mask_image =
pixman_image_create_bits(format->depth << 24 | format->format,
width, height,
pixmap->devPrivate.ptr,
pixmap->devKind);
if (mask_image == NULL) {
screen->DestroyPixmap(pixmap);
return FALSE;
}
memset(pixmap->devPrivate.ptr, 0, pixmap->devKind*height);
do {
int n = list->len;
x += list->xOff;
@ -761,10 +766,10 @@ glyphs_via_mask(struct sna *sna,
*/
xi = x - g->info.x;
yi = y - g->info.y;
if (xi < width || yi < height)
if (xi >= width || yi >= height)
goto next_image;
if (xi + g->info.width >= 0 ||
yi + g->info.height >= 0)
if (xi + g->info.width <= 0 ||
yi + g->info.height <= 0)
goto next_image;
picture = GlyphPicture(g)[s];