# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1630423516 -7200
# Node ID fae708b2d212019f56bcf0fd48be979500fb0f14
# Parent  73a4bee08bb684698e5e8c7d9fc58d28ef3f26f8# Parent  0830db74be6b69fcd973f02391e3485e25f82763
back to mainline

diff -r 73a4bee08bb6 -r fae708b2d212 Applications/Samples/RtViewerPlugin/CMakeLists.txt
--- a/Applications/Samples/RtViewerPlugin/CMakeLists.txt	Mon Aug 30 13:00:01 2021 +0200
+++ b/Applications/Samples/RtViewerPlugin/CMakeLists.txt	Tue Aug 31 17:25:16 2021 +0200
@@ -27,7 +27,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.4")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.7")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 73a4bee08bb6 -r fae708b2d212 Applications/Samples/WebAssembly/CMakeLists.txt
--- a/Applications/Samples/WebAssembly/CMakeLists.txt	Mon Aug 30 13:00:01 2021 +0200
+++ b/Applications/Samples/WebAssembly/CMakeLists.txt	Tue Aug 31 17:25:16 2021 +0200
@@ -28,7 +28,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.4")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.7")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 73a4bee08bb6 -r fae708b2d212 Applications/StoneWebViewer/NEWS
--- a/Applications/StoneWebViewer/NEWS	Mon Aug 30 13:00:01 2021 +0200
+++ b/Applications/StoneWebViewer/NEWS	Tue Aug 31 17:25:16 2021 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.2 (2021-08-31)
+========================
+
 * Support detection of windowing and rescale in Philips multiframe images
 * Fix values reported in "ww/wc" info panel (windowing width and center)
 
diff -r 73a4bee08bb6 -r fae708b2d212 Applications/StoneWebViewer/Version.cmake
--- a/Applications/StoneWebViewer/Version.cmake	Mon Aug 30 13:00:01 2021 +0200
+++ b/Applications/StoneWebViewer/Version.cmake	Tue Aug 31 17:25:16 2021 +0200
@@ -23,6 +23,6 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.4")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.7")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
diff -r 73a4bee08bb6 -r fae708b2d212 OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Aug 30 13:00:01 2021 +0200
+++ b/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Aug 31 17:25:16 2021 +0200
@@ -132,6 +132,12 @@
         set(ORTHANC_FRAMEWORK_MD5 "9b86e6f00e03278293cd15643cc0233f")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.4")
         set(ORTHANC_FRAMEWORK_MD5 "6d5ca4a73ac7d42445041ca79de1624d")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.5")
+        set(ORTHANC_FRAMEWORK_MD5 "10fc64de1254a095e5d3ed3931f0cfbb")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.6")
+        set(ORTHANC_FRAMEWORK_MD5 "4b5d05683d747c29b2860ad79d11e62e")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.7")
+        set(ORTHANC_FRAMEWORK_MD5 "c912bbb860d640d3ae3003b5c9698205")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc