# HG changeset patch # User Alain Mazy # Date 1702983171 -3600 # Node ID 7e53735eeacbce0f4ff42ee3e42c5ccf43dfd69c # Parent f448e8626f1a0b59e453be2c7308074362b25cd7 sync Orthanc diff -r f448e8626f1a -r 7e53735eeacb CMakeLists.txt --- a/CMakeLists.txt Sat Nov 25 12:18:14 2023 +0100 +++ b/CMakeLists.txt Tue Dec 19 11:52:51 2023 +0100 @@ -25,9 +25,8 @@ set(ORTHANC_FRAMEWORK_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - # TODO: switch to 1.12.2 once available - set(ORTHANC_FRAMEWORK_VERSION "mainline") - set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") + set(ORTHANC_FRAMEWORK_VERSION "1.12.2") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() # Parameters of the build diff -r f448e8626f1a -r 7e53735eeacb Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Sat Nov 25 12:18:14 2023 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Dec 19 11:52:51 2023 +0100 @@ -158,6 +158,8 @@ set(ORTHANC_FRAMEWORK_MD5 "d32a0cde03b6eb603d8dd2b33d38bf1b") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.1") set(ORTHANC_FRAMEWORK_MD5 "8a435140efc8ff4a01d8242f092f21de") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.2") + set(ORTHANC_FRAMEWORK_MD5 "d2476b9e796e339ac320b5333489bdb3") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc @@ -189,7 +191,7 @@ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5") # DICOMweb 1.15 (framework pre-1.12.2) set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) - set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f") + set(ORTHANC_FRAMEWORK_MD5 "ebe8bdf388319f1c9536b2b680451848") endif() endif() endif() diff -r f448e8626f1a -r 7e53735eeacb Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp --- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Sat Nov 25 12:18:14 2023 +0100 +++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Tue Dec 19 11:52:51 2023 +0100 @@ -2607,7 +2607,7 @@ if (body.isMember(KEY_PRIORITY)) { - if (body[KEY_PRIORITY].type() != Json::booleanValue) + if (body[KEY_PRIORITY].type() != Json::intValue) { #if HAS_ORTHANC_EXCEPTION == 1 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,