# HG changeset patch
# User Alain Mazy <alain@mazy.be>
# Date 1571645648 -7200
# Node ID 460ba650be6f62b872ff883bb62c8953671a33a8
# Parent  5519450866171b1e386cf04f7bafe8487a9b7655# Parent  bf6a61b918eff80b56c84aed28752b385c48dc42
merge

diff -r 551945086617 -r 460ba650be6f LinuxCompilation.txt
--- a/LinuxCompilation.txt	Mon Oct 21 10:13:53 2019 +0200
+++ b/LinuxCompilation.txt	Mon Oct 21 10:14:08 2019 +0200
@@ -119,10 +119,10 @@
 ----------------------------
 
 # sudo apt-get install build-essential unzip cmake mercurial \
-       	       	       uuid-dev libcurl4-openssl-dev liblua5.3-0-dev \
+       	       	       uuid-dev libcurl4-openssl-dev liblua5.3-dev \
        	       	       libgtest-dev libpng-dev libsqlite3-dev libssl-dev libjpeg-dev \
-		       zlib1g-dev libdcmtk2-dev libboost-all-dev libwrap0-dev \
-                       libcharls-dev libjsoncpp-dev libpugixml-dev
+		       zlib1g-dev libdcmtk-dev libboost-all-dev libwrap0-dev \
+                       libcharls-dev libjsoncpp-dev libpugixml-dev tzdata
 
 # cmake -DALLOW_DOWNLOADS=ON \
         -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON \
diff -r 551945086617 -r 460ba650be6f NEWS
--- a/NEWS	Mon Oct 21 10:13:53 2019 +0200
+++ b/NEWS	Mon Oct 21 10:14:08 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 551945086617 -r 460ba650be6f OrthancServer/SliceOrdering.cpp
--- a/OrthancServer/SliceOrdering.cpp	Mon Oct 21 10:13:53 2019 +0200
+++ b/OrthancServer/SliceOrdering.cpp	Mon Oct 21 10:14:08 2019 +0200
@@ -335,7 +335,9 @@
     for (size_t i = 0; i < instances_.size(); i++)
     {
       assert(instances_[i] != NULL);
-      if (instances_[i]->HasPosition() && (!instances_[i]->HasNormal() || IsParallelOrOpposite(instances_[i]->GetNormal(), normal_)))
+      if (instances_[i]->HasPosition() &&
+          (!instances_[i]->HasNormal() ||
+           IsParallelOrOpposite(instances_[i]->GetNormal(), normal_)))
       {
         sortedInstances_.push_back(instances_[i]);
       }
diff -r 551945086617 -r 460ba650be6f Plugins/Samples/Basic/Plugin.c
--- a/Plugins/Samples/Basic/Plugin.c	Mon Oct 21 10:13:53 2019 +0200
+++ b/Plugins/Samples/Basic/Plugin.c	Mon Oct 21 10:14:08 2019 +0200
@@ -47,7 +47,7 @@
     return OrthancPluginErrorCode_ParameterOutOfRange;
   }
   
-  sprintf(buffer, "Callback on URL [%s] with body [%s]\n", url, request->body);
+  sprintf(buffer, "Callback on URL [%s] with body [%s]\n", url, (const char*) request->body);
   OrthancPluginLogWarning(context, buffer);
 
   OrthancPluginSetCookie(context, output, "hello", "world");
diff -r 551945086617 -r 460ba650be6f Resources/CMake/OrthancFrameworkParameters.cmake
diff -r 551945086617 -r 460ba650be6f Resources/DownloadOrthancFramework.cmake
--- a/Resources/DownloadOrthancFramework.cmake	Mon Oct 21 10:13:53 2019 +0200
+++ b/Resources/DownloadOrthancFramework.cmake	Mon Oct 21 10:14:08 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 551945086617 -r 460ba650be6f UnitTestsSources/DicomMapTests.cpp
--- a/UnitTestsSources/DicomMapTests.cpp	Mon Oct 21 10:13:53 2019 +0200
+++ b/UnitTestsSources/DicomMapTests.cpp	Mon Oct 21 10:14:08 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);
 }