From 19b40397a9ef49a9ea02eb38ced4876441a5707f Mon Sep 17 00:00:00 2001 From: kimkulling Date: Wed, 11 Mar 2020 17:42:10 +0100 Subject: [PATCH] fix misor findings. --- code/glTF/glTFAsset.inl | 3 ++- tools/assimp_cmd/ImageExtractor.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/glTF/glTFAsset.inl b/code/glTF/glTFAsset.inl index 53b30d82d..30855ba92 100644 --- a/code/glTF/glTFAsset.inl +++ b/code/glTF/glTFAsset.inl @@ -1369,8 +1369,9 @@ inline void Asset::ReadExtensionsUsed(Document &doc) { #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 + (void) absolute; return mIOSystem->Open(path, mode); #else if (path.size() < 2) return 0; diff --git a/tools/assimp_cmd/ImageExtractor.cpp b/tools/assimp_cmd/ImageExtractor.cpp index fe6edba5e..db214ea0f 100644 --- a/tools/assimp_cmd/ImageExtractor.cpp +++ b/tools/assimp_cmd/ImageExtractor.cpp @@ -198,8 +198,7 @@ int SaveAsTGA(FILE *file, const aiTexel *data, unsigned int width, unsigned int // ----------------------------------------------------------------------------------- // Do the texture import for a given aiTexture -int DoExport(const aiTexture *tx, FILE *p, const std::string &extension, - unsigned int flags) { +int DoExport(const aiTexture *tx, FILE *p, const std::string &extension, unsigned int flags) { // export the image to the appropriate decoder if (extension == "bmp") { 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) { return m; } - + } + return AssimpCmdError::Success; }