Mercurial > hg > orthanc
changeset 5506:0446fa29de49
upgraded to libpng 1.6.40
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 24 Jan 2024 17:56:18 +0100 |
| parents | b305bc32b77d |
| children | 11a140c73bb6 |
| files | NEWS OrthancFramework/Resources/CMake/LibPngConfiguration.cmake OrthancServer/UnitTestsSources/VersionsTests.cpp |
| diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Wed Jan 24 17:51:21 2024 +0100 +++ b/NEWS Wed Jan 24 17:56:18 2024 +0100 @@ -14,6 +14,7 @@ - boost 1.84.0 - curl 8.5.0 - dcmtk 3.6.8 + - libpng 1.6.40 - openssl 3.1.4 - zlib 1.3.1
--- a/OrthancFramework/Resources/CMake/LibPngConfiguration.cmake Wed Jan 24 17:51:21 2024 +0100 +++ b/OrthancFramework/Resources/CMake/LibPngConfiguration.cmake Wed Jan 24 17:56:18 2024 +0100 @@ -20,13 +20,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPNG) - SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.6.36) - SET(LIBPNG_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/libpng-1.6.36.tar.gz") - SET(LIBPNG_MD5 "65afdeaa05f5ec14e31d9276143012e9") + SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.6.40) + SET(LIBPNG_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/libpng-1.6.40.tar.gz") + SET(LIBPNG_MD5 "ec4b597c3a9b1f8d2826575f530367b7") DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}") include_directories( + BEFORE SYSTEM ${LIBPNG_SOURCES_DIR} )
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp Wed Jan 24 17:51:21 2024 +0100 +++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp Wed Jan 24 17:56:18 2024 +0100 @@ -124,8 +124,8 @@ TEST(Versions, PngStatic) { - ASSERT_EQ(10636u, png_access_version_number()); - ASSERT_STREQ("1.6.36", PNG_LIBPNG_VER_STRING); + ASSERT_EQ(10640u, png_access_version_number()); + ASSERT_STREQ("1.6.40", PNG_LIBPNG_VER_STRING); } TEST(Versions, JpegStatic)