mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Replace reinterpret_cast with static_cast

Browse Source
This commit is contained in:
Crystal Squirrel
2025-11-15 18:47:30 +01:00
committed by Gymnasiast
parent a7b962db5f
commit 766cfd2f18
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/audio/AudioChannel.cpp
View File

@@ -254,7 +254,7 @@ namespace OpenRCT2::Audio
size_t readLen = _source->Read(dst, _offset, bytesToRead);
if (readLen > 0)
{
dst = reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(dst) + readLen);
dst = static_cast<void*>(static_cast<uint8_t*>(dst) + readLen);
bytesToRead -= readLen;
bytesRead += readLen;
_offset += readLen;

16
src/openrct2-ui/audio/FlacAudioSource.cpp
View File

@@ -96,7 +96,7 @@ namespace OpenRCT2::Audio
_currentOffset = offset;
}
auto dst8 = reinterpret_cast<uint8_t*>(dst);
auto dst8 = static_cast<uint8_t*>(dst);
auto bytesRead = ReadFromDecodeBuffer(dst8, len);
dst8 += bytesRead;
if (bytesRead < len)
@@ -171,7 +171,7 @@ namespace OpenRCT2::Audio
static FLAC__StreamDecoderReadStatus FlacCallbackRead(
const FLAC__StreamDecoder* decoder, FLAC__byte buffer[], size_t* bytes, void* clientData)
{
auto* self = reinterpret_cast<FlacAudioSource*>(clientData);
auto* self = static_cast<FlacAudioSource*>(clientData);
if (*bytes > 0)
{
*bytes = SDL_RWread(self->_rw, buffer, sizeof(FLAC__byte), *bytes);
@@ -193,7 +193,7 @@ namespace OpenRCT2::Audio
static FLAC__StreamDecoderSeekStatus FlacCallbackSeek(
const FLAC__StreamDecoder* decoder, FLAC__uint64 absoluteByteOffset, void* clientData)
{
auto* self = reinterpret_cast<FlacAudioSource*>(clientData);
auto* self = static_cast<FlacAudioSource*>(clientData);
if (SDL_RWseek(self->_rw, absoluteByteOffset, RW_SEEK_SET) < 0)
{
return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
@@ -207,7 +207,7 @@ namespace OpenRCT2::Audio
static FLAC__StreamDecoderTellStatus FlacCallbackTell(
const FLAC__StreamDecoder* decoder, FLAC__uint64* absoluteByteOffset, void* clientData)
{
auto* self = reinterpret_cast<FlacAudioSource*>(clientData);
auto* self = static_cast<FlacAudioSource*>(clientData);
auto pos = SDL_RWtell(self->_rw);
if (pos < 0)
{
@@ -223,7 +223,7 @@ namespace OpenRCT2::Audio
static FLAC__StreamDecoderLengthStatus FlacCallbackLength(
const FLAC__StreamDecoder* decoder, FLAC__uint64* streamLength, void* clientData)
{
auto* self = reinterpret_cast<FlacAudioSource*>(clientData);
auto* self = static_cast<FlacAudioSource*>(clientData);
auto pos = SDL_RWtell(self->_rw);
auto length = SDL_RWseek(self->_rw, 0, RW_SEEK_END);
if (SDL_RWseek(self->_rw, pos, RW_SEEK_SET) != pos || length < 0)
@@ -239,7 +239,7 @@ namespace OpenRCT2::Audio
static FLAC__bool FlacCallbackEof(const FLAC__StreamDecoder* decoder, void* clientData)
{
auto* self = reinterpret_cast<FlacAudioSource*>(clientData);
auto* self = static_cast<FlacAudioSource*>(clientData);
auto pos = SDL_RWtell(self->_rw);
auto end = SDL_RWseek(self->_rw, 0, RW_SEEK_END);
if (pos == end)
@@ -256,7 +256,7 @@ namespace OpenRCT2::Audio
static FLAC__StreamDecoderWriteStatus FlacCallbackWrite(
const FLAC__StreamDecoder* decoder, const FLAC__Frame* frame, const FLAC__int32* const buffer[], void* clientData)
{
auto* self = reinterpret_cast<FlacAudioSource*>(clientData);
auto* self = static_cast<FlacAudioSource*>(clientData);
// Determine sizes
auto channels = self->_format.channels;
@@ -301,7 +301,7 @@ namespace OpenRCT2::Audio
static void FlacCallbackMetadata(
const FLAC__StreamDecoder* decoder, const FLAC__StreamMetadata* metadata, void* clientData)
{
auto* self = reinterpret_cast<FlacAudioSource*>(clientData);
auto* self = static_cast<FlacAudioSource*>(clientData);
if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
{
self->_bitsPerSample = metadata->data.stream_info.bits_per_sample;

2
src/openrct2-ui/audio/MemoryAudioSource.cpp
View File

@@ -55,7 +55,7 @@ namespace OpenRCT2::Audio
auto src = _data.data();
if (src != nullptr)
{
std::copy_n(src + offset, bytesToRead, reinterpret_cast<uint8_t*>(dst));
std::copy_n(src + offset, bytesToRead, static_cast<uint8_t*>(dst));
}
}
return bytesToRead;

8
src/openrct2-ui/audio/OggAudioSource.cpp
View File

@@ -101,7 +101,7 @@ namespace OpenRCT2::Audio
}
auto readLen = static_cast<int64_t>(len);
auto dst8 = reinterpret_cast<char*>(dst);
auto dst8 = static_cast<char*>(dst);
int64_t totalBytesRead{};
int64_t bytesRead;
do
@@ -139,17 +139,17 @@ namespace OpenRCT2::Audio
private:
static size_t VorbisCallbackRead(void* ptr, size_t size, size_t nmemb, void* datasource)
{
return SDL_RWread(reinterpret_cast<SDL_RWops*>(datasource), ptr, size, nmemb);
return SDL_RWread(static_cast<SDL_RWops*>(datasource), ptr, size, nmemb);
}
static int VorbisCallbackSeek(void* datasource, ogg_int64_t offset, int whence)
{
return (SDL_RWseek(reinterpret_cast<SDL_RWops*>(datasource), offset, whence) < 0) ? -1 : 0;
return (SDL_RWseek(static_cast<SDL_RWops*>(datasource), offset, whence) < 0) ? -1 : 0;
}
static long VorbisCallbackTell(void* datasource)
{
return static_cast<long>(SDL_RWtell(reinterpret_cast<SDL_RWops*>(datasource)));
return static_cast<long>(SDL_RWtell(static_cast<SDL_RWops*>(datasource)));
}
};
#endif