mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-03 17:18:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #195 from TsudaKageyu/fix-float

Browse Source 
Fixed GCC warnings about incompatible type conversions
This commit is contained in:
Tsuda Kageyu 2013-05-07 08:34:35 -07:00
commit 23418c25a4
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
taglib/ebml/ebmlelement.cpp
View File

@ -23,6 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include "tdebug.h"
#include "ebmlelement.h"
using namespace TagLib;

18
taglib/toolkit/tbytevector.cpp
View File

@ -849,14 +849,17 @@ float ByteVector::toFloat32BE(size_t offset) const
{
// float is 32-bit wide and IEEE754 compliant.
uint tmp;
union {
uint i;
float f;
} tmp;
::memcpy(&tmp, data() + offset, 4);
# if SYSTEM_BYTEORDER == 1
tmp = byteSwap<uint>(tmp);
tmp.i = byteSwap<uint>(tmp.i);
# endif
return *reinterpret_cast<float*>(&tmp);
return tmp.f;
}
#endif
@ -907,14 +910,17 @@ double ByteVector::toFloat64BE(size_t offset) const
{
// double is 64-bit wide and IEEE754 compliant.
ulonglong tmp;
union {
ulonglong i;
double f;
} tmp;
::memcpy(&tmp, data() + offset, 8);
# if SYSTEM_BYTEORDER == 1
tmp = byteSwap<ulonglong>(tmp);
tmp.i = byteSwap<ulonglong>(tmp.i);
# endif
return *reinterpret_cast<double*>(&tmp);
return tmp.f;
}
#endif