From 505928cc023c2d5880143f4625ca936cd7aa7841 Mon Sep 17 00:00:00 2001 From: Jared Mulconry Date: Sat, 19 Nov 2016 00:08:44 +1100 Subject: [PATCH] Fixed build warnings on MSVC14 x64 in the 3DS format sources. --- code/3DSConverter.cpp | 4 ++-- code/3DSExporter.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp index 6193605..8390dd2 100644 --- a/code/3DSConverter.cpp +++ b/code/3DSConverter.cpp @@ -690,7 +690,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene* pcSOut,aiNode* pcOut, pcOut->mChildren = new aiNode*[pcIn->mChildren.size()]; // Recursively process all children - const unsigned int size = pcIn->mChildren.size(); + const unsigned int size = static_cast(pcIn->mChildren.size()); for (unsigned int i = 0; i < size;++i) { pcOut->mChildren[i] = new aiNode(); @@ -742,7 +742,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene* pcOut) DefaultLogger::get()->warn("No hierarchy information has been found in the file. "); pcOut->mRootNode->mNumChildren = pcOut->mNumMeshes + - mScene->mCameras.size() + mScene->mLights.size(); + static_cast(mScene->mCameras.size() + mScene->mLights.size()); pcOut->mRootNode->mChildren = new aiNode* [ pcOut->mRootNode->mNumChildren ]; pcOut->mRootNode->mName.Set("<3DSDummyRoot>"); diff --git a/code/3DSExporter.cpp b/code/3DSExporter.cpp index d349018..1d49a53 100644 --- a/code/3DSExporter.cpp +++ b/code/3DSExporter.cpp @@ -87,7 +87,7 @@ namespace { const std::size_t chunk_size = head_pos - chunk_start_pos; writer.SetCurrentPos(chunk_start_pos + SIZE_OFFSET); - writer.PutU4(chunk_size); + writer.PutU4(static_cast(chunk_size)); writer.SetCurrentPos(head_pos); } -- 2.7.4