v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler warnings.

pull/2371/head
kkulling 2019-03-13 14:40:02 +01:00
parent 152cddedd3
commit 0dc2e9197a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssbinLoader.cpp
View File

@ -708,7 +708,7 @@ void AssbinImporter::InternReadFile( const std::string& pFile, aiScene* pScene,
unsigned char * uncompressedData = new unsigned char[ uncompressedSize ]; unsigned char * uncompressedData = new unsigned char[ uncompressedSize ];
int res = uncompress( uncompressedData, &uncompressedSize, compressedData, len ); int res = uncompress( uncompressedData, &uncompressedSize, compressedData, (uLong) len );
if(res != Z_OK) if(res != Z_OK)
{ {
delete [] uncompressedData; delete [] uncompressedData;

2
code/FBXConverter.cpp
View File

@ -964,7 +964,7 @@ namespace Assimp {
{ {
if (indices[i] < 0) epcount++; if (indices[i] < 0) epcount++;
} }
unsigned int pcount = indices.size(); unsigned int pcount = static_cast<unsigned int>( indices.size() );
unsigned int scount = out_mesh->mNumFaces = pcount - epcount; unsigned int scount = out_mesh->mNumFaces = pcount - epcount;
aiFace* fac = out_mesh->mFaces = new aiFace[scount](); aiFace* fac = out_mesh->mFaces = new aiFace[scount]();

4
code/SMDLoader.cpp
View File

@ -486,7 +486,7 @@ void SMDImporter::CreateOutputAnimations(const std::string &pFile, IOSystem* pIO
if (bLoadAnimationList) { if (bLoadAnimationList) {
GetAnimationFileList(pFile, pIOHandler, animFileList); GetAnimationFileList(pFile, pIOHandler, animFileList);
} }
int animCount = animFileList.size() + 1; int animCount = static_cast<int>( animFileList.size() + 1u );
pScene->mNumAnimations = 1; pScene->mNumAnimations = 1;
pScene->mAnimations = new aiAnimation*[animCount]; pScene->mAnimations = new aiAnimation*[animCount];
memset(pScene->mAnimations, 0, sizeof(aiAnimation*)*animCount); memset(pScene->mAnimations, 0, sizeof(aiAnimation*)*animCount);
@ -510,7 +510,7 @@ void SMDImporter::CreateOutputAnimation(int index, const std::string &name) {
anim->mName.Set(name.c_str()); anim->mName.Set(name.c_str());
} }
anim->mDuration = dLengthOfAnim; anim->mDuration = dLengthOfAnim;
anim->mNumChannels = asBones.size(); anim->mNumChannels = static_cast<unsigned int>( asBones.size() );
anim->mTicksPerSecond = 25.0; // FIXME: is this correct? anim->mTicksPerSecond = 25.0; // FIXME: is this correct?
aiNodeAnim** pp = anim->mChannels = new aiNodeAnim*[anim->mNumChannels]; aiNodeAnim** pp = anim->mChannels = new aiNodeAnim*[anim->mNumChannels];

4
test/unit/utSTLImportExport.cpp
View File

@ -152,10 +152,10 @@ TEST_F(utSTLImporterExporter, test_export_pointclouds) {
auto pMesh = scene.mMeshes[0]; auto pMesh = scene.mMeshes[0];
long numValidPoints = points.size(); size_t numValidPoints = points.size();
pMesh->mVertices = new aiVector3D[numValidPoints]; pMesh->mVertices = new aiVector3D[numValidPoints];
pMesh->mNumVertices = numValidPoints; pMesh->mNumVertices = static_cast<unsigned int>( numValidPoints );
int i = 0; int i = 0;
for (XYZ &p : points) { for (XYZ &p : points) {

2
tools/assimp_view/SceneAnimator.cpp
View File

@ -90,7 +90,7 @@ void SceneAnimator::SetAnimIndex( size_t pAnimIndex) {
delete mAnimEvaluator; mAnimEvaluator = nullptr; delete mAnimEvaluator; mAnimEvaluator = nullptr;
mNodesByName.clear(); mNodesByName.clear();
mCurrentAnimIndex = pAnimIndex; mCurrentAnimIndex = static_cast<int>( pAnimIndex );
// create the internal node tree. Do this even in case of invalid animation index // create the internal node tree. Do this even in case of invalid animation index
// so that the transformation matrices are properly set up to mimic the current scene // so that the transformation matrices are properly set up to mimic the current scene