mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #691 from FestusHagen/fh1.m_ushortAmbiguities

Browse Source 
Silence ushort ambiguity errors
This commit is contained in:
Tsuda Kageyu 2015-12-01 00:02:25 +09:00
commit b4b16fd7e0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
taglib/toolkit/tstring.cpp
View File

@ -174,7 +174,7 @@ namespace
if(length > 0) {
if(swap) {
for(size_t i = 0; i < length; ++i)
data[i] = Utils::byteSwap(static_cast<ushort>(s[i]));
data[i] = Utils::byteSwap(static_cast<TagLib::ushort>(s[i]));
}
else {
::wmemcpy(&data[0], s, length);
@ -194,7 +194,7 @@ namespace
}
// Uses memcpy instead of reinterpret_cast to avoid an alignment exception.
ushort bom;
TagLib::ushort bom;
::memcpy(&bom, s, 2);
if(bom == 0xfeff)
@ -215,7 +215,7 @@ namespace
data.resize(length / 2);
for(size_t i = 0; i < length / 2; ++i) {
ushort c;
TagLib::ushort c;
::memcpy(&c, s, 2);
if(swap)
c = Utils::byteSwap(c);