# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1648055080 -3600
# Node ID f78438f61847883bdc3b121ee6bdb1832223dfb2
# Parent  501411a67f10ddb42e26163e726659a480c6a0d7# Parent  c76eb3cedcf0c9a1ce7457354b827873568b1938
integration mainline->more-tags

diff -r 501411a67f10 -r f78438f61847 CITATION.cff
--- a/CITATION.cff	Wed Mar 23 12:23:11 2022 +0100
+++ b/CITATION.cff	Wed Mar 23 18:04:40 2022 +0100
@@ -10,5 +10,5 @@
 doi: "10.1007/s10278-018-0082-y"
 license: "GPL-3.0-or-later"
 repository-code: "https://hg.orthanc-server.com/orthanc/"
-version: 1.10.0
-date-released: 2022-02-23
+version: 1.10.1
+date-released: 2022-03-23
diff -r 501411a67f10 -r f78438f61847 NEWS
--- a/NEWS	Wed Mar 23 12:23:11 2022 +0100
+++ b/NEWS	Wed Mar 23 18:04:40 2022 +0100
@@ -4,8 +4,6 @@
 General
 -------
 
-* Improved DICOM authorization checks when multiple modalities are
-  declared with the same AET.
 * New configuration "ExtraMainDicomTags" to store more tags in the Index DB
   to speed up, e.g, building C-Find, dicom-web or tools/find answers
 * New sample plugin: "DbOptimizer" that will re-construct the DB/Storage
@@ -40,6 +38,16 @@
 * new field "MainDicomTags" in the /system route response to list the tags that
   are saved in DB
 
+
+Version 1.10.1 (2022-03-23)
+===========================
+
+General
+-------
+
+* Improved DICOM authorization checks when multiple modalities are
+  declared with the same AET.
+
 Plugins
 -------
 
diff -r 501411a67f10 -r f78438f61847 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Mar 23 12:23:11 2022 +0100
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Mar 23 18:04:40 2022 +0100
@@ -144,6 +144,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "c912bbb860d640d3ae3003b5c9698205")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.10.0")
         set(ORTHANC_FRAMEWORK_MD5 "8610c82d9153f22e929f2110f8f60279")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.10.1")
+        set(ORTHANC_FRAMEWORK_MD5 "caf667fc5ea452b3d0c2f70bfd02599c")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 501411a67f10 -r f78438f61847 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
diff -r 501411a67f10 -r f78438f61847 OrthancFramework/Resources/WindowsResources.rc
--- a/OrthancFramework/Resources/WindowsResources.rc	Wed Mar 23 12:23:11 2022 +0100
+++ b/OrthancFramework/Resources/WindowsResources.rc	Wed Mar 23 18:04:40 2022 +0100
@@ -11,7 +11,7 @@
          BLOCK "${BLOCK}"
          BEGIN
             VALUE "Comments", "${RELEASE}"
-            VALUE "CompanyName", "Osimis SA, Belgium"
+            VALUE "CompanyName", "The Orthanc project"
             VALUE "FileDescription", "${DESCRIPTION}"
             VALUE "FileVersion", "${VERSION_MAJOR}.${VERSION_MINOR}.0.${VERSION_PATCH}"
             VALUE "InternalName", "${PRODUCT}"
diff -r 501411a67f10 -r f78438f61847 OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp
--- a/OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp	Wed Mar 23 12:23:11 2022 +0100
+++ b/OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp	Wed Mar 23 18:04:40 2022 +0100
@@ -1247,7 +1247,7 @@
     ASSERT_EQ(6u, segments.GetSize());
     for (size_t i = 0; i < segments.GetSize(); i++)
     {
-      ASSERT_EQ(100 + i, segments.GetY(i));
+      ASSERT_EQ(100 + static_cast<int>(i), segments.GetY(i));
       ASSERT_EQ(10, segments.GetX1(i));
       ASSERT_EQ(10, segments.GetX2(i));
     }
@@ -1311,7 +1311,7 @@
 
     for (size_t i = 0; i < segments.GetSize(); i++)
     {
-      ASSERT_EQ(i + 50, segments.GetY(i));
+      ASSERT_EQ(50 + static_cast<int>(i), segments.GetY(i));
       ASSERT_EQ(10, segments.GetX1(i));
       ASSERT_EQ(200, segments.GetX2(i));
     }
diff -r 501411a67f10 -r f78438f61847 OrthancServer/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js
--- a/OrthancServer/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js	Wed Mar 23 12:23:11 2022 +0100
+++ b/OrthancServer/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js	Wed Mar 23 18:04:40 2022 +0100
@@ -278,7 +278,7 @@
         _initProgressListener: function (options) {
             var that = this,
                 xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
-            // Accesss to the native XHR object is required to add event listeners
+            // Access to the native XHR object is required to add event listeners
             // for the upload progress event:
             if (xhr.upload) {
                 $(xhr.upload).bind('progress', function (e) {
diff -r 501411a67f10 -r f78438f61847 OrthancServer/OrthancExplorer/libs/jquery.blockui.js
--- a/OrthancServer/OrthancExplorer/libs/jquery.blockui.js	Wed Mar 23 12:23:11 2022 +0100
+++ b/OrthancServer/OrthancExplorer/libs/jquery.blockui.js	Wed Mar 23 18:04:40 2022 +0100
@@ -145,7 +145,7 @@
 	// enable if you want key and mouse events to be disabled for content that is blocked
 	bindEvents: true,
 
-	// be default blockUI will supress tab navigation from leaving blocking content
+	// be default blockUI will suppress tab navigation from leaving blocking content
 	// (if bindEvents is true)
 	constrainTabKey: true,
 
@@ -221,7 +221,7 @@
 	var z = opts.baseZ;
 
 	// blockUI uses 3 layers for blocking, for simplicity they are all used on every platform;
-	// layer1 is the iframe layer which is used to supress bleed through of underlying content
+	// layer1 is the iframe layer which is used to suppress bleed through of underlying content
 	// layer2 is the overlay layer which has opacity and a wait cursor (by default)
 	// layer3 is the message content that is displayed while blocking