From: Jared Mulconry Date: Sat, 19 Nov 2016 14:36:33 +0000 (+1100) Subject: Fixed build warnings on MSVC14 x64 in the core Importer. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7efb50ad1515dd260e066e835110a6e94b609c9;p=platform%2Fupstream%2Fassimp.git Fixed build warnings on MSVC14 x64 in the core Importer. --- diff --git a/code/Importer.cpp b/code/Importer.cpp index 45b91fe..d60dfb6 100644 --- a/code/Importer.cpp +++ b/code/Importer.cpp @@ -654,7 +654,7 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags) uint32_t fileSize = 0; if (fileIO) { - fileSize = fileIO->FileSize(); + fileSize = static_cast(fileIO->FileSize()); pimpl->mIOHandler->Close( fileIO ); } @@ -790,7 +790,7 @@ const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags) for( unsigned int a = 0; a < pimpl->mPostProcessingSteps.size(); a++) { BaseProcess* process = pimpl->mPostProcessingSteps[a]; - pimpl->mProgressHandler->UpdatePostProcess( a, pimpl->mPostProcessingSteps.size() ); + pimpl->mProgressHandler->UpdatePostProcess(static_cast(a), static_cast(pimpl->mPostProcessingSteps.size()) ); if( process->IsActive( pFlags)) { if (profiler) { @@ -825,7 +825,7 @@ const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags) } #endif // ! DEBUG } - pimpl->mProgressHandler->UpdatePostProcess( pimpl->mPostProcessingSteps.size(), pimpl->mPostProcessingSteps.size() ); + pimpl->mProgressHandler->UpdatePostProcess( static_cast(pimpl->mPostProcessingSteps.size()), static_cast(pimpl->mPostProcessingSteps.size()) ); // update private scene flags if( pimpl->mScene )