# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1571223145 -7200
# Node ID 4beabcea3a5cb79506ca1f9cd28d6a6b8c7b7f03
# Parent  096c827cbf9e4b8e189a0b05af3c5d575826a92a
Orthanc-1.5.8

diff -r 096c827cbf9e -r 4beabcea3a5c NEWS
--- a/NEWS	Tue Oct 15 13:01:14 2019 +0200
+++ b/NEWS	Wed Oct 16 12:52:25 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 4beabcea3a5c Resources/CMake/OrthancFrameworkParameters.cmake
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Oct 15 13:01:14 2019 +0200
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Oct 16 12:52:25 2019 +0200
@@ -3,7 +3,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.5.8")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -r 096c827cbf9e -r 4beabcea3a5c UnitTestsSources/DicomMapTests.cpp
--- a/UnitTestsSources/DicomMapTests.cpp	Tue Oct 15 13:01:14 2019 +0200
+++ b/UnitTestsSources/DicomMapTests.cpp	Wed Oct 16 12:52:25 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);
 }