Mercurial > hg > orthanc-databases

changeset 830:74c92e5ff21d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <am@orthanc.team>
date Mon, 17 Aug 2026 09:29:33 +0200
parents 70bd49304929 (diff) 80d9c8c77a91 (current diff)
children 7fcd07896d05
files
diffstat 3 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/PostgreSQL/CMakeLists.txt	Fri Aug 14 16:47:17 2026 +0200
+++ b/PostgreSQL/CMakeLists.txt	Mon Aug 17 09:29:33 2026 +0200
@@ -43,7 +43,7 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.12.11")  # 1.12.11 has a bug in ImageAccessor but it is not an issue here !
+  set(ORTHANC_FRAMEWORK_VERSION "1.13.0")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Aug 14 16:47:17 2026 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Aug 17 09:29:33 2026 +0200
@@ -179,6 +179,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "d5e1ba442104c89a24013cb859a9d6bf")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.11")
         set(ORTHANC_FRAMEWORK_MD5 "389b273b64b513ba8fc3233f34201cc1")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.13.0")
+        set(ORTHANC_FRAMEWORK_MD5 "cc95d3e509612b541e10e91c831fbfe3")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
@@ -238,6 +240,11 @@
         # for HttpClient that returns the answer body in case of HTTP error
         set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "665f8aa70d7c5091bc20da37cf664910")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "004b351797fe")
+        # PixelsMasker 0.1.2 (framework post-1.12.11)
+        # for ScopedThreadNameSetter
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
+        set(ORTHANC_FRAMEWORK_MD5 "f078ca997217b831ab3f6741f08a8c07")
       endif()
     endif()
   endif()
--- a/Resources/Orthanc/Plugins/OrthancPluginException.h	Fri Aug 14 16:47:17 2026 +0200
+++ b/Resources/Orthanc/Plugins/OrthancPluginException.h	Mon Aug 17 09:29:33 2026 +0200
@@ -48,11 +48,16 @@
       errorCode, #errorCode " triggered from " __ORTHANC_FILE__ ":"       \
       PLUGIN_ORTHANC_EXCEPTION_STRINGIFY_LINE(__LINE__))
 
+#  define PLUGIN_THROW_WITH_FILE_AND_LINE_INFO_HELPER(errorCode, errorCodeStr)                \
+    throw ::Orthanc::OrthancException( \
+      errorCode, "Plugin error code " + errorCodeStr + " triggered from " __ORTHANC_FILE__ ":"       \
+      PLUGIN_ORTHANC_EXCEPTION_STRINGIFY_LINE(__LINE__))
+
 #  define ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code)                   \
-  PLUGIN_THROW_WITH_FILE_AND_LINE_INFO(static_cast<ORTHANC_PLUGINS_ERROR_ENUMERATION>(code))    
+  PLUGIN_THROW_WITH_FILE_AND_LINE_INFO_HELPER(static_cast<ORTHANC_PLUGINS_ERROR_ENUMERATION>(code), boost::lexical_cast<std::string>(code))    
 
 #  define ORTHANC_PLUGINS_THROW_EXCEPTION(code)                           \
-  PLUGIN_THROW_WITH_FILE_AND_LINE_INFO(ORTHANC_PLUGINS_GET_ERROR_CODE(code))    
+  PLUGIN_THROW_WITH_FILE_AND_LINE_INFO_HELPER(ORTHANC_PLUGINS_GET_ERROR_CODE(code), boost::lexical_cast<std::string>(ORTHANC_PLUGINS_GET_ERROR_CODE(code)))    
 
 #else // the PluginException does not accept a detail argument
 #  define ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(code)                   \