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

Fixed detection of alignment-tolerant CPUs

Browse Source
This commit is contained in:
Tsuda Kageyu 2013-04-28 02:57:51 +09:00
parent a80222efa5
commit f3cbb883f2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taglib/toolkit/tstring.cpp
View File

@ -32,6 +32,12 @@
#include <iostream>
#include <string.h>
// x86 CPUs are alignment-tolerant or allow pointer casts from smaller types to larger types.
#if defined(__i386__) || defined(_M_IX86) || defined(__amd64) || defined(__amd64__) \
|| defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)
# define TAGLIB_ALIGNMENT_TOLERANT 1
#endif
#ifdef HAVE_STD_CODECVT
# include <codecvt>
#else
@ -805,16 +811,12 @@ void String::copyFromUTF16(const wchar_t *s, size_t length, Type t)
void String::copyFromUTF16(const char *s, size_t length, Type t)
{
#if !defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
// It's certain that sizeof(wchar_t) == 2 and alignment-tolerant.
#if SIZEOF_WCHAR_T == 2 && defined(TAGLIB_ALIGNMENT_TOLERANT)
copyFromUTF16(reinterpret_cast<const wchar_t*>(s), length / 2, t);
#else
// Maybe sizeof(wchar_t) != 2 or alignment-strict.
bool swap;
if(t == UTF16) {
if(length < 2) {