From 19574ded69a0fe10c499e6a75dddca02bc61ddde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Fri, 25 Jan 2013 03:29:15 -0300 Subject: [PATCH] Fixed cIOStreamMemory::Read(). Now memory stream files works with the texture loader. --- projects/linux/ee.creator.user | 4 ++-- src/eepp/system/ciostreammemory.cpp | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index 75aa1b85b..64a1a14e9 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -48,7 +48,7 @@ Desktop Desktop {388e5431-b31b-42b3-b9ad-9002d279d75d} - 10 + 0 0 0 diff --git a/src/eepp/system/ciostreammemory.cpp b/src/eepp/system/ciostreammemory.cpp index 398f6c412..9818d53c3 100644 --- a/src/eepp/system/ciostreammemory.cpp +++ b/src/eepp/system/ciostreammemory.cpp @@ -26,9 +26,17 @@ ios_size cIOStreamMemory::Read( char * data, ios_size size ) { memcpy( data, mReadPtr + mPos, size ); mPos += size; + + return size; + } else if ( mPos != mSize ) { + memcpy( data, mReadPtr + mPos, mSize - mPos ); + + mPos = mSize; + + return size; } - return mPos; + return 0; } ios_size cIOStreamMemory::Write( const char * data, ios_size size ) {