From ed0bca5b360f88f08a2f6b1a2b349d959a26d378 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Jan 2009 09:13:23 +0000
Subject: Fixed compilation

svn-id: r36054
---
 graphics/scaler.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
index e5029920f6..0c7345f8a6 100644
--- a/graphics/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -121,8 +121,8 @@ void InitScalers(uint32 BitFormat) {
 	gBitFormat = BitFormat;
 
 #ifndef DISABLE_HQ_SCALERS
-	#undef kHighBitsMask;
-	#undef kLowBitsMask;
+	#undef kHighBitsMask
+	#undef kLowBitsMask
 
 	if (gBitFormat == 555) {
 		InitLUT(Graphics::createPixelFormat<555>());
@@ -134,7 +134,9 @@ void InitScalers(uint32 BitFormat) {
 	if (gBitFormat == 565) {
 		InitLUT(Graphics::createPixelFormat<565>());
 #ifdef USE_NASM
-		hqx_highbits = Graphics::ColorMasks<565>::kHighBitsMask;
+		// The uint32 cast here is needed to silence an MSVC warning
+		// (warning C4245: '=': conversion from '' to 'uint32', signed/unsigned mismatch
+		hqx_highbits = (uint32)Graphics::ColorMasks<565>::kHighBitsMask;
 		hqx_lowbits = Graphics::ColorMasks<565>::kLowBitsMask & 0xFFFF;
 #endif
 	}
-- 
cgit v1.2.3