mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #365 from TsudaKageyu/remove-cmake-float

Browse Source 
Removed some unnecessary CMake checks for the size of numeric types.
This commit is contained in:
Lukáš Lalinský 2014-04-02 09:36:12 +02:00
commit 329abdbce7
3 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ConfigureChecks.cmake
View File

@ -39,12 +39,6 @@ else()
set(SYSTEM_BYTEORDER 2)
endif()
# Determine the size of floating point types.
check_type_size("float" SIZEOF_FLOAT)
check_type_size("double" SIZEOF_DOUBLE)
check_type_size("long double" SIZEOF_LONGDOUBLE)
# Determine which kind of byte swap functions your compiler supports.
# GCC's __builtin_bswap* should be checked individually

5
config.h.cmake
View File

@ -4,11 +4,6 @@
/* 1 if little-endian, 2 if big-endian. */
#cmakedefine SYSTEM_BYTEORDER ${SYSTEM_BYTEORDER}
/* Size of floating point types */
#cmakedefine SIZEOF_FLOAT ${SIZEOF_FLOAT}
#cmakedefine SIZEOF_DOUBLE ${SIZEOF_DOUBLE}
#cmakedefine SIZEOF_LONGDOUBLE ${SIZEOF_LONGDOUBLE}
/* Defined if your compiler supports some byte swap functions */
#cmakedefine HAVE_GCC_BYTESWAP_16 1
#cmakedefine HAVE_GCC_BYTESWAP_32 1

18
taglib/toolkit/tbytevector.cpp
View File

@ -685,9 +685,7 @@ float ByteVector::toFloat32BE(size_t offset) const
return 0.0;
}
#if defined(SIZEOF_FLOAT) && SIZEOF_FLOAT == 4
if(std::numeric_limits<float>::is_iec559)
if(sizeof(float) == 4 && std::numeric_limits<float>::is_iec559)
{
// float is 32-bit wide and IEEE754 compliant.
@ -703,8 +701,6 @@ float ByteVector::toFloat32BE(size_t offset) const
return tmp.f;
}
#endif
const uchar *bytes = reinterpret_cast<const uchar*>(data() + offset);
// 1-bit sign
@ -721,7 +717,7 @@ float ByteVector::toFloat32BE(size_t offset) const
| (static_cast<uint>(bytes[3]));
float val;
if (exponent == 0 && fraction == 0)
if(exponent == 0 && fraction == 0)
val = 0;
else {
if(exponent == 0xFF) {
@ -745,9 +741,7 @@ double ByteVector::toFloat64BE(size_t offset) const
return 0.0;
}
#if defined(SIZEOF_DOUBLE) && SIZEOF_DOUBLE == 8
if(std::numeric_limits<double>::is_iec559)
if(sizeof(double) == 8 && std::numeric_limits<double>::is_iec559)
{
// double is 64-bit wide and IEEE754 compliant.
@ -763,8 +757,6 @@ double ByteVector::toFloat64BE(size_t offset) const
return tmp.f;
}
#endif
const uchar *bytes = reinterpret_cast<const uchar*>(data() + offset);
// 1-bit sign
@ -785,7 +777,7 @@ double ByteVector::toFloat64BE(size_t offset) const
| (static_cast<ulonglong>(bytes[7]));
double val;
if (exponent == 0 && fraction == 0)
if(exponent == 0 && fraction == 0)
val = 0;
else {
if(exponent == 0x7FF) {
@ -829,7 +821,7 @@ long double ByteVector::toFloat80BE(size_t offset) const
| (static_cast<ulonglong>(bytes[9]));
long double val;
if (exponent == 0 && fraction == 0)
if(exponent == 0 && fraction == 0)
val = 0;
else {
if(exponent == 0x7FFF) {