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

Fix some warnings in Collada import

pull/2711/head
RichardTea 2019-10-14 12:15:02 +01:00
parent d371a113fa
commit 198bc428fa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/Collada/ColladaParser.cpp
View File

@ -240,7 +240,8 @@ void ColladaParser::UriDecodePath(aiString& ss)
// adjust length and terminator of the shortened string // adjust length and terminator of the shortened string
*out = 0; *out = 0;
ss.length = (ptrdiff_t)(out - ss.data); ai_assert(out > ss.data);
ss.length = static_cast<ai_uint32>(out - ss.data);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -3119,7 +3120,7 @@ void ColladaParser::ReadMaterialVertexInputBinding(Collada::SemanticMappingTable
} }
} }
void Assimp::ColladaParser::ReadEmbeddedTextures(ZipArchiveIOSystem& zip_archive) void ColladaParser::ReadEmbeddedTextures(ZipArchiveIOSystem& zip_archive)
{ {
// Attempt to load any undefined Collada::Image in ImageLibrary // Attempt to load any undefined Collada::Image in ImageLibrary
for (ImageLibrary::iterator it = mImageLibrary.begin(); it != mImageLibrary.end(); ++it) { for (ImageLibrary::iterator it = mImageLibrary.begin(); it != mImageLibrary.end(); ++it) {