Mercurial > hg > orthanc

changeset 5513:386d7071b79d pg-transactions

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->pg-transactions
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 24 Jan 2024 21:58:38 +0100
parents d709836c44d7 (current diff) 0a74634073c0 (diff)
children b74543e7ac2e
files NEWS
diffstat 12 files changed, 42 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Jan 24 17:32:25 2024 +0100
+++ b/NEWS	Wed Jan 24 21:58:38 2024 +0100
@@ -23,7 +23,12 @@
   - boost 1.84.0
   - curl 8.5.0
   - dcmtk 3.6.8
+  - jsoncpp 1.9.5
+  - libjpeg 9f
+  - libpng 1.6.40
   - openssl 3.1.4
+  - pugixml 1.14
+  - zlib 1.3.1
 
 
 Version 1.12.2 (2023-12-19)
--- a/OrthancFramework/Resources/CMake/BoostConfiguration.cmake	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Resources/CMake/BoostConfiguration.cmake	Wed Jan 24 21:58:38 2024 +0100
@@ -134,7 +134,7 @@
   endif()
 
   include_directories(
-    BEFORE SYSTEM
+    BEFORE
     ${BOOST_SOURCES_DIR}
     ${BOOST_SOURCES_DIR}/libs/atomic/src/
     ${BOOST_SOURCES_DIR}/libs/locale/src/
--- a/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake	Wed Jan 24 21:58:38 2024 +0100
@@ -28,9 +28,9 @@
     set(JSONCPP_MD5 "3a8072ca6a1fa9cbaf7715ae625f134f")
     add_definitions(-DORTHANC_LEGACY_JSONCPP=1)
   else()
-    set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.9.4)
-    set(JSONCPP_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/jsoncpp-1.9.4.tar.gz")
-    set(JSONCPP_MD5 "4757b26ec89798c5247fa638edfdc446")
+    set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.9.5)
+    set(JSONCPP_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/jsoncpp-1.9.5.tar.gz")
+    set(JSONCPP_MD5 "d6c8c609f2162eff373db62b90a051c7")
     add_definitions(-DORTHANC_LEGACY_JSONCPP=0)
     set(JSONCPP_CXX11 ON)
   endif()
--- a/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Wed Jan 24 21:58:38 2024 +0100
@@ -46,15 +46,14 @@
   endif()
   
   include_directories(
-    SYSTEM BEFORE
     ${CURL_SOURCES_DIR}/include
-    ${CURL_SOURCES_DIR}/lib
     )
 
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES)
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vauth CURL_SOURCES)
+  AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vssh CURL_SOURCES)
+  AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES)
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vquic CURL_SOURCES)
-  AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES)
   source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*)
 
   add_definitions(
@@ -85,17 +84,18 @@
   endif()
 
   if (NOT EXISTS "${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h")
-    #file(WRITE ${CURL_SOURCES_DIR}/lib/curl_config.h "")
-
-    file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h "#include \"../vauth.h\"\n")
     file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/digest.h "#include \"../digest.h\"\n")
     file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/ntlm.h "#include \"../ntlm.h\"\n")
+    file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vauth/vauth.h "#include \"../vauth.h\"\n")
     file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/vtls/vtls.h "#include \"../../vtls/vtls.h\"\n")
+    file(WRITE ${CURL_SOURCES_DIR}/lib/vssh/curl_setup.h "#include \"../curl_setup.h\"\n")
+    file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/vauth/vauth.h "#include \"../../vauth/vauth.h\"\n")
 
     file(GLOB CURL_LIBS_HEADERS ${CURL_SOURCES_DIR}/lib/*.h)
     foreach (header IN LISTS CURL_LIBS_HEADERS)
       get_filename_component(filename ${header} NAME)
       file(WRITE ${CURL_SOURCES_DIR}/lib/vauth/${filename} "#include \"../${filename}\"\n")
+      file(WRITE ${CURL_SOURCES_DIR}/lib/vquic/${filename} "#include \"../${filename}\"\n")
       file(WRITE ${CURL_SOURCES_DIR}/lib/vtls/${filename} "#include \"../${filename}\"\n")
     endforeach()
   endif()
--- a/OrthancFramework/Resources/CMake/LibJpegConfiguration.cmake	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Resources/CMake/LibJpegConfiguration.cmake	Wed Jan 24 21:58:38 2024 +0100
@@ -20,10 +20,10 @@
 
 
 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(
--- a/OrthancFramework/Resources/CMake/LibPngConfiguration.cmake	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Resources/CMake/LibPngConfiguration.cmake	Wed Jan 24 21:58:38 2024 +0100
@@ -20,9 +20,9 @@
 
 
 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}")
 
--- a/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Wed Jan 24 21:58:38 2024 +0100
@@ -124,7 +124,7 @@
 
 
 include_directories(
-  BEFORE SYSTEM
+  BEFORE
   ${OPENSSL_SOURCES_DIR}
   ${OPENSSL_SOURCES_DIR}/crypto/asn1
   ${OPENSSL_SOURCES_DIR}/crypto/ec/curve448
--- a/OrthancFramework/Resources/CMake/PugixmlConfiguration.cmake	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Resources/CMake/PugixmlConfiguration.cmake	Wed Jan 24 21:58:38 2024 +0100
@@ -20,9 +20,9 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_PUGIXML)
-  set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.9)
-  set(PUGIXML_MD5 "7286ee2ed11376b6b780ced19fae0b64")
-  set(PUGIXML_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/pugixml-1.9.tar.gz")
+  set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.14)
+  set(PUGIXML_MD5 "06e4242ee2352ee63c2b6627c6e3addb")
+  set(PUGIXML_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/pugixml-1.14.tar.gz")
 
   DownloadPackage(${PUGIXML_MD5} ${PUGIXML_URL} "${PUGIXML_SOURCES_DIR}")
 
--- a/OrthancFramework/Resources/CMake/ZlibConfiguration.cmake	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Resources/CMake/ZlibConfiguration.cmake	Wed Jan 24 21:58:38 2024 +0100
@@ -20,9 +20,9 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB)
-  SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.11)
-  SET(ZLIB_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/zlib-1.2.11.tar.gz")
-  SET(ZLIB_MD5 "1c9f62f0778697a09d36121ead88e08e")
+  SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.3.1)
+  SET(ZLIB_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/zlib-1.3.1.tar.gz")
+  SET(ZLIB_MD5 "9855b6d802d7fe5b7bd5b196a2271655")
 
   DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}")
 
--- a/OrthancFramework/Sources/Images/JpegReader.cpp	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Sources/Images/JpegReader.cpp	Wed Jan 24 21:58:38 2024 +0100
@@ -158,8 +158,7 @@
     jpeg_create_decompress(&cinfo);
     jpeg_mem_src(&cinfo, 
       const_cast<unsigned char*>(
-        reinterpret_cast<const unsigned char*>(buffer)),
-      static_cast<unsigned long>(size));
+        reinterpret_cast<const unsigned char*>(buffer)), size);
 
     try
     {
--- a/OrthancFramework/Sources/Images/JpegWriter.cpp	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancFramework/Sources/Images/JpegWriter.cpp	Wed Jan 24 21:58:38 2024 +0100
@@ -177,7 +177,7 @@
     Internals::JpegErrorManager jerr;
 
     unsigned char* data = NULL;
-    unsigned long size;
+    size_t size;
 
     if (setjmp(jerr.GetJumpBuffer())) 
     {
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 17:32:25 2024 +0100
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 21:58:38 2024 +0100
@@ -107,7 +107,7 @@
 
 TEST(Versions, ZlibStatic)
 {
-  ASSERT_STREQ("1.2.11", zlibVersion());
+  ASSERT_STREQ("1.3.1", zlibVersion());
 }
 
 TEST(Versions, BoostStatic)
@@ -124,14 +124,14 @@
 
 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)
 {
   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)
@@ -148,14 +148,14 @@
 #endif
 }
 
-TEST(Version, LuaStatic)
+TEST(Versions, LuaStatic)
 {
   ASSERT_STREQ("Lua 5.3.5", LUA_RELEASE);
 }
 
 
 #if BUILDING_LIBICONV == 1
-TEST(Version, LibIconvStatic)
+TEST(Versions, LibIconvStatic)
 {
   static const int major = 1;
   static const int minor = 15;  
@@ -165,7 +165,7 @@
 
 
 #if ORTHANC_ENABLE_SSL == 1
-TEST(Version, OpenSslStatic)
+TEST(Versions, OpenSslStatic)
 {
   // openssl-3.1.4
   // https://www.openssl.org/docs/man3.0/man3/OPENSSL_VERSION_NUMBER.html
@@ -178,12 +178,12 @@
 
 #include <json/version.h>
 
-TEST(Version, JsonCpp)
+TEST(Versions, JsonCpp)
 {
 #if ORTHANC_LEGACY_JSONCPP == 1
   ASSERT_STREQ("0.10.6", JSONCPP_VERSION_STRING);
 #elif ORTHANC_LEGACY_JSONCPP == 0
-  ASSERT_STREQ("1.9.4", JSONCPP_VERSION_STRING);
+  ASSERT_STREQ("1.9.5", JSONCPP_VERSION_STRING);
 #else
 #  error Macro ORTHANC_LEGACY_JSONCPP should be set
 #endif
@@ -191,7 +191,7 @@
 
 
 #if ORTHANC_ENABLE_CIVETWEB == 1
-TEST(Version, Civetweb)
+TEST(Versions, Civetweb)
 {
   ASSERT_EQ(1, CIVETWEB_VERSION_MAJOR);
   ASSERT_EQ(14, CIVETWEB_VERSION_MINOR);
@@ -201,9 +201,9 @@
 
 
 #if ORTHANC_ENABLE_PUGIXML == 1
-TEST(Version, Pugixml)
+TEST(Versions, Pugixml)
 {
-  ASSERT_EQ(190, PUGIXML_VERSION);
+  ASSERT_EQ(1140, PUGIXML_VERSION);
 }
 #endif