Fixed cIOStreamMemory::Read(). Now memory stream files works with the texture loader.

This commit is contained in:
Martín Lucas Golini
2013-01-25 03:29:15 -03:00
parent ced581742c
commit 19574ded69
2 changed files with 11 additions and 3 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.6.1, 2013-01-25T02:27:57. -->
<!-- Written by Qt Creator 2.6.1, 2013-01-25T03:26:17. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -48,7 +48,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{388e5431-b31b-42b3-b9ad-9002d279d75d}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">10</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">

View File

@@ -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 ) {