libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-29 14:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JANITORIAL: Fix MSVC warnings

Browse Source 
- Conversion from double to float
 - Unary minus operator applied to unsigned type
 - ARRAYSIZE redefinition
This commit is contained in:
Littleboy 2011-07-19 13:46:32 -04:00
parent 9ad45e28a1
commit da60ff3ded
4 changed files with 16395 additions and 16395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backends/platform/sdl/win32/win32.cpp
View File

@ -23,11 +23,6 @@
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include "common/scummsys.h"
#include "common/config-manager.h"
#include "common/error.h"
#include "common/textconsole.h"
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
@ -35,6 +30,11 @@
#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one...
#include <shellapi.h>
#include "common/scummsys.h"
#include "common/config-manager.h"
#include "common/error.h"
#include "common/textconsole.h"
#include <SDL_syswm.h> // For setting the icon
#include "backends/platform/sdl/win32/win32.h"

16382
common/cosinetables.cpp
View File

File diff suppressed because it is too large Load Diff

16382
common/sinetables.cpp
View File

File diff suppressed because it is too large Load Diff

16
video/bink_decoder.cpp
View File

@ -1043,7 +1043,7 @@ void BinkDecoder::readMotionValues(VideoFrame &video, Bundle &bundle) {
byte v = video.bits->getBits(4);
if (v) {
int sign = -video.bits->getBit();
int sign = -(int)video.bits->getBit();
v = (v ^ sign) - sign;
}
@ -1057,7 +1057,7 @@ void BinkDecoder::readMotionValues(VideoFrame &video, Bundle &bundle) {
byte v = getHuffmanSymbol(video, bundle.huffman);
if (v) {
int sign = -video.bits->getBit();
int sign = -(int)video.bits->getBit();
v = (v ^ sign) - sign;
}
@ -1175,7 +1175,7 @@ void BinkDecoder::readDCS(VideoFrame &video, Bundle &bundle, int startBits, bool
int32 v = video.bits->getBits(startBits - (hasSign ? 1 : 0));
if (v && hasSign) {
int sign = -video.bits->getBit();
int sign = -(int)video.bits->getBit();
v = (v ^ sign) - sign;
}
@ -1192,7 +1192,7 @@ void BinkDecoder::readDCS(VideoFrame &video, Bundle &bundle, int startBits, bool
for (uint32 j = 0; j < length2; j++) {
int16 v2 = video.bits->getBits(bSize);
if (v2) {
int sign = -video.bits->getBit();
int sign = -(int)video.bits->getBit();
v2 = (v2 ^ sign) - sign;
}
@ -1261,7 +1261,7 @@ void BinkDecoder::readDCTCoeffs(VideoFrame &video, int16 *block, bool isIntra) {
} else {
t = video.bits->getBits(bits) | mask;
int sign = -video.bits->getBit();
int sign = -(int)video.bits->getBit();
t = (t ^ sign) - sign;
}
block[binkScan[ccoef]] = t;
@ -1286,7 +1286,7 @@ void BinkDecoder::readDCTCoeffs(VideoFrame &video, int16 *block, bool isIntra) {
} else {
t = video.bits->getBits(bits) | mask;
int sign = -video.bits->getBit();
int sign = -(int)video.bits->getBit();
t = (t ^ sign) - sign;
}
block[binkScan[ccoef]] = t;
@ -1365,7 +1365,7 @@ void BinkDecoder::readResidue(VideoFrame &video, int16 *block, int masksCount) {
} else {
nzCoeff[nzCoeffCount++] = binkScan[ccoef];
int sign = -video.bits->getBit();
int sign = -(int)video.bits->getBit();
block[binkScan[ccoef]] = (mask ^ sign) - sign;
masksCount--;
@ -1387,7 +1387,7 @@ void BinkDecoder::readResidue(VideoFrame &video, int16 *block, int masksCount) {
case 3:
nzCoeff[nzCoeffCount++] = binkScan[ccoef];
int sign = -video.bits->getBit();
int sign = -(int)video.bits->getBit();
block[binkScan[ccoef]] = (mask ^ sign) - sign;
coefList[listPos] = 0;