diff options
Diffstat (limited to 'code/AssetLib/Assbin')
-rw-r--r-- | code/AssetLib/Assbin/AssbinExporter.cpp | 2 | ||||
-rw-r--r-- | code/AssetLib/Assbin/AssbinExporter.h | 2 | ||||
-rw-r--r-- | code/AssetLib/Assbin/AssbinFileWriter.cpp | 2 | ||||
-rw-r--r-- | code/AssetLib/Assbin/AssbinFileWriter.h | 2 | ||||
-rw-r--r-- | code/AssetLib/Assbin/AssbinLoader.cpp | 15 | ||||
-rw-r--r-- | code/AssetLib/Assbin/AssbinLoader.h | 5 |
6 files changed, 17 insertions, 11 deletions
diff --git a/code/AssetLib/Assbin/AssbinExporter.cpp b/code/AssetLib/Assbin/AssbinExporter.cpp index b8465f866..f9a510a66 100644 --- a/code/AssetLib/Assbin/AssbinExporter.cpp +++ b/code/AssetLib/Assbin/AssbinExporter.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. diff --git a/code/AssetLib/Assbin/AssbinExporter.h b/code/AssetLib/Assbin/AssbinExporter.h index 271b6b833..a3fa99492 100644 --- a/code/AssetLib/Assbin/AssbinExporter.h +++ b/code/AssetLib/Assbin/AssbinExporter.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. diff --git a/code/AssetLib/Assbin/AssbinFileWriter.cpp b/code/AssetLib/Assbin/AssbinFileWriter.cpp index 90bcccf90..d4e25e16b 100644 --- a/code/AssetLib/Assbin/AssbinFileWriter.cpp +++ b/code/AssetLib/Assbin/AssbinFileWriter.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. diff --git a/code/AssetLib/Assbin/AssbinFileWriter.h b/code/AssetLib/Assbin/AssbinFileWriter.h index 84641df46..066470a46 100644 --- a/code/AssetLib/Assbin/AssbinFileWriter.h +++ b/code/AssetLib/Assbin/AssbinFileWriter.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. diff --git a/code/AssetLib/Assbin/AssbinLoader.cpp b/code/AssetLib/Assbin/AssbinLoader.cpp index d2566a85c..b0905298a 100644 --- a/code/AssetLib/Assbin/AssbinLoader.cpp +++ b/code/AssetLib/Assbin/AssbinLoader.cpp @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER // internal headers -#include "AssetLib/Assbin/AssbinLoader.h" +#include "AssbinLoader.h" #include "Common/assbin_chunks.h" #include <assimp/MemoryIOWrapper.h> #include <assimp/anim.h> @@ -91,10 +91,14 @@ bool AssbinImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, boo } char s[32]; - in->Read(s, sizeof(char), 32); + const size_t read = in->Read(s, sizeof(char), 32); pIOHandler->Close(in); + if (read < 19) { + return false; + } + return strncmp(s, "ASSIMP.binary-dump.", 19) == 0; } @@ -684,6 +688,7 @@ void AssbinImporter::InternReadFile(const std::string &pFile, aiScene *pScene, I unsigned int versionMajor = Read<unsigned int>(stream); unsigned int versionMinor = Read<unsigned int>(stream); if (versionMinor != ASSBIN_VERSION_MINOR || versionMajor != ASSBIN_VERSION_MAJOR) { + pIOHandler->Close(stream); throw DeadlyImportError("Invalid version, data format not compatible!"); } @@ -693,8 +698,10 @@ void AssbinImporter::InternReadFile(const std::string &pFile, aiScene *pScene, I shortened = Read<uint16_t>(stream) > 0; compressed = Read<uint16_t>(stream) > 0; - if (shortened) + if (shortened) { + pIOHandler->Close(stream); throw DeadlyImportError("Shortened binaries are not supported!"); + } stream->Seek(256, aiOrigin_CUR); // original filename stream->Seek(128, aiOrigin_CUR); // options diff --git a/code/AssetLib/Assbin/AssbinLoader.h b/code/AssetLib/Assbin/AssbinLoader.h index 2b85e6655..573e10799 100644 --- a/code/AssetLib/Assbin/AssbinLoader.h +++ b/code/AssetLib/Assbin/AssbinLoader.h @@ -1,9 +1,8 @@ - /* Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -61,7 +60,7 @@ struct aiCamera; #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER -namespace Assimp { +namespace Assimp { // --------------------------------------------------------------------------------- /** Importer class for 3D Studio r3 and r4 3DS files |