diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-03-16 15:14:04 +0100 |
---|---|---|
committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-03-16 15:14:04 +0100 |
commit | 92fd2a1ee30b4c0b5af9ebb268f8f1ace649f371 (patch) | |
tree | 938f6f5769675df5df6dc153df6f50b4500840e8 /src/video_core/color.h | |
parent | 3e5aeb9a7abb74fb5492f8f93265c03f45c1757a (diff) |
VideoCore: Add static_cast around expressions where the compiler doesn’t deduce the right type.
Diffstat (limited to 'src/video_core/color.h')
-rw-r--r-- | src/video_core/color.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/color.h b/src/video_core/color.h index 14ade74f..43d635e2 100644 --- a/src/video_core/color.h +++ b/src/video_core/color.h @@ -124,7 +124,7 @@ inline u32 DecodeD24(const u8* bytes) { * @return Resulting values stored as a Math::Vec2 */ inline const Math::Vec2<u32> DecodeD24S8(const u8* bytes) { - return { (bytes[2] << 16) | (bytes[1] << 8) | bytes[0], bytes[3] }; + return { static_cast<u32>((bytes[2] << 16) | (bytes[1] << 8) | bytes[0]), bytes[3] }; } /** |