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

Plugins/Assimp: Fix compilation

This commit is contained in:
Lynix 2016-11-27 14:20:22 +01:00
parent 649001b696
commit c99008f7b5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Assimp/CustomStream.cpp
View File

@ -69,7 +69,7 @@ size_t StreamWrite(aiFile* file, const char* buffer, size_t size, size_t count)
aiFile* StreamOpener(aiFileIO* fileIO, const char* filePath, const char* openMode) aiFile* StreamOpener(aiFileIO* fileIO, const char* filePath, const char* openMode)
{ {
FileIOUserdata* fileIOUserdata = reinterpret_cast<FileIOUserdata*>(fileIO->UserData); FileIOUserdata* fileIOUserdata = reinterpret_cast<FileIOUserdata*>(fileIO->UserData);
bool isOriginalStream = (std::strcmp(filePath, fileIOUserdata->originalFilePath) == 0); bool isOriginalStream = (std::strcmp(filePath, fileIOUserdata->originalFilePath) == 0);
if (!isOriginalStream && strstr(filePath, StreamPath) != 0) if (!isOriginalStream && strstr(filePath, StreamPath) != 0)
@ -83,7 +83,7 @@ aiFile* StreamOpener(aiFileIO* fileIO, const char* filePath, const char* openMod
ErrorFlags errFlags(ErrorFlag_ThrowExceptionDisabled, true); ErrorFlags errFlags(ErrorFlag_ThrowExceptionDisabled, true);
///TODO: Move to File::DecodeOpenMode ///TODO: Move to File::DecodeOpenMode
UInt32 openModeEnum = 0; OpenModeFlags openModeEnum = 0;
if (std::strchr(openMode, 'r')) if (std::strchr(openMode, 'r'))
{ {
@ -133,10 +133,10 @@ aiFile* StreamOpener(aiFileIO* fileIO, const char* filePath, const char* openMod
void StreamCloser(aiFileIO* fileIO, aiFile* file) void StreamCloser(aiFileIO* fileIO, aiFile* file)
{ {
FileIOUserdata* fileIOUserdata = reinterpret_cast<FileIOUserdata*>(fileIO->UserData); FileIOUserdata* fileIOUserdata = reinterpret_cast<FileIOUserdata*>(fileIO->UserData);
Stream* fileUserdata = reinterpret_cast<Stream*>(file->UserData); Stream* fileUserdata = reinterpret_cast<Stream*>(file->UserData);
if (fileUserdata != fileIOUserdata->originalStream) if (fileUserdata != fileIOUserdata->originalStream)
delete reinterpret_cast<File*>(file->UserData); delete reinterpret_cast<File*>(file->UserData);
delete file; delete file;