Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of warnings on GCC4.4 with -wall

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@541 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-02-06 23:52:41 +00:00
parent 7dcbff5d5c
commit 17326515d4
33 changed files with 206 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/ValidateDataStructure.cpp
View File

@@ -355,7 +355,7 @@ void ValidateDSProcess::Validate( const aiMesh* pMesh)
}
// positions must always be there ...
if (!pMesh->mNumVertices || !pMesh->mVertices && !mScene->mFlags) {
if (!pMesh->mNumVertices || (!pMesh->mVertices && !mScene->mFlags)) {
ReportError("The mesh contains no vertices");
}
@@ -365,7 +365,7 @@ void ValidateDSProcess::Validate( const aiMesh* pMesh)
}
// faces, too
if (!pMesh->mNumFaces || !pMesh->mFaces && !mScene->mFlags) {
if (!pMesh->mNumFaces || (!pMesh->mFaces && !mScene->mFlags)) {
ReportError("The mesh contains no faces");
}
@@ -758,10 +758,10 @@ void ValidateDSProcess::Validate( const aiTexture* pTexture)
}
const char* sz = pTexture->achFormatHint;
if (sz[0] >= 'A' && sz[0] <= 'Z' ||
sz[1] >= 'A' && sz[1] <= 'Z' ||
sz[2] >= 'A' && sz[2] <= 'Z' ||
sz[3] >= 'A' && sz[3] <= 'Z') {
if ((sz[0] >= 'A' && sz[0] <= 'Z') ||
(sz[1] >= 'A' && sz[1] <= 'Z') ||
(sz[2] >= 'A' && sz[2] <= 'Z') ||
(sz[3] >= 'A' && sz[3] <= 'Z')) {
ReportError("aiTexture::achFormatHint contains non-lowercase characters");
}
}