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

Blenderloader: get rid of some type mismatch warnings in 32 bit mode. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@800 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-08-23 18:13:36 +00:00
parent 72a64192b8
commit 9b6b99842d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/BlenderLoader.cpp
View File

@ -426,7 +426,7 @@ void BlenderImporter::ResolveImage(MaterialHelper* out, const Material* mat, con
tex->mWidth = img->packedfile->size; tex->mWidth = img->packedfile->size;
uint8_t* ch = new uint8_t[tex->mWidth]; uint8_t* ch = new uint8_t[tex->mWidth];
conv_data.db.reader->SetCurrentPos(img->packedfile->data->val); conv_data.db.reader->SetCurrentPos(static_cast<size_t>( img->packedfile->data->val));
conv_data.db.reader->CopyAndAdvance(ch,tex->mWidth); conv_data.db.reader->CopyAndAdvance(ch,tex->mWidth);
tex->pcData = reinterpret_cast<aiTexel*>(ch); tex->pcData = reinterpret_cast<aiTexel*>(ch);
@ -648,7 +648,7 @@ void BlenderImporter::ConvertMesh(const Scene& in, const Object* obj, const Mesh
// of the material entry within the list of resolved materials. // of the material entry within the list of resolved materials.
if (mesh->mat) { if (mesh->mat) {
if (it.first >= mesh->mat.size() ) { if (static_cast<size_t> ( it.first ) >= mesh->mat.size() ) {
ThrowException("Material index is out of range"); ThrowException("Material index is out of range");
} }
@ -754,7 +754,7 @@ void BlenderImporter::ConvertMesh(const Scene& in, const Object* obj, const Mesh
// collect texture coordinates, they're stored in a separate per-face buffer // collect texture coordinates, they're stored in a separate per-face buffer
if (mesh->mtface) { if (mesh->mtface) {
if (mesh->totface > mesh->mtface.size()) { if (mesh->totface > static_cast<int> ( mesh->mtface.size())) {
ThrowException("Number of UV faces is larger than the corresponding UV face array (#1)"); ThrowException("Number of UV faces is larger than the corresponding UV face array (#1)");
} }
for (std::vector<aiMesh*>::iterator it = temp->begin()+old; it != temp->end(); ++it) { for (std::vector<aiMesh*>::iterator it = temp->begin()+old; it != temp->end(); ++it) {
@ -780,7 +780,7 @@ void BlenderImporter::ConvertMesh(const Scene& in, const Object* obj, const Mesh
// collect texture coordinates, old-style (marked as deprecated in current blender sources) // collect texture coordinates, old-style (marked as deprecated in current blender sources)
if (mesh->tface) { if (mesh->tface) {
if (mesh->totface > mesh->mtface.size()) { if (mesh->totface > static_cast<int> ( mesh->mtface.size())) {
ThrowException("Number of faces is larger than the corresponding UV face array (#2)"); ThrowException("Number of faces is larger than the corresponding UV face array (#2)");
} }
for (std::vector<aiMesh*>::iterator it = temp->begin()+old; it != temp->end(); ++it) { for (std::vector<aiMesh*>::iterator it = temp->begin()+old; it != temp->end(); ++it) {
@ -806,7 +806,7 @@ void BlenderImporter::ConvertMesh(const Scene& in, const Object* obj, const Mesh
// collect vertex colors, stored separately as well // collect vertex colors, stored separately as well
if (mesh->mcol) { if (mesh->mcol) {
if (mesh->totface > (mesh->mcol.size()/4)) { if (mesh->totface > static_cast<int> ( (mesh->mcol.size()/4)) ) {
ThrowException("Number of faces is larger than the corresponding color face array"); ThrowException("Number of faces is larger than the corresponding color face array");
} }
for (std::vector<aiMesh*>::iterator it = temp->begin()+old; it != temp->end(); ++it) { for (std::vector<aiMesh*>::iterator it = temp->begin()+old; it != temp->end(); ++it) {