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

fix misor findings.

pull/3012/head
kimkulling 2020-03-11 17:42:10 +01:00
parent 69551e81ed
commit 19b40397a9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/glTF/glTFAsset.inl
View File

@ -1369,8 +1369,9 @@ inline void Asset::ReadExtensionsUsed(Document &doc) {
#undef CHECK_EXT #undef CHECK_EXT
} }
inline IOStream *Asset::OpenFile(std::string path, const char *mode, bool /*absolute*/) { inline IOStream *Asset::OpenFile(std::string path, const char *mode, bool absolute ) {
#ifdef ASSIMP_API #ifdef ASSIMP_API
(void) absolute;
return mIOSystem->Open(path, mode); return mIOSystem->Open(path, mode);
#else #else
if (path.size() < 2) return 0; if (path.size() < 2) return 0;

4
tools/assimp_cmd/ImageExtractor.cpp
View File

@ -198,8 +198,7 @@ int SaveAsTGA(FILE *file, const aiTexel *data, unsigned int width, unsigned int
// ----------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------
// Do the texture import for a given aiTexture // Do the texture import for a given aiTexture
int DoExport(const aiTexture *tx, FILE *p, const std::string &extension, int DoExport(const aiTexture *tx, FILE *p, const std::string &extension, unsigned int flags) {
unsigned int flags) {
// export the image to the appropriate decoder // export the image to the appropriate decoder
if (extension == "bmp") { if (extension == "bmp") {
SaveAsBMP(p, tx->pcData, tx->mWidth, tx->mHeight, SaveAsBMP(p, tx->pcData, tx->mWidth, tx->mHeight,
@ -355,6 +354,7 @@ int Assimp_Extract(const char *const *params, unsigned int num) {
if (texIdx != 0xffffffff) { if (texIdx != 0xffffffff) {
return m; return m;
} }
}
return AssimpCmdError::Success; return AssimpCmdError::Success;
} }