From 43ef4ec715953da08a8a294b0cdadb22311ec40e Mon Sep 17 00:00:00 2001 From: Jared Mulconry Date: Sat, 19 Nov 2016 03:34:39 +1100 Subject: [PATCH] Fixed build warnings on MSVC14 x64 in the D3MF format sources. --- code/D3MFImporter.cpp | 2 +- code/D3MFOpcPackage.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp index e75b89f7e..d8c062de4 100644 --- a/code/D3MFImporter.cpp +++ b/code/D3MFImporter.cpp @@ -172,7 +172,7 @@ private: mesh->mName.Set(name); meshes.push_back(mesh); - meshIds.push_back(meshIdx); + meshIds.push_back(static_cast(meshIdx)); meshIdx++; } diff --git a/code/D3MFOpcPackage.cpp b/code/D3MFOpcPackage.cpp index 2e63a346e..df83e70f5 100644 --- a/code/D3MFOpcPackage.cpp +++ b/code/D3MFOpcPackage.cpp @@ -123,19 +123,19 @@ voidpf IOSystem2Unzip::open(voidpf opaque, const char* filename, int mode) { uLong IOSystem2Unzip::read(voidpf /*opaque*/, voidpf stream, void* buf, uLong size) { IOStream* io_stream = (IOStream*) stream; - return io_stream->Read(buf, 1, size); + return static_cast(io_stream->Read(buf, 1, size)); } uLong IOSystem2Unzip::write(voidpf /*opaque*/, voidpf stream, const void* buf, uLong size) { IOStream* io_stream = (IOStream*) stream; - return io_stream->Write(buf, 1, size); + return static_cast(io_stream->Write(buf, 1, size)); } long IOSystem2Unzip::tell(voidpf /*opaque*/, voidpf stream) { IOStream* io_stream = (IOStream*) stream; - return io_stream->Tell(); + return static_cast(io_stream->Tell()); } long IOSystem2Unzip::seek(voidpf /*opaque*/, voidpf stream, uLong offset, int origin) {