sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Serialization: Add correct endianness handling

Browse Source 
Core/File: Remove endianness handling


Former-commit-id: 6f7bba52057f36c507a024f7a7ea873658a3cfd3
This commit is contained in:
Lynix
2015-11-18 18:49:38 +01:00
parent be01b6f3b4
commit 3fb9e57360
12 changed files with 51 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Nazara/Core/File.cpp
View File

@@ -32,7 +32,6 @@ namespace Nz
{
File::File() :
Stream(OpenMode_Current),
m_endianness(Endianness_Unknown),
m_impl(nullptr)
{
}
@@ -53,7 +52,6 @@ namespace Nz
Stream(std::move(file)),
InputStream(std::move(file)),
OutputStream(std::move(file)),
m_endianness(file.m_endianness),
m_filePath(std::move(file.m_filePath)),
m_impl(file.m_impl)
{
@@ -219,22 +217,6 @@ namespace Nz
}
}
std::size_t File::Read(void* buffer, std::size_t typeSize, unsigned int count)
{
std::size_t byteRead = Read(buffer, typeSize*count);
if (byteRead == 0)
return 0;
if (buffer && typeSize != 1 && m_endianness != Endianness_Unknown && m_endianness != GetPlatformEndianness())
{
unsigned int typeCount = byteRead/typeSize;
for (unsigned int i = 0; i < typeCount; ++i)
SwapBytes(reinterpret_cast<UInt8*>(buffer) + i*typeSize, typeSize);
}
return byteRead;
}
bool File::Rename(const String& newFilePath)
{
NazaraLock(m_mutex)
@@ -311,13 +293,6 @@ namespace Nz
return m_impl->SetCursorPos(CursorPosition_AtBegin, offset);
}
void File::SetEndianness(Endianness endianness)
{
NazaraLock(m_mutex)
m_endianness = endianness;
}
bool File::SetFile(const String& filePath)
{
NazaraLock(m_mutex)
@@ -359,29 +334,6 @@ namespace Nz
return m_impl->Write(buffer, size);
}
std::size_t File::Write(const void* buffer, std::size_t typeSize, unsigned int count)
{
if (count == 0 || typeSize == 0)
return 0;
NazaraAssert(buffer, "Invalid buffer");
NazaraLock(m_mutex)
if (m_endianness != Endianness_Unknown && m_endianness != GetPlatformEndianness() && typeSize != 1)
{
std::unique_ptr<char[]> buf(new char[count*typeSize]);
std::memcpy(buf.get(), buffer, count*typeSize);
for (unsigned int i = 0; i < count; ++i)
SwapBytes(&buf[i*typeSize], typeSize);
return Write(buf.get(), count*typeSize);
}
else
return Write(buffer, count*typeSize);
}
File& File::operator=(const String& filePath)
{
SetFile(filePath);
@@ -393,10 +345,8 @@ namespace Nz
{
NazaraLock(m_mutex)
std::swap(m_endianness, file.m_endianness);
std::swap(m_filePath, file.m_filePath);
std::swap(m_impl, file.m_impl);
std::swap(m_openMode, file.m_openMode);
return *this;
}

8
src/Nazara/Core/String.cpp
View File

@@ -4209,19 +4209,19 @@ namespace Nz
return emptyString;
}
bool Serialize(OutputStream* output, const String& string)
bool Serialize(OutputStream* output, const String& string, Endianness dataEndianness)
{
if (!Serialize<UInt32>(output, string.GetSize()))
if (!Serialize<UInt32>(output, string.GetSize(), dataEndianness))
return false;
output->Write(string.GetConstBuffer(), string.GetSize());
return true;
}
bool Unserialize(InputStream* input, String* string)
bool Unserialize(InputStream* input, String* string, Endianness dataEndianness)
{
UInt32 size;
if (!Unserialize(input, &size))
if (!Unserialize(input, &size, dataEndianness))
return false;
string->Resize(size);