Browse Source

Fix string length calculation.

Marco Feuerstein 2 years ago
parent
commit
1c0f3c5f87
2 changed files with 4 additions and 4 deletions
  1. 2 2
      code/AssetLib/glTF/glTFImporter.cpp
  2. 2 2
      code/AssetLib/glTF2/glTF2Importer.cpp

+ 2 - 2
code/AssetLib/glTF/glTFImporter.cpp

@@ -93,7 +93,7 @@ const aiImporterDesc *glTFImporter::GetInfo() const {
 bool glTFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /* checkSig */) const {
     glTF::Asset asset(pIOHandler);
     try {
-        asset.Load(pFile, CheckMagicToken(pIOHandler, pFile, AI_GLB_MAGIC_NUMBER, AI_COUNT_OF(AI_GLB_MAGIC_NUMBER)));
+        asset.Load(pFile, CheckMagicToken(pIOHandler, pFile, AI_GLB_MAGIC_NUMBER, strlen(AI_GLB_MAGIC_NUMBER)));
         return asset.asset;
     } catch (...) {
         return false;
@@ -697,7 +697,7 @@ void glTFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOS
 
     // read the asset file
     glTF::Asset asset(pIOHandler);
-    asset.Load(pFile, CheckMagicToken(pIOHandler, pFile, AI_GLB_MAGIC_NUMBER, AI_COUNT_OF(AI_GLB_MAGIC_NUMBER)));
+    asset.Load(pFile, CheckMagicToken(pIOHandler, pFile, AI_GLB_MAGIC_NUMBER, strlen(AI_GLB_MAGIC_NUMBER)));
 
     //
     // Copy the data out

+ 2 - 2
code/AssetLib/glTF2/glTF2Importer.cpp

@@ -113,7 +113,7 @@ bool glTF2Importer::CanRead(const std::string &filename, IOSystem *pIOHandler, b
     if (pIOHandler) {
         glTF2::Asset asset(pIOHandler);
         return asset.CanRead(filename, CheckMagicToken(pIOHandler, filename, AI_GLB_MAGIC_NUMBER,
-                                                       AI_COUNT_OF(AI_GLB_MAGIC_NUMBER)));
+                                                       strlen(AI_GLB_MAGIC_NUMBER)));
     }
 
     return false;
@@ -1679,7 +1679,7 @@ void glTF2Importer::InternReadFile(const std::string &pFile, aiScene *pScene, IO
 
     // read the asset file
     glTF2::Asset asset(pIOHandler, static_cast<rapidjson::IRemoteSchemaDocumentProvider *>(mSchemaDocumentProvider));
-    asset.Load(pFile, CheckMagicToken(pIOHandler, pFile, AI_GLB_MAGIC_NUMBER, AI_COUNT_OF(AI_GLB_MAGIC_NUMBER)));
+    asset.Load(pFile, CheckMagicToken(pIOHandler, pFile, AI_GLB_MAGIC_NUMBER, strlen(AI_GLB_MAGIC_NUMBER)));
     if (asset.scene) {
         pScene->mName = asset.scene->name;
     }