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

Fixed handling UTF-16 byte order.

Browse Source
This commit is contained in:
Tsuda Kageyu 2014-07-23 15:35:49 +09:00
parent ee2908a6cf
commit 8e6e580c60
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taglib/toolkit/tstring.cpp
View File

@ -48,11 +48,6 @@
namespace
{
inline unsigned short combine(unsigned char c1, unsigned char c2)
{
return (c1 << 8) | c2;
}
void UTF16toUTF8(const wchar_t *src, size_t srcLength, char *dst, size_t dstLength)
{
#ifdef HAVE_STD_CODECVT
@ -844,7 +839,12 @@ void String::copyFromUTF16(const char *s, size_t length, Type t)
d->data.resize(length / 2);
for(size_t i = 0; i < length / 2; ++i) {
d->data[i] = swap ? combine(*s, *(s + 1)) : combine(*(s + 1), *s);
ushort c;
::memcpy(&c, s, 2);
if(swap)
c = Utils::byteSwap(c);
d->data[i] = static_cast<wchar_t>(c);
s += 2;
}
}