From c99008f7b5823387570aa577e412fd932cb1c1a9 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 27 Nov 2016 14:20:22 +0100 Subject: [PATCH] Plugins/Assimp: Fix compilation --- plugins/Assimp/CustomStream.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Assimp/CustomStream.cpp b/plugins/Assimp/CustomStream.cpp index 643a5b13f..246e85ba5 100644 --- a/plugins/Assimp/CustomStream.cpp +++ b/plugins/Assimp/CustomStream.cpp @@ -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) { - FileIOUserdata* fileIOUserdata = reinterpret_cast(fileIO->UserData); + FileIOUserdata* fileIOUserdata = reinterpret_cast(fileIO->UserData); bool isOriginalStream = (std::strcmp(filePath, fileIOUserdata->originalFilePath) == 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); ///TODO: Move to File::DecodeOpenMode - UInt32 openModeEnum = 0; + OpenModeFlags openModeEnum = 0; 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) { - FileIOUserdata* fileIOUserdata = reinterpret_cast(fileIO->UserData); - Stream* fileUserdata = reinterpret_cast(file->UserData); - - if (fileUserdata != fileIOUserdata->originalStream) + FileIOUserdata* fileIOUserdata = reinterpret_cast(fileIO->UserData); + Stream* fileUserdata = reinterpret_cast(file->UserData); + + if (fileUserdata != fileIOUserdata->originalStream) delete reinterpret_cast(file->UserData); delete file;