From 92fd2a1ee30b4c0b5af9ebb268f8f1ace649f371 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Mon, 16 Mar 2015 15:14:04 +0100 Subject: VideoCore: Add static_cast around expressions where the compiler doesn’t deduce the right type. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/video_core/debug_utils/debug_utils.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/video_core/debug_utils') diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 745c4f4e..83982b4f 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -322,7 +322,7 @@ const Math::Vec4 LookupTexture(const u8* source, int x, int y, const Texture case Regs::TextureFormat::RGBA8: { auto res = Color::DecodeRGBA8(source + VideoCore::GetMortonOffset(x, y, 4)); - return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; + return { res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a()) }; } case Regs::TextureFormat::RGB8: @@ -334,7 +334,7 @@ const Math::Vec4 LookupTexture(const u8* source, int x, int y, const Texture case Regs::TextureFormat::RGB5A1: { auto res = Color::DecodeRGB5A1(source + VideoCore::GetMortonOffset(x, y, 2)); - return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; + return { res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a()) }; } case Regs::TextureFormat::RGB565: @@ -346,7 +346,7 @@ const Math::Vec4 LookupTexture(const u8* source, int x, int y, const Texture case Regs::TextureFormat::RGBA4: { auto res = Color::DecodeRGBA4(source + VideoCore::GetMortonOffset(x, y, 2)); - return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; + return { res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a()) }; } case Regs::TextureFormat::IA8: -- cgit v1.2.3