changeset 2259:fa76698bb9e0

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 03 Dec 2025 16:32:09 +0100
parents 05df72ca9812
children e8c876f65c56
files OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Wed Dec 03 16:24:24 2025 +0100
+++ b/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Wed Dec 03 16:32:09 2025 +0100
@@ -221,6 +221,11 @@
         # Worklists plugin 0.9.0 (framework pre-1.12.10)
         set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "17a5ca9254e881ab89c93d052d4655cb")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "e0979326ac53")
+        # DICOMweb 1.22 + PG 10.0 (framework post-1.12.10)
+        # for BlockingSharedMessageQueue + fix SetCurrentThreadName from plugins
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
+        set(ORTHANC_FRAMEWORK_MD5 "e66a7e996d56063b3abb790bb8f12e8d")
       endif()
     endif()
   endif()
--- a/RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Wed Dec 03 16:24:24 2025 +0100
+++ b/RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Wed Dec 03 16:32:09 2025 +0100
@@ -1017,7 +1017,7 @@
 
 
 #if HAS_ORTHANC_PLUGIN_METRICS == 1
-  inline void SetMetricsValue(char* name,
+  inline void SetMetricsValue(const char* name,
                               float value)
   {
     OrthancPluginSetMetricsValue(GetGlobalContext(), name,