Mercurial > hg > orthanc
changeset 3286:2b547eaed193
upgrade to libjpeg 9c
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 21 Feb 2019 18:19:56 +0100 |
| parents | 3f7d4b735f95 |
| children | 5e8e020893d0 |
| files | NEWS Resources/CMake/LibJpegConfiguration.cmake UnitTestsSources/VersionsTests.cpp |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Thu Feb 21 18:15:05 2019 +0100 +++ b/NEWS Thu Feb 21 18:19:56 2019 +0100 @@ -1,7 +1,6 @@ Pending changes in the mainline =============================== - General ------- @@ -28,6 +27,7 @@ - DCMTK 3.6.4 - GoogleTest 1.8.1 - libpng 1.6.36 + - libjpeg 9c Version 1.5.4 (2019-02-08)
--- a/Resources/CMake/LibJpegConfiguration.cmake Thu Feb 21 18:15:05 2019 +0100 +++ b/Resources/CMake/LibJpegConfiguration.cmake Thu Feb 21 18:19:56 2019 +0100 @@ -1,8 +1,8 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_LIBJPEG) - set(LIBJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/jpeg-9a) + set(LIBJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/jpeg-9c) DownloadPackage( - "3353992aecaee1805ef4109aadd433e7" - "http://orthanc.osimis.io/ThirdPartyDownloads/jpegsrc.v9a.tar.gz" + "93c62597eeef81a84d988bccbda1e990" + "http://orthanc.osimis.io/ThirdPartyDownloads/jpegsrc.v9c.tar.gz" "${LIBJPEG_SOURCES_DIR}") include_directories(
--- a/UnitTestsSources/VersionsTests.cpp Thu Feb 21 18:15:05 2019 +0100 +++ b/UnitTestsSources/VersionsTests.cpp Thu Feb 21 18:19:56 2019 +0100 @@ -129,7 +129,7 @@ TEST(Versions, JpegStatic) { ASSERT_EQ(9, JPEG_LIB_VERSION_MAJOR); - ASSERT_EQ(1, JPEG_LIB_VERSION_MINOR); + ASSERT_EQ(3, JPEG_LIB_VERSION_MINOR); } TEST(Versions, CurlSslStatic)