flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Use string.reserve to avoid the need to do inplace byteswap

Browse Source
This commit is contained in:
Tycho 2014-03-10 11:24:12 -07:00
parent cff6631513
commit 8947f80294
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/WorldStorage/FastNBT.cpp
View File

@ -506,22 +506,18 @@ void cFastNBTWriter::AddIntArray(const AString & a_Name, const int * a_Value, si
{ {
TagCommon(a_Name, TAG_IntArray); TagCommon(a_Name, TAG_IntArray);
Int32 len = htonl(a_NumElements); Int32 len = htonl(a_NumElements);
size_t cap = m_Result.capacity();
size_t size = m_Result.length();
if ((cap - size) < (4 + a_NumElements * 4))
{
m_Result.reserve(size +4 + a_NumElements * 4);
}
m_Result.append((const char *)&len, 4); m_Result.append((const char *)&len, 4);
#if defined(ANDROID_NDK)
// Android has alignment issues - cannot byteswap (htonl) an int that is not 32-bit-aligned, which happens in the regular version
for (size_t i = 0; i < a_NumElements; i++) for (size_t i = 0; i < a_NumElements; i++)
{ {
int Element = htonl(a_Value[i]); int Element = htonl(a_Value[i]);
m_Result.append((const char *)&Element, 4); m_Result.append((const char *)&Element, 4);
} }
#else
int * Elements = (int *)(m_Result.data() + m_Result.size());
m_Result.append(a_NumElements * 4, (char)0);
for (size_t i = 0; i < a_NumElements; i++)
{
Elements[i] = htonl(a_Value[i]);
}
#endif
} }