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

sna: Suppress a compiler warning 

sna_display.c: In function '__sna_get_cursor':
sna_display.c:3153:6: warning: assignment from incompatible pointer type [enabled by default]
  src = sna->cursor.ref->bits->argb;
      ^
sna_display.c:3209:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]
  if (src != sna->cursor.ref->bits->argb)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-03-28 11:34:03 +00:00
parent 5c0623b5f3
commit e892b789c4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sna/sna_display.c
View File

@ -3150,7 +3150,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
width = sna->cursor.ref->bits->width;
height = sna->cursor.ref->bits->height;
src = sna->cursor.ref->bits->argb;
src = (uint32_t *)sna->cursor.ref->bits->argb;
if (src == NULL) {
const uint8_t *source = sna->cursor.ref->bits->source;
const uint8_t *mask = sna->cursor.ref->bits->mask;
@ -3206,7 +3206,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
}
}
if (src != sna->cursor.ref->bits->argb)
if (src != (uint32_t *)sna->cursor.ref->bits->argb)
free(src);
cursor->size = size;