Promote unsigned short to unsigned int explicitly

...to avoid default promotion to signed int, which causes undefined
behaviour in the shift expression.

diff --git a/pixman/pixman-solid-fill.c b/pixman/pixman-solid-fill.c
index 5f9fef630648c4d96fa1f60acd94d0f1dd4cecba..4694ebc7004f7875a34cd23db1ee97af0f56e589 100644 (file)
--- a/pixman/pixman-solid-fill.c
+++ b/pixman/pixman-solid-fill.c
@@ -30,10 +30,10 @@ static uint32_t
 color_to_uint32 (const pixman_color_t *color)
 {
     return
-        (color->alpha >> 8 << 24) |
-        (color->red >> 8 << 16) |
-        (color->green & 0xff00) |
-        (color->blue >> 8);
+        ((unsigned int) color->alpha >> 8 << 24) |
+        ((unsigned int) color->red >> 8 << 16) |
+        ((unsigned int) color->green & 0xff00) |
+        ((unsigned int) color->blue >> 8);
 }
 
 static argb_t