[Scummvm-cvs-logs] SF.net SVN: scummvm:[36054] scummvm/trunk/graphics/scaler.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Jan 25 10:13:23 CET 2009


Revision: 36054
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36054&view=rev
Author:   thebluegr
Date:     2009-01-25 09:13:23 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
Fixed compilation

Modified Paths:
--------------
    scummvm/trunk/graphics/scaler.cpp

Modified: scummvm/trunk/graphics/scaler.cpp
===================================================================
--- scummvm/trunk/graphics/scaler.cpp	2009-01-25 09:06:46 UTC (rev 36053)
+++ scummvm/trunk/graphics/scaler.cpp	2009-01-25 09:13:23 UTC (rev 36054)
@@ -121,8 +121,8 @@
 	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 @@
 	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
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list