From 5c9eafc8e5f8575c06591d244c2cb5ea07691cb4 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 23 Apr 2011 20:55:53 -0700 Subject: render: Silence warnings when building with clang picture.c:351:37: error: implicit conversion from 'unsigned int' to 'CARD16' (aka 'unsigned short') changes value from 4294967295 to 65535 [-Werror,-Wconstant-conversion] pFormats[f].direct.alphaMask = Mask(PICT_FORMAT_A(format)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ... fatal error: too many errors emitted, stopping now [-ferror-limit=] Signed-off-by: Jeremy Huddleston Suggested-by: Jamey Sharp Reviewed-by: Jamey Sharp --- render/picture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render/picture.c b/render/picture.c index e7e1f2b41..1877bfca1 100644 --- a/render/picture.c +++ b/render/picture.c @@ -158,7 +158,7 @@ addFormat (FormatInitRec formats[256], return ++nformat; } -#define Mask(n) ((n) == 32 ? 0xffffffff : ((1 << (n))-1)) +#define Mask(n) ((1 << (n)) - 1) PictFormatPtr PictureCreateDefaultFormats (ScreenPtr pScreen, int *nformatp) -- cgit v1.2.3