changeset 49:6db76975d0f8

update to Orthanc Framework 1.9.2
author Alain Mazy <am@osimis.io>
date Fri, 23 Apr 2021 12:38:25 +0200
parents ff113c3561c5
children b40327079244
files Aws/CMakeLists.txt Azure/CMakeLists.txt Common/BaseStoragePlugin.cpp Common/Resources/DownloadOrthancFramework.cmake Google/CMakeLists.txt
diffstat 5 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Aws/CMakeLists.txt	Fri Apr 02 09:46:41 2021 +0200
+++ b/Aws/CMakeLists.txt	Fri Apr 23 12:38:25 2021 +0200
@@ -9,7 +9,7 @@
 include(CheckIncludeFileCXX)
 
 set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source")
-set(ORTHANC_FRAMEWORK_VERSION "1.9.1" CACHE STRING "orthanc framework version")
+set(ORTHANC_FRAMEWORK_VERSION "1.9.2" CACHE STRING "orthanc framework version")
 set(USE_VCPKG_PACKAGES ON CACHE BOOL "Use Microsoft vcpkg to link against crypto++ and AWS SDK")
 set(STATIC_AWS_CLIENT ON CACHE BOOL "Statically link against AWS client library (only if USE_VCPKG_PACKAGES=OFF)")
 set(USE_SYSTEM_CRYPTOPP ON CACHE BOOL "Use the system version of crypto++")
--- a/Azure/CMakeLists.txt	Fri Apr 02 09:46:41 2021 +0200
+++ b/Azure/CMakeLists.txt	Fri Apr 23 12:38:25 2021 +0200
@@ -7,7 +7,7 @@
 include(CheckIncludeFileCXX)
 
 set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source")
-set(ORTHANC_FRAMEWORK_VERSION "1.9.1" CACHE STRING "orthanc framework version")
+set(ORTHANC_FRAMEWORK_VERSION "1.9.2" CACHE STRING "orthanc framework version")
 set(ALLOW_DOWNLOADS ON)
 
 # Download and setup the Orthanc framework
--- a/Common/BaseStoragePlugin.cpp	Fri Apr 02 09:46:41 2021 +0200
+++ b/Common/BaseStoragePlugin.cpp	Fri Apr 23 12:38:25 2021 +0200
@@ -34,7 +34,7 @@
     {
       filename += ".json";
     }
-    else if (type == 3) // TODO once using OrthancFramework 1.9.1+: use OrthancPluginContentType_DicomUntilPixelData
+    else if (type == OrthancPluginContentType_DicomUntilPixelData)
     {
       filename += "dcm.head";
     }
--- a/Common/Resources/DownloadOrthancFramework.cmake	Fri Apr 02 09:46:41 2021 +0200
+++ b/Common/Resources/DownloadOrthancFramework.cmake	Fri Apr 23 12:38:25 2021 +0200
@@ -126,6 +126,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "cea0b02ce184671eaf1bd668beefbf28")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.1")
         set(ORTHANC_FRAMEWORK_MD5 "08eebc66ef93c3b40115c38501db5fbd")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.2")
+        set(ORTHANC_FRAMEWORK_MD5 "3ea66c09f64aca990016683b6375734e")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
--- a/Google/CMakeLists.txt	Fri Apr 02 09:46:41 2021 +0200
+++ b/Google/CMakeLists.txt	Fri Apr 23 12:38:25 2021 +0200
@@ -7,7 +7,7 @@
 include(CheckIncludeFileCXX)
 
 set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source")
-set(ORTHANC_FRAMEWORK_VERSION "1.9.1" CACHE STRING "orthanc framework version")
+set(ORTHANC_FRAMEWORK_VERSION "1.9.2" CACHE STRING "orthanc framework version")
 set(ALLOW_DOWNLOADS ON)
 
 # Download and setup the Orthanc framework