# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1571229186 -7200
# Node ID 25126912aa2cfa03ab3b19f89eec364ccd0e11f8
# Parent  096c827cbf9e4b8e189a0b05af3c5d575826a92a# Parent  4beabcea3a5cb79506ca1f9cd28d6a6b8c7b7f03
back to mainline

diff -r 096c827cbf9e -r 25126912aa2c NEWS
--- a/NEWS	Tue Oct 15 13:01:14 2019 +0200
+++ b/NEWS	Wed Oct 16 14:33:06 2019 +0200
@@ -1,13 +1,16 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.5.8 (2019-10-16)
+==========================
+
 REST API
 --------
 
 * API version has been upgraded to 4
-* in /ordered-slices route, ignore instances without position/normal/seriesIndex
-  unless there are only such instances in the series.
-
+* In /ordered-slices route, ignore instances without position/normal/seriesIndex,
+  unless there are only such instances in the series
 
 Maintenance
 -----------
@@ -27,6 +30,7 @@
   transmitted into HTTP headers.
 * Fix lost relationships between CT and RT-STRUCT during anonymization
 
+
 Version 1.5.7 (2019-06-25)
 ==========================
 
diff -r 096c827cbf9e -r 25126912aa2c Resources/CMake/OrthancFrameworkParameters.cmake
diff -r 096c827cbf9e -r 25126912aa2c Resources/DownloadOrthancFramework.cmake
--- a/Resources/DownloadOrthancFramework.cmake	Tue Oct 15 13:01:14 2019 +0200
+++ b/Resources/DownloadOrthancFramework.cmake	Wed Oct 16 14:33:06 2019 +0200
@@ -110,6 +110,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "3c29de1e289b5472342947168f0105c0")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.7")
         set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8")
+        set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336")
       endif()
     endif()
   endif()
diff -r 096c827cbf9e -r 25126912aa2c UnitTestsSources/DicomMapTests.cpp
--- a/UnitTestsSources/DicomMapTests.cpp	Tue Oct 15 13:01:14 2019 +0200
+++ b/UnitTestsSources/DicomMapTests.cpp	Wed Oct 16 14:33:06 2019 +0200
@@ -381,10 +381,10 @@
   // "800\0" in US COLMUNS tag
   m.SetValue(DICOM_TAG_COLUMNS, "800\0", false);
   ASSERT_TRUE(m.GetValue(DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(ui));
-  ASSERT_EQ(800, ui);
+  ASSERT_EQ(800u, ui);
   m.SetValue(DICOM_TAG_COLUMNS, "800", false);
   ASSERT_TRUE(m.GetValue(DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(ui));
-  ASSERT_EQ(800, ui);
+  ASSERT_EQ(800u, ui);
 }