diff --git a/CMakeLists.txt b/CMakeLists.txt index f7e46d109..cd8f51537 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,10 @@ IF(ASSIMP_HUNTER_ENABLED) ADD_DEFINITIONS(-DASSIMP_USE_HUNTER) ENDIF() -PROJECT(Assimp VERSION 6.0.1) +PROJECT(Assimp VERSION 6.0.2 + LANGUAGES C CXX + DESCRIPTION "Open Asset Import Library (Assimp) is a library to import various well-known 3D model formats in a uniform manner." +) # All supported options ############################################### @@ -246,7 +249,7 @@ SET (ASSIMP_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) SET (ASSIMP_VERSION_MINOR ${PROJECT_VERSION_MINOR}) SET (ASSIMP_VERSION_PATCH ${PROJECT_VERSION_PATCH}) SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH}) -SET (ASSIMP_SOVERSION 5) +SET (ASSIMP_SOVERSION 6) SET( ASSIMP_PACKAGE_VERSION "0" CACHE STRING "the package-specific version used for uploading the sources" ) set(CMAKE_CXX_STANDARD 17) diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp index ee7f3fed8..f84951b1f 100644 --- a/code/Common/Assimp.cpp +++ b/code/Common/Assimp.cpp @@ -120,10 +120,10 @@ static std::mutex gLogStreamMutex; // ------------------------------------------------------------------------------------------------ // Custom LogStream implementation for the C-API -class LogToCallbackRedirector : public LogStream { +class LogToCallbackRedirector final : public LogStream { public: explicit LogToCallbackRedirector(const aiLogStream &s) : - stream(s) { + mStream(s) { ai_assert(nullptr != s.callback); } @@ -137,7 +137,7 @@ public: // might cause strange problems, but the chance is quite low. PredefLogStreamMap::iterator it = std::find(gPredefinedStreams.begin(), - gPredefinedStreams.end(), (Assimp::LogStream *)stream.user); + gPredefinedStreams.end(), (Assimp::LogStream *)mStream.user); if (it != gPredefinedStreams.end()) { delete *it; @@ -147,11 +147,11 @@ public: /** @copydoc LogStream::write */ void write(const char *message) { - stream.callback(message, stream.user); + mStream.callback(message, mStream.user); } private: - aiLogStream stream; + const aiLogStream &mStream; }; // ------------------------------------------------------------------------------------------------ diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp index c18ac9d46..eabe9a430 100644 --- a/code/Common/Version.cpp +++ b/code/Common/Version.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 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-2024, Assimp team\n" + "(c) 2006-2025, Assimp team\n" "License under the terms and conditions of the 3-clause BSD license\n" "https://www.assimp.org\n"; diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp index e45406b0e..078bfd7be 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("2024")); + size_t pos = text.find(std::string("2025")); EXPECT_NE(pos, std::string::npos); } @@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMinorTest ) { } TEST_F( utVersion, aiGetVersionPatchTest ) { - EXPECT_EQ(aiGetVersionPatch(), 1U ); + EXPECT_EQ(aiGetVersionPatch(), 2U ); } TEST_F( utVersion, aiGetCompileFlagsTest ) {