From a2dadbbe5216674890da5e90e7aef4c913c76e0e Mon Sep 17 00:00:00 2001 From: Jared Mulconry Date: Sat, 19 Nov 2016 00:39:11 +1100 Subject: [PATCH] Fixed build warnings on MSVC14 x64 in the AssBin sources. --- code/AssbinExporter.cpp | 2 +- code/AssbinLoader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/AssbinExporter.cpp b/code/AssbinExporter.cpp index 9240d3739..fcb32c70a 100644 --- a/code/AssbinExporter.cpp +++ b/code/AssbinExporter.cpp @@ -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(uncompressedStream.Tell()); uLongf compressedSize = (uLongf)(uncompressedStream.Tell() * 1.001 + 12.); uint8_t* compressedBuffer = new uint8_t[ compressedSize ]; diff --git a/code/AssbinLoader.cpp b/code/AssbinLoader.cpp index c4261c4cb..7a17d5ad5 100644 --- a/code/AssbinLoader.cpp +++ b/code/AssbinLoader.cpp @@ -659,7 +659,7 @@ void AssbinImporter::InternReadFile( const std::string& pFile, aiScene* pScene, if (compressed) { uLongf uncompressedSize = Read(stream); - uLongf compressedSize = stream->FileSize() - stream->Tell(); + uLongf compressedSize = static_cast(stream->FileSize() - stream->Tell()); unsigned char * compressedData = new unsigned char[ compressedSize ]; stream->Read( compressedData, 1, compressedSize );