From: <sv...@op...> - 2024-08-16 06:56:33
|
Author: manx Date: Fri Aug 16 08:56:20 2024 New Revision: 21466 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21466 Log: [Ref] openmpt/soundbase/SampleConvert.hpp: Minor type cleanup. Modified: trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp Modified: trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp Fri Aug 16 08:04:48 2024 (r21465) +++ trunk/OpenMPT/src/openmpt/soundbase/SampleConvert.hpp Fri Aug 16 08:56:20 2024 (r21466) @@ -590,7 +590,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(static_cast<int>(val) - 0x80) * (1.0f / static_cast<float32>(static_cast<unsigned int>(1) << 7)); + return static_cast<float32>(static_cast<int>(val) - 0x80) * (1.0f / static_cast<float32>(static_cast<uint8>(1) << 7)); } }; @@ -601,7 +601,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<unsigned int>(1) << 7)); + return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint8>(1) << 7)); } }; @@ -612,7 +612,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<unsigned int>(1) << 15)); + return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint16>(1) << 15)); } }; @@ -623,7 +623,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<unsigned int>(1) << 23)); + return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint32>(1) << 23)); } }; @@ -634,7 +634,7 @@ using output_t = float32; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<unsigned int>(1) << 31)); + return static_cast<float32>(val) * (1.0f / static_cast<float>(static_cast<uint32>(1) << 31)); } }; @@ -656,7 +656,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(static_cast<int>(val) - 0x80) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 7)); + return static_cast<double>(static_cast<int>(val) - 0x80) * (1.0 / static_cast<double>(static_cast<uint8>(1) << 7)); } }; @@ -667,7 +667,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 7)); + return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<uint8>(1) << 7)); } }; @@ -678,7 +678,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 15)); + return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<uint16>(1) << 15)); } }; @@ -689,7 +689,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 23)); + return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<uint32>(1) << 23)); } }; @@ -700,7 +700,7 @@ using output_t = double; MPT_FORCEINLINE output_t operator()(input_t val) { - return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<unsigned int>(1) << 31)); + return static_cast<double>(val) * (1.0 / static_cast<double>(static_cast<uint32>(1) << 31)); } }; |