Fix many warnings about implicit integer conversions when compiling for 64 bits.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-20 01:20:08 -04:00
parent 85de3c41fb
commit ebc68023a7
39 changed files with 114 additions and 114 deletions
+3 -3
View File
@@ -144,7 +144,7 @@ VorbisDecoder::VorbisDecoder(Data *data, const std::string &ext, int bufferSize)
// Initialize OGG file
oggFile.dataPtr = (char *) data->getData();
oggFile.dataSize = data->getSize();
oggFile.dataSize = (int) data->getSize();
oggFile.dataRead = 0;
// Open Vorbis handle
@@ -188,7 +188,7 @@ int VorbisDecoder::decode()
while (size < bufferSize)
{
int result = ov_read(&handle, (char *) buffer + size, bufferSize - size, endian, (getBitDepth() == 16 ? 2 : 1), 1, 0);
long result = ov_read(&handle, (char *) buffer + size, bufferSize - size, endian, (getBitDepth() == 16 ? 2 : 1), 1, 0);
if (result == OV_HOLE)
continue;
@@ -250,7 +250,7 @@ int VorbisDecoder::getBitDepth() const
int VorbisDecoder::getSampleRate() const
{
return vorbisInfo->rate;
return (int) vorbisInfo->rate;
}
} // lullaby
+1 -1
View File
@@ -140,7 +140,7 @@ int WaveDecoder::decode()
size += bytes;
}
return size;
return (int) size;
}
bool WaveDecoder::seek(float s)