Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid duplicating an inline template function

Browse Source
This commit is contained in:
Chris Robinson
2021-01-06 17:52:50 -08:00
parent a9ac165c39
commit 948ae3bc7e
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alc/hrtf.cpp
+4 -21
View File
@@ -465,11 +465,9 @@ void MirrorLeftHrirs(const al::span<const HrtfStore::Elevation> elevs, HrirArray
template<typename T, size_t num_bits=sizeof(T)*8> template<typename T, size_t num_bits=sizeof(T)*8>
inline std::enable_if_t<std::is_signed<T>::value,T> inline T readle(std::istream &data)
readle(std::istream &data)
{ {
static_assert((num_bits&7) == 0, "num_bits must be a multiple of 8"); static_assert((num_bits&7) == 0, "num_bits must be a multiple of 8");
constexpr auto signbit = static_cast<T>(1 << (num_bits-1));
al::byte b[num_bits/8]; al::byte b[num_bits/8];
if(!data.read(reinterpret_cast<char*>(b), sizeof(b))) if(!data.read(reinterpret_cast<char*>(b), sizeof(b)))
@@ -482,25 +480,10 @@ readle(std::istream &data)
for(size_t i{0};i < sizeof(b);++i) for(size_t i{0};i < sizeof(b);++i)
ret |= al::to_integer<T>(b[i]) << (i*8); ret |= al::to_integer<T>(b[i]) << (i*8);
} }
return (ret^signbit) - signbit; if /*constexpr*/(std::is_signed<T>::value)
}
template<typename T, size_t num_bits=sizeof(T)*8>
inline std::enable_if_t<!std::is_signed<T>::value,T>
readle(std::istream &data)
{
static_assert((num_bits&7) == 0, "num_bits must be a multiple of 8");
al::byte b[num_bits/8];
if(!data.read(reinterpret_cast<char*>(b), sizeof(b)))
return static_cast<T>(EOF);
T ret{};
if(IS_LITTLE_ENDIAN)
std::memcpy(&ret, b, sizeof(b));
else
{ {
for(size_t i{0};i < sizeof(b);++i) constexpr auto signbit = static_cast<T>(1u << (num_bits-1));
ret |= al::to_integer<T>(b[i]) << (i*8); return (ret^signbit) - signbit;
} }
return ret; return ret;
} }