From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 9 Jan 2018 09:26:29 +0000 (+0100)
Subject: Promote unsigned short to unsigned int explicitly
X-Git-Tag: pixman-0.36.0~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b95e0e460baa499e54c19d29bf761d34c25badc;p=platform%2Fupstream%2Fpixman.git

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 5f9fef6..4694ebc 100644
--- 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