Merge pull request #2 from assimp/master

Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
parent 07bbb2c000 0973f504b5
commit 2a3626577f
76 changed files with 7271 additions and 4140 deletions
--- a/code/AssbinLoader.cpp
+++ b/code/AssbinLoader.cpp
@@ -708,7 +708,7 @@ void AssbinImporter::InternReadFile( const std::string& pFile, aiScene* pScene,

        unsigned char * uncompressedData = new unsigned char[ uncompressedSize ];

-        int res = uncompress( uncompressedData, &uncompressedSize, compressedData, len );
+        int res = uncompress( uncompressedData, &uncompressedSize, compressedData, (uLong) len );
        if(res != Z_OK)
        {
            delete [] uncompressedData;