Skip to content

Commit a449d59

Browse files
committed
dix: AllocARGBCursor(): make color parameters unsigned short
These values are assigned to `unsigned short` fields, and we're only getting in smaller numbers that fit well into it. So fixing compiler warning on type size mismatch by using short args. Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
1 parent 32f6ac7 commit a449d59

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

dix/cursor.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ RealizeCursorAllScreens(CursorPtr pCurs)
232232
int
233233
AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
234234
CARD32 *argb, CursorMetricPtr cm,
235-
unsigned foreRed, unsigned foreGreen, unsigned foreBlue,
236-
unsigned backRed, unsigned backGreen, unsigned backBlue,
235+
unsigned short foreRed, unsigned short foreGreen, unsigned short foreBlue,
236+
unsigned short backRed, unsigned short backGreen, unsigned short backBlue,
237237
CursorPtr *ppCurs, ClientPtr client, XID cid)
238238
{
239239
CursorBitsPtr bits;

dix/cursor_priv.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ int AllocARGBCursor(unsigned char *psrcbits,
2727
unsigned char *pmaskbits,
2828
CARD32 *argb,
2929
CursorMetricPtr cm,
30-
unsigned foreRed,
31-
unsigned foreGreen,
32-
unsigned foreBlue,
33-
unsigned backRed,
34-
unsigned backGreen,
35-
unsigned backBlue,
30+
unsigned short foreRed,
31+
unsigned short foreGreen,
32+
unsigned short foreBlue,
33+
unsigned short backRed,
34+
unsigned short backGreen,
35+
unsigned short backBlue,
3636
CursorPtr *ppCurs,
3737
ClientPtr client,
3838
XID cid);

0 commit comments

Comments
 (0)