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 #137 from TsudaKageyu/refactor-bytevector

Browse Source 
Small refactoring of tbytevector.cpp
This commit is contained in:
Tsuda Kageyu 2013-04-15 22:55:22 -07:00
commit 0bb995abd0
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
taglib/toolkit/tbytevector.cpp
View File

@ -208,22 +208,21 @@ T toNumber(const ByteVector &v, bool mostSignificantByteFirst)
return 0;
}
const size_t size = sizeof(T);
if(v.size() >= size)
{
if(v.size() >= sizeof(T)) {
if(isLittleEndianSystem == mostSignificantByteFirst)
return byteSwap<T>(*reinterpret_cast<const T*>(v.data()));
else
return *reinterpret_cast<const T*>(v.data());
}
else {
T sum = 0;
for(size_t i = 0; i < v.size(); i++) {
const size_t shift = (mostSignificantByteFirst ? v.size() - 1 - i : i) * 8;
sum |= static_cast<T>(static_cast<uchar>(v[i]) << shift);
}
const uint last = std::min<uint>(v.size() - 1, size);
T sum = 0;
for(uint i = 0; i <= last; i++)
sum |= (T) uchar(v[i]) << ((mostSignificantByteFirst ? last - i : i) * 8);
return sum;
return sum;
}
}
template <class T>