mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-05-30 18:16:31 +03:00
Fixed cIOStreamMemory::Read(). Now memory stream files works with the texture loader.
This commit is contained in:
@@ -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">
|
||||
|
||||
@@ -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 ) {
|
||||
|
||||
Reference in New Issue
Block a user