Fixed build warnings on MSVC14 x64 in the AssBin sources.
authorJared Mulconry <j.mulconry@atomizergames.com>
Fri, 18 Nov 2016 13:39:11 +0000 (00:39 +1100)
committerJared Mulconry <j.mulconry@atomizergames.com>
Fri, 18 Nov 2016 13:39:11 +0000 (00:39 +1100)
code/AssbinExporter.cpp
code/AssbinLoader.cpp

index 9240d37..fcb32c7 100644 (file)
@@ -737,7 +737,7 @@ inline size_t WriteArray(IOStream * stream, const T* in, unsigned int size)
                 AssbinChunkWriter uncompressedStream( NULL, 0 );
                 WriteBinaryScene( &uncompressedStream, pScene );
 
-                uLongf uncompressedSize = uncompressedStream.Tell();
+                uLongf uncompressedSize = static_cast<uLongf>(uncompressedStream.Tell());
                 uLongf compressedSize = (uLongf)(uncompressedStream.Tell() * 1.001 + 12.);
                 uint8_t* compressedBuffer = new uint8_t[ compressedSize ];
 
index c4261c4..7a17d5a 100644 (file)
@@ -659,7 +659,7 @@ void AssbinImporter::InternReadFile( const std::string& pFile, aiScene* pScene,
     if (compressed)
     {
         uLongf uncompressedSize = Read<uint32_t>(stream);
-        uLongf compressedSize = stream->FileSize() - stream->Tell();
+        uLongf compressedSize = static_cast<uLongf>(stream->FileSize() - stream->Tell());
 
         unsigned char * compressedData = new unsigned char[ compressedSize ];
         stream->Read( compressedData, 1, compressedSize );