mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-01-19 07:45:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix integer conversion warnings

Browse Source
This commit is contained in:
Lukas Dürrenberger 2021-04-19 16:36:10 +02:00 committed by Lukas Dürrenberger
parent 5bed29dd19
commit 9052ccf218
5 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SFML/Audio/SoundFileReaderFlac.cpp
View File

@ -122,16 +122,16 @@ namespace
switch (frame->header.bits_per_sample)
{
case 8:
sample = buffer[j][i] << 8;
sample = static_cast<sf::Int16>(buffer[j][i] << 8);
break;
case 16:
sample = buffer[j][i];
sample = static_cast<sf::Int16>(buffer[j][i]);
break;
case 24:
sample = buffer[j][i] >> 8;
sample = static_cast<sf::Int16>(buffer[j][i] >> 8);
break;
case 32:
sample = buffer[j][i] >> 16;
sample = static_cast<sf::Int16>(buffer[j][i] >> 16);
break;
default:
assert(false);

4
src/SFML/Audio/SoundFileReaderWav.cpp
View File

@ -187,7 +187,7 @@ Uint64 SoundFileReaderWav::read(Int16* samples, Uint64 maxCount)
{
Uint32 sample = 0;
if (decode24bit(*m_stream, sample))
*samples++ = sample >> 8;
*samples++ = static_cast<Int16>(sample >> 8);
else
return count;
break;
@ -197,7 +197,7 @@ Uint64 SoundFileReaderWav::read(Int16* samples, Uint64 maxCount)
{
Uint32 sample = 0;
if (decode(*m_stream, sample))
*samples++ = sample >> 16;
*samples++ = static_cast<Int16>(sample >> 16);
else
return count;
break;

10
src/SFML/Audio/SoundFileWriterFlac.cpp
View File

@ -32,6 +32,14 @@
#include <cassert>
namespace
{
unsigned char toLower(unsigned char character)
{
return static_cast<unsigned char>(std::tolower(character));
}
}
namespace sf
{
namespace priv
@ -40,7 +48,7 @@ namespace priv
bool SoundFileWriterFlac::check(const std::string& filename)
{
std::string extension = filename.substr(filename.find_last_of('.') + 1);
std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
std::transform(extension.begin(), extension.end(), extension.begin(), toLower);
return extension == "flac";
}

12
src/SFML/Audio/SoundFileWriterOgg.cpp
View File

@ -33,6 +33,14 @@
#include <cassert>
namespace
{
unsigned char toLower(unsigned char character)
{
return static_cast<unsigned char>(std::tolower(character));
}
}
namespace sf
{
namespace priv
@ -41,7 +49,7 @@ namespace priv
bool SoundFileWriterOgg::check(const std::string& filename)
{
std::string extension = filename.substr(filename.find_last_of('.') + 1);
std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
std::transform(extension.begin(), extension.end(), extension.begin(), toLower);
return extension == "ogg";
}
@ -149,7 +157,7 @@ void SoundFileWriterOgg::write(const Int16* samples, Uint64 count)
// Tell the library how many samples we've written
vorbis_analysis_wrote(&m_state, std::min(frameCount, bufferSize));
frameCount -= bufferSize;
// Flush any produced block

9
src/SFML/Audio/SoundFileWriterWav.cpp
View File

@ -68,6 +68,11 @@ namespace
};
stream.write(reinterpret_cast<const char*>(bytes), sizeof(bytes));
}
unsigned char toLower(unsigned char character)
{
return static_cast<unsigned char>(std::tolower(character));
}
}
namespace sf
@ -78,7 +83,7 @@ namespace priv
bool SoundFileWriterWav::check(const std::string& filename)
{
std::string extension = filename.substr(filename.find_last_of('.') + 1);
std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
std::transform(extension.begin(), extension.end(), extension.begin(), toLower);
return extension == "wav";
}
@ -160,7 +165,7 @@ bool SoundFileWriterWav::writeHeader(unsigned int sampleRate, unsigned int chann
encode(m_file, static_cast<Uint32>(sampleRate));
Uint32 byteRate = sampleRate * channelCount * 2;
encode(m_file, byteRate);
Uint16 blockAlign = channelCount * 2;
Uint16 blockAlign = static_cast<Uint16>(channelCount * 2);
encode(m_file, blockAlign);
Uint16 bitsPerSample = 16;
encode(m_file, bitsPerSample);