From f170c842263b0d3ddd3d92e4445175ec9a6ae6dd Mon Sep 17 00:00:00 2001 From: rickomax Date: Sun, 6 Jan 2019 19:38:29 -0200 Subject: [PATCH] Test fixes Test fixes --- code/FBXConverter.cpp | 2 +- code/Importer/IFC/IFCLoader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp index cd9ad0966..b14bbfe98 100644 --- a/code/FBXConverter.cpp +++ b/code/FBXConverter.cpp @@ -3208,7 +3208,7 @@ namespace Assimp { out->mMetaData->Set(5, "CoordAxisSign", doc.GlobalSettings().CoordAxisSign()); out->mMetaData->Set(6, "OriginalUpAxis", doc.GlobalSettings().OriginalUpAxis()); out->mMetaData->Set(7, "OriginalUpAxisSign", doc.GlobalSettings().OriginalUpAxisSign()); - out->mMetaData->Set(8, "UnitScaleFactor", doc.GlobalSettings().UnitScaleFactor()); + out->mMetaData->Set(8, "UnitScaleFactor", (double)doc.GlobalSettings().UnitScaleFactor()); out->mMetaData->Set(9, "OriginalUnitScaleFactor", doc.GlobalSettings().OriginalUnitScaleFactor()); out->mMetaData->Set(10, "AmbientColor", doc.GlobalSettings().AmbientColor()); out->mMetaData->Set(11, "FrameRate", (int)doc.GlobalSettings().TimeMode()); diff --git a/code/Importer/IFC/IFCLoader.cpp b/code/Importer/IFC/IFCLoader.cpp index 0b423a4cd..2c95872d3 100644 --- a/code/Importer/IFC/IFCLoader.cpp +++ b/code/Importer/IFC/IFCLoader.cpp @@ -221,7 +221,7 @@ void IFCImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS free(buffer); } while (read > 0); size_t filesize = fileInfo.uncompressed_size; - if (total < 0 || size_t(total) != filesize) + if (total == 0 || size_t(total) != filesize) { delete[] buff; ThrowException("Failed to decompress IFC ZIP file");