From 9d12dd6df37ba718817206bedf6f5cdb1ef8ecca Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 21 Sep 2023 21:01:50 +0200 Subject: [PATCH 01/13] Doc: Add wiki link - closes https://github.com/assimp/assimp/issues/5240 --- test/models-nonbsd/IFC/linklist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models-nonbsd/IFC/linklist.txt b/test/models-nonbsd/IFC/linklist.txt index 6971b7a45..91bd70d9e 100644 --- a/test/models-nonbsd/IFC/linklist.txt +++ b/test/models-nonbsd/IFC/linklist.txt @@ -1,4 +1,4 @@ Good IFC test cases =================== -http://www.iai.fzk.de/www-extern/index.php?id=1135 +https://www.ifcwiki.org/index.php/Examples From 0c5138cb392202285ec3e4e63e718407de100544 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 31 Jan 2023 21:23:12 +0100 Subject: [PATCH 02/13] Update: Set new versions --- packaging/windows-innosetup/script_vieweronly.iss | 8 ++++---- packaging/windows-innosetup/script_x64.iss | 8 ++++---- packaging/windows-innosetup/script_x86.iss | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packaging/windows-innosetup/script_vieweronly.iss b/packaging/windows-innosetup/script_vieweronly.iss index 1a91fb9d2..5f7161c7c 100644 --- a/packaging/windows-innosetup/script_vieweronly.iss +++ b/packaging/windows-innosetup/script_vieweronly.iss @@ -2,7 +2,7 @@ [Setup] AppName=Open Asset Import Library - Viewer -AppVerName=Open Asset Import Library - Viewer (v2.0) +AppVerName=Open Asset Import Library - Viewer (v5.2.6) DefaultDirName={pf}\AssimpView DefaultGroupName=AssimpView UninstallDisplayIcon={app}\bin\x86\assimp.exe @@ -12,9 +12,9 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico WizardImageFile=compiler:WizModernImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP LicenseFile=License.rtf -OutputBaseFileName=assimp-view-2.0-setup -VersionInfoVersion=2.0.0.0 -VersionInfoTextVersion=2.0 +OutputBaseFileName=assimp-view-5.0-setup +VersionInfoVersion=5.2.6.0 +VersionInfoTextVersion=5.2.6 VersionInfoCompany=Assimp Development Team ArchitecturesInstallIn64BitMode=x64 diff --git a/packaging/windows-innosetup/script_x64.iss b/packaging/windows-innosetup/script_x64.iss index 2711b1bdf..7ef212f89 100644 --- a/packaging/windows-innosetup/script_x64.iss +++ b/packaging/windows-innosetup/script_x64.iss @@ -2,7 +2,7 @@ [Setup] AppName=Open Asset Import Library - SDK -AppVerName=Open Asset Import Library - SDK (v5.1.0) +AppVerName=Open Asset Import Library - SDK (v5.2.6) DefaultDirName={pf}\Assimp DefaultGroupName=Assimp UninstallDisplayIcon={app}\bin\x64\assimp.exe @@ -12,9 +12,9 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico WizardImageFile=compiler:WizModernImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP LicenseFile=License.rtf -OutputBaseFileName=assimp-sdk-5.1.0-setup -VersionInfoVersion=5.1.0.0 -VersionInfoTextVersion=5.1.0 +OutputBaseFileName=assimp-sdk-5.2.6-setup +VersionInfoVersion=5.2.6.0 +VersionInfoTextVersion=5.2.6 VersionInfoCompany=Assimp Development Team ArchitecturesInstallIn64BitMode=x64 diff --git a/packaging/windows-innosetup/script_x86.iss b/packaging/windows-innosetup/script_x86.iss index deacb726e..d405d02cf 100644 --- a/packaging/windows-innosetup/script_x86.iss +++ b/packaging/windows-innosetup/script_x86.iss @@ -2,7 +2,7 @@ [Setup] AppName=Open Asset Import Library - SDK -AppVerName=Open Asset Import Library - SDK (v5.1.0) +AppVerName=Open Asset Import Library - SDK (v5.2.6) DefaultDirName={pf}\Assimp DefaultGroupName=Assimp UninstallDisplayIcon={app}\bin\x86\assimp.exe @@ -12,9 +12,9 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico WizardImageFile=compiler:WizModernImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP LicenseFile=License.rtf -OutputBaseFileName=assimp-sdk-5.1.0-setup -VersionInfoVersion=5.1.0.0 -VersionInfoTextVersion=5.1.0 +OutputBaseFileName=assimp-sdk-5.2.6-setup +VersionInfoVersion=5.2.5.6 +VersionInfoTextVersion=5.2.6 VersionInfoCompany=Assimp Development Team ;ArchitecturesInstallIn64BitMode=x64 From fb23ef7c02a8b3b33176b5789939cca387fc9ab8 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 31 Jan 2023 21:25:26 +0100 Subject: [PATCH 03/13] Update: Update code version --- CMakeLists.txt | 2 +- include/assimp/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0619879de..a95c67a0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) ENDIF() -PROJECT(Assimp VERSION 5.2.5) +PROJECT(Assimp VERSION 5.2.6) # All supported options ############################################### diff --git a/include/assimp/version.h b/include/assimp/version.h index b83110a04..812be551c 100644 --- a/include/assimp/version.h +++ b/include/assimp/version.h @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2022, assimp team +Copyright (c) 2006-2023, assimp team All rights reserved. From bad725ec86f1e0e411b6c5e33d93432ae7c3a40e Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 31 Jan 2023 21:55:43 +0100 Subject: [PATCH 04/13] Fix: Fix versions --- revision.h.in | 2 +- test/unit/utVersion.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/revision.h.in b/revision.h.in index 25cb3949f..939d2940f 100644 --- a/revision.h.in +++ b/revision.h.in @@ -18,7 +18,7 @@ #else #define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit @GIT_COMMIT_HASH@)" #endif -#define VER_COPYRIGHT_STR "\xA9 2006-2022" +#define VER_COPYRIGHT_STR "\xA9 2006-2023" #ifdef NDEBUG #define VER_ORIGINAL_FILENAME_STR "@CMAKE_SHARED_LIBRARY_PREFIX@assimp@LIBRARY_SUFFIX@.dll" diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp index 06f07c943..da4240c07 100644 --- a/test/unit/utVersion.cpp +++ b/test/unit/utVersion.cpp @@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) { EXPECT_NE( lv, nullptr ); std::string text( lv ); - size_t pos = text.find(std::string("2022")); + size_t pos = text.find(std::string("2023")); EXPECT_NE(pos, std::string::npos); } @@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) { } TEST_F( utVersion, aiGetVersionPatchTest ) { - EXPECT_EQ(aiGetVersionPatch(), 5U ); + EXPECT_EQ(aiGetVersionPatch(), 6U ); } TEST_F( utVersion, aiGetCompileFlagsTest ) { From e5e3e07b84c62c5065477c97f54d19254160cd2e Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 1 Feb 2023 11:28:11 +0100 Subject: [PATCH 05/13] Fix copyrights. --- code/Common/Version.cpp | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp index 9c3d0250c..1699b99d6 100644 --- a/code/Common/Version.cpp +++ b/code/Common/Version.cpp @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2022, assimp team +Copyright (c) 2006-2023, assimp team All rights reserved. @@ -49,10 +49,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -------------------------------------------------------------------------------- // Legal information string - don't remove this. -static const char *LEGAL_INFORMATION = +static constexpr char LEGAL_INFORMATION[] = "Open Asset Import Library (Assimp).\n" "A free C/C++ library to import various 3D file formats into applications\n\n" - "(c) 2006-2022, Assimp team\n" + "(c) 2006-2023, Assimp team\n" "License under the terms and conditions of the 3-clause BSD license\n" "https://www.assimp.org\n"; @@ -150,9 +150,11 @@ ASSIMP_API aiScene::~aiScene() { // To make sure we won't crash if the data is invalid it's // much better to check whether both mNumXXX and mXXX are // valid instead of relying on just one of them. - if (mNumMeshes && mMeshes) - for (unsigned int a = 0; a < mNumMeshes; a++) + if (mNumMeshes && mMeshes) { + for (unsigned int a = 0; a < mNumMeshes; ++a) { delete mMeshes[a]; + } + } delete[] mMeshes; if (mNumMaterials && mMaterials) { @@ -162,24 +164,32 @@ ASSIMP_API aiScene::~aiScene() { } delete[] mMaterials; - if (mNumAnimations && mAnimations) - for (unsigned int a = 0; a < mNumAnimations; a++) + if (mNumAnimations && mAnimations) { + for (unsigned int a = 0; a < mNumAnimations; ++a) { delete mAnimations[a]; + } + } delete[] mAnimations; - if (mNumTextures && mTextures) - for (unsigned int a = 0; a < mNumTextures; a++) + if (mNumTextures && mTextures) { + for (unsigned int a = 0; a < mNumTextures; ++a) { delete mTextures[a]; + } + } delete[] mTextures; - if (mNumLights && mLights) - for (unsigned int a = 0; a < mNumLights; a++) + if (mNumLights && mLights) { + for (unsigned int a = 0; a < mNumLights; ++a) { delete mLights[a]; + } + } delete[] mLights; - if (mNumCameras && mCameras) - for (unsigned int a = 0; a < mNumCameras; a++) + if (mNumCameras && mCameras) { + for (unsigned int a = 0; a < mNumCameras; ++a) { delete mCameras[a]; + } + } delete[] mCameras; aiMetadata::Dealloc(mMetaData); From 13945a5c5bb3deffe2a4224b888373a5437d52e9 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 27 Apr 2023 21:45:41 +0200 Subject: [PATCH 06/13] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a95c67a0f..e5d3be2dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) ENDIF() -PROJECT(Assimp VERSION 5.2.6) +PROJECT(Assimp VERSION 5.3.0) # All supported options ############################################### From 997d380c3ad156eef72019fa2236bc4b78837d4e Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 27 Apr 2023 21:47:28 +0200 Subject: [PATCH 07/13] Update script_vieweronly.iss --- packaging/windows-innosetup/script_vieweronly.iss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/windows-innosetup/script_vieweronly.iss b/packaging/windows-innosetup/script_vieweronly.iss index 5f7161c7c..b6795ae4d 100644 --- a/packaging/windows-innosetup/script_vieweronly.iss +++ b/packaging/windows-innosetup/script_vieweronly.iss @@ -2,7 +2,7 @@ [Setup] AppName=Open Asset Import Library - Viewer -AppVerName=Open Asset Import Library - Viewer (v5.2.6) +AppVerName=Open Asset Import Library - Viewer (v5.3.0) DefaultDirName={pf}\AssimpView DefaultGroupName=AssimpView UninstallDisplayIcon={app}\bin\x86\assimp.exe @@ -13,8 +13,8 @@ WizardImageFile=compiler:WizModernImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP LicenseFile=License.rtf OutputBaseFileName=assimp-view-5.0-setup -VersionInfoVersion=5.2.6.0 -VersionInfoTextVersion=5.2.6 +VersionInfoVersion=5.3.0.0 +VersionInfoTextVersion=5.3.0 VersionInfoCompany=Assimp Development Team ArchitecturesInstallIn64BitMode=x64 From 967d61edc5c05403d04b6dab47da9dbed0e557de Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 27 Apr 2023 21:47:50 +0200 Subject: [PATCH 08/13] Update script_x64.iss --- packaging/windows-innosetup/script_x64.iss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/windows-innosetup/script_x64.iss b/packaging/windows-innosetup/script_x64.iss index 7ef212f89..3ac5600b5 100644 --- a/packaging/windows-innosetup/script_x64.iss +++ b/packaging/windows-innosetup/script_x64.iss @@ -2,7 +2,7 @@ [Setup] AppName=Open Asset Import Library - SDK -AppVerName=Open Asset Import Library - SDK (v5.2.6) +AppVerName=Open Asset Import Library - SDK (v5.3.0) DefaultDirName={pf}\Assimp DefaultGroupName=Assimp UninstallDisplayIcon={app}\bin\x64\assimp.exe @@ -13,8 +13,8 @@ WizardImageFile=compiler:WizModernImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP LicenseFile=License.rtf OutputBaseFileName=assimp-sdk-5.2.6-setup -VersionInfoVersion=5.2.6.0 -VersionInfoTextVersion=5.2.6 +VersionInfoVersion=5.3.0.0 +VersionInfoTextVersion=5.3.0 VersionInfoCompany=Assimp Development Team ArchitecturesInstallIn64BitMode=x64 From cebb06280d2a4cc1a2d155761b3d2085cbb01cd2 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 27 Apr 2023 21:48:23 +0200 Subject: [PATCH 09/13] Update script_x86.iss --- packaging/windows-innosetup/script_x86.iss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/windows-innosetup/script_x86.iss b/packaging/windows-innosetup/script_x86.iss index d405d02cf..9bfe371cc 100644 --- a/packaging/windows-innosetup/script_x86.iss +++ b/packaging/windows-innosetup/script_x86.iss @@ -2,7 +2,7 @@ [Setup] AppName=Open Asset Import Library - SDK -AppVerName=Open Asset Import Library - SDK (v5.2.6) +AppVerName=Open Asset Import Library - SDK (v5.3.0) DefaultDirName={pf}\Assimp DefaultGroupName=Assimp UninstallDisplayIcon={app}\bin\x86\assimp.exe @@ -13,8 +13,8 @@ WizardImageFile=compiler:WizModernImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP LicenseFile=License.rtf OutputBaseFileName=assimp-sdk-5.2.6-setup -VersionInfoVersion=5.2.5.6 -VersionInfoTextVersion=5.2.6 +VersionInfoVersion=5.3.0. +VersionInfoTextVersion=5.3.0 VersionInfoCompany=Assimp Development Team ;ArchitecturesInstallIn64BitMode=x64 From c421247be983eac0beccad6bfdd2d92fc11980bd Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 27 Apr 2023 21:50:54 +0200 Subject: [PATCH 10/13] Update utVersion.cpp --- test/unit/utVersion.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp index da4240c07..e4378e9f6 100644 --- a/test/unit/utVersion.cpp +++ b/test/unit/utVersion.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2022, assimp team +Copyright (c) 2006-2023, assimp team All rights reserved. @@ -53,7 +53,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) { } TEST_F( utVersion, aiGetVersionMinorTest ) { - EXPECT_EQ(aiGetVersionMinor(), 2U); + EXPECT_EQ(aiGetVersionMinor(), 3U); } TEST_F( utVersion, aiGetVersionMajorTest ) { @@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) { } TEST_F( utVersion, aiGetVersionPatchTest ) { - EXPECT_EQ(aiGetVersionPatch(), 6U ); + EXPECT_EQ(aiGetVersionPatch(), 0U ); } TEST_F( utVersion, aiGetCompileFlagsTest ) { From f1b8df01d5ce24efbc0fc43a2c9c73d21fe948e2 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Sun, 24 Sep 2023 08:56:00 +0200 Subject: [PATCH 11/13] fix variable name --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5d3be2dc..753d05928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -777,7 +777,7 @@ IF ( ASSIMP_INSTALL ) SET(CPACK_DEBIAN_PACKAGE_SECTION "libs" ) SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_COMPONENTS_ALL}") SET(CPACK_DEBIAN_PACKAGE_SUGGESTS) - SET(cPACK_DEBIAN_PACKAGE_NAME "assimp") + SET(CPACK_DEBIAN_PACKAGE_NAME "assimp") SET(CPACK_DEBIAN_PACKAGE_REMOVE_SOURCE_FILES contrib/gtest contrib/zlib workspaces test doc obj samples packaging) SET(CPACK_DEBIAN_PACKAGE_SOURCE_COPY svn export --force) SET(CPACK_DEBIAN_CHANGELOG) From f9d3e7015b0b709b3da5e4bc11651a484a52ac2b Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 25 Sep 2023 13:32:45 +0200 Subject: [PATCH 12/13] Update types.h - closes https://github.com/assimp/assimp/issues/5247 --- include/assimp/types.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/include/assimp/types.h b/include/assimp/types.h index 605dc590f..42aa0f9eb 100644 --- a/include/assimp/types.h +++ b/include/assimp/types.h @@ -73,14 +73,8 @@ typedef uint32_t ai_uint32; #ifdef __cplusplus -#ifdef ASSIMP_USE_HUNTER -# include -#else -# include "../contrib/utf8cpp/source/utf8.h" -#endif - #include -#include // for std::nothrow_t +#include // for std::nothrow_t #include // for aiString::Set(const std::string&) namespace Assimp { @@ -88,16 +82,16 @@ namespace Assimp { namespace Intern { // -------------------------------------------------------------------- /** @brief Internal helper class to utilize our internal new/delete - * routines for allocating object of this and derived classes. - * - * By doing this you can safely share class objects between Assimp - * and the application - it works even over DLL boundaries. A good - * example is the #IOSystem where the application allocates its custom - * #IOSystem, then calls #Importer::SetIOSystem(). When the Importer - * destructs, Assimp calls operator delete on the stored #IOSystem. - * If it lies on a different heap than Assimp is working with, - * the application is determined to crash. - */ + * routines for allocating object of this and derived classes. + * + * By doing this you can safely share class objects between Assimp + * and the application - it works even over DLL boundaries. A good + * example is the #IOSystem where the application allocates its custom + * #IOSystem, then calls #Importer::SetIOSystem(). When the Importer + * destructs, Assimp calls operator delete on the stored #IOSystem. + * If it lies on a different heap than Assimp is working with, + * the application is determined to crash. + */ // -------------------------------------------------------------------- #ifndef SWIG struct ASSIMP_API AllocateFromAssimpHeap { From 4b193dbee30b1044492d2650525f43c475fc7dfc Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Sat, 23 Sep 2023 18:33:37 -0700 Subject: [PATCH 13/13] contrib/zip/src/zip.h: correct 2 spelling errors --- contrib/zip/src/zip.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h index 70ab2cee6..5c47f1f1f 100644 --- a/contrib/zip/src/zip.h +++ b/contrib/zip/src/zip.h @@ -83,9 +83,9 @@ typedef long ssize_t; /* byte count or error */ #define ZIP_EFWRITE -29 // fwrite error /** - * Looks up the error message string coresponding to an error number. + * Looks up the error message string corresponding to an error number. * @param errnum error number - * @return error message string coresponding to errnum or NULL if error is not + * @return error message string corresponding to errnum or NULL if error is not * found. */ extern const char *zip_strerror(int errnum);