Mercurial > hg > orthanc

changeset 5507:11a140c73bb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgraded to libjpeg 9f
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 24 Jan 2024 18:02:58 +0100
parents 0446fa29de49
children ababd0af28ab
files NEWS OrthancFramework/Resources/CMake/LibJpegConfiguration.cmake OrthancServer/UnitTestsSources/VersionsTests.cpp
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Jan 24 17:56:18 2024 +0100
+++ b/NEWS	Wed Jan 24 18:02:58 2024 +0100
@@ -14,6 +14,7 @@
   - boost 1.84.0
   - curl 8.5.0
   - dcmtk 3.6.8
+  - libjpeg 9f
   - libpng 1.6.40
   - openssl 3.1.4
   - zlib 1.3.1
--- a/OrthancFramework/Resources/CMake/LibJpegConfiguration.cmake	Wed Jan 24 17:56:18 2024 +0100
+++ b/OrthancFramework/Resources/CMake/LibJpegConfiguration.cmake	Wed Jan 24 18:02:58 2024 +0100
@@ -20,13 +20,14 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBJPEG)
-  set(LIBJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/jpeg-9c)
+  set(LIBJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/jpeg-9f)
   DownloadPackage(
-    "93c62597eeef81a84d988bccbda1e990"
-    "https://orthanc.uclouvain.be/downloads/third-party-downloads/jpegsrc.v9c.tar.gz"
+    "9ca58d68febb0fa9c1c087045b9a5483"
+    "https://orthanc.uclouvain.be/downloads/third-party-downloads/jpegsrc.v9f.tar.gz"
     "${LIBJPEG_SOURCES_DIR}")
 
   include_directories(
+    BEFORE SYSTEM
     ${LIBJPEG_SOURCES_DIR}
     )
 
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 17:56:18 2024 +0100
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 18:02:58 2024 +0100
@@ -131,7 +131,7 @@
 TEST(Versions, JpegStatic)
 {
   ASSERT_EQ(9, JPEG_LIB_VERSION_MAJOR);
-  ASSERT_EQ(3, JPEG_LIB_VERSION_MINOR);
+  ASSERT_EQ(6 /* f */, JPEG_LIB_VERSION_MINOR);
 }
 
 TEST(Versions, CurlSslStatic)