diff options
| author | Filippos Karapetis | 2009-01-25 09:13:23 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-01-25 09:13:23 +0000 |
| commit | ed0bca5b360f88f08a2f6b1a2b349d959a26d378 (patch) | |
| tree | 158b7b4c841bbc968b96234c822c367a8d364d72 | |
| parent | 908ed665098a610d19aacf179370d1f6bbcfe0c7 (diff) | |
| download | scummvm-rg350-ed0bca5b360f88f08a2f6b1a2b349d959a26d378.tar.gz scummvm-rg350-ed0bca5b360f88f08a2f6b1a2b349d959a26d378.tar.bz2 scummvm-rg350-ed0bca5b360f88f08a2f6b1a2b349d959a26d378.zip | |
Fixed compilation
svn-id: r36054
| -rw-r--r-- | graphics/scaler.cpp | 8 |
1 files 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 } |