libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-12-09 21:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

lots of new streaming interface additions

Browse Source
This commit is contained in:
Jack Andersen
2015-04-10 14:04:13 -10:00
parent e4f5c09534
commit e4f8c2959f
9 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Athena/FileReader.cpp
View File

@@ -185,6 +185,14 @@ atUint8* FileReader::readUBytes(atUint64 len)
fread(val, 1, len, m_fileHandle);
return val;
}
atUint64 FileReader::readUBytesToBuf(void* buf, atUint64 len)
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
m_bitValid = false;
return fread(buf, 1, len, m_fileHandle);
}
atInt8* FileReader::readBytes(atUint64 len)
{

26
src/Athena/MemoryReader.cpp
View File

@@ -224,11 +224,6 @@ atUint8 MemoryReader::readUByte()
return *(atUint8*)(m_data + m_position++);
}
atInt8* MemoryReader::readBytes(atUint64 length)
{
return (atInt8*)readUBytes(length);
}
atUint8* MemoryReader::readUBytes(atUint64 length)
{
if (!m_data)
@@ -250,7 +245,26 @@ atUint8* MemoryReader::readUBytes(atUint64 length)
m_position += length;
return ret;
}
atUint64 MemoryReader::readUBytesToBuf(void* buf, atUint64 length)
{
if (!m_data)
loadData();
if (m_bitPosition > 0)
{
m_bitPosition = 0;
m_position += sizeof(atUint8);
}
if (m_position + length > m_length)
THROW_IO_EXCEPTION("Position %0.16X outside stream bounds ", m_position);
memcpy(buf, (const atUint8*)(m_data + m_position), length);
m_position += length;
return length;
}
atInt16 MemoryReader::readInt16()
{
if (!m_data)