Mercurial > hg > orthanc
changeset 3285:3f7d4b735f95
upgrade to libpng 1.6.36
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 21 Feb 2019 18:15:05 +0100 |
| parents | e583bbf6ec6c |
| children | 2b547eaed193 |
| files | NEWS Resources/CMake/LibPngConfiguration.cmake UnitTestsSources/VersionsTests.cpp |
| diffstat | 3 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Thu Feb 21 18:04:10 2019 +0100 +++ b/NEWS Thu Feb 21 18:15:05 2019 +0100 @@ -27,6 +27,7 @@ - Boost 1.69.0 - DCMTK 3.6.4 - GoogleTest 1.8.1 + - libpng 1.6.36 Version 1.5.4 (2019-02-08)
--- a/Resources/CMake/LibPngConfiguration.cmake Thu Feb 21 18:04:10 2019 +0100 +++ b/Resources/CMake/LibPngConfiguration.cmake Thu Feb 21 18:15:05 2019 +0100 @@ -1,7 +1,7 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPNG) - SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12) - SET(LIBPNG_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libpng-1.5.12.tar.gz") - SET(LIBPNG_MD5 "8ea7f60347a306c5faf70b977fa80e28") + SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.6.36) + SET(LIBPNG_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libpng-1.6.36.tar.gz") + SET(LIBPNG_MD5 "65afdeaa05f5ec14e31d9276143012e9") DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}") @@ -34,11 +34,8 @@ ${LIBPNG_SOURCES_DIR}/pngwutil.c ) - #set_property( - # SOURCE ${LIBPNG_SOURCES} - # PROPERTY COMPILE_FLAGS -UHAVE_CONFIG_H) - add_definitions( + -DPNG_NO_CONFIG_H=1 -DPNG_NO_CONSOLE_IO=1 -DPNG_NO_STDIO=1 # The following declaration avoids "__declspec(dllexport)" in
--- a/UnitTestsSources/VersionsTests.cpp Thu Feb 21 18:04:10 2019 +0100 +++ b/UnitTestsSources/VersionsTests.cpp Thu Feb 21 18:15:05 2019 +0100 @@ -123,7 +123,7 @@ TEST(Versions, PngStatic) { ASSERT_EQ(10512u, png_access_version_number()); - ASSERT_STREQ("1.5.12", PNG_LIBPNG_VER_STRING); + ASSERT_STREQ("1.6.36", PNG_LIBPNG_VER_STRING); } TEST(Versions, JpegStatic)