Mercurial > hg > orthanc-dicomweb

changeset 751:d0bdedd75ff7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync Orthanc
author Alain Mazy <am@orthanc.team>
date Tue, 14 Apr 2026 14:31:12 +0200
parents 29a2cfb72b08
children 3e7a9e980269 e4ef25e1fcba
files Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h
diffstat 2 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Apr 14 14:09:08 2026 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Apr 14 14:31:12 2026 +0200
@@ -177,6 +177,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "66b5a2ee60706c4a502896083b9e1a01")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.10")
         set(ORTHANC_FRAMEWORK_MD5 "d5e1ba442104c89a24013cb859a9d6bf")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.11")
+        set(ORTHANC_FRAMEWORK_MD5 "389b273b64b513ba8fc3233f34201cc1")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
@@ -231,6 +233,11 @@
         # for BlockingSharedMessageQueue.WaitEmpty()
         set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "c037cd2ddbe1b65b431692855483161b")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "56eb61c86f93")
+        # OE2 1.11.0 (framework post-1.12.10)
+        # for HttpClient that returns the answer body in case of HTTP error
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
+        set(ORTHANC_FRAMEWORK_MD5 "665f8aa70d7c5091bc20da37cf664910")
       endif()
     endif()
   endif()
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Tue Apr 14 14:09:08 2026 +0200
+++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Tue Apr 14 14:31:12 2026 +0200
@@ -27,7 +27,6 @@
 
 #include <orthanc/OrthancCPlugin.h>
 #include <boost/noncopyable.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <json/value.h>
@@ -1030,14 +1029,20 @@
     OrthancPluginSetMetricsValue(GetGlobalContext(), name,
                                  value, OrthancPluginMetricsType_Default);
   }
+#endif
 
+
+#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 1)
   inline void SetMetricsValue(const char* name,
                               int64_t value)
   {
     OrthancPluginSetMetricsIntegerValue(GetGlobalContext(), name,
                                         value, OrthancPluginMetricsType_Default);
   }
+#endif
 
+
+#if HAS_ORTHANC_PLUGIN_METRICS == 1
   class MetricsTimer : public boost::noncopyable
   {
   private: