# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1545316168 -3600
# Node ID 867140c61f3014087bf2ac4b52b47c5f55a30df4
# Parent  53d583d2c7756adec1ed1e39d6b8f6aaabb63f42# Parent  095193bbd7b9ff6df6fcd463f6f5fc2af4fb87ab
integration mainline->db-changes

diff -r 53d583d2c775 -r 867140c61f30 NEWS
--- a/NEWS	Wed Dec 19 18:06:46 2018 +0100
+++ b/NEWS	Thu Dec 20 15:29:28 2018 +0100
@@ -1,6 +1,14 @@
 Pending changes in the mainline
 ===============================
 
+Maintenance
+-----------
+
+* Fix issue #118 (Wording in Configuration.json regarding SynchronousCMove)
+
+
+Version 1.5.1 (2018-12-20)
+==========================
 
 General
 -------
diff -r 53d583d2c775 -r 867140c61f30 Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
--- a/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Wed Dec 19 18:06:46 2018 +0100
+++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Thu Dec 20 15:29:28 2018 +0100
@@ -211,13 +211,18 @@
 
     std::vector<const char*> headersKeys;
     std::vector<const char*> headersValues;
-    for (std::map<std::string, std::string>::const_iterator it = httpHeaders.begin(); it != httpHeaders.end(); it++)
+    
+    for (std::map<std::string, std::string>::const_iterator
+           it = httpHeaders.begin(); it != httpHeaders.end(); it++)
     {
       headersKeys.push_back(it->first.c_str());
       headersValues.push_back(it->second.c_str());
     }
 
-    return CheckHttp(OrthancPluginRestApiGet2(GetGlobalContext(), &buffer_, uri.c_str(), httpHeaders.size(), headersKeys.data(), headersValues.data(), applyPlugins));
+    return CheckHttp(OrthancPluginRestApiGet2(
+                       GetGlobalContext(), &buffer_, uri.c_str(), httpHeaders.size(),
+                       (headersKeys.empty() ? NULL : &headersKeys[0]),
+                       (headersValues.empty() ? NULL : &headersValues[0]), applyPlugins));
   }
 
   bool MemoryBuffer::RestApiPost(const std::string& uri,
diff -r 53d583d2c775 -r 867140c61f30 Resources/CMake/OrthancFrameworkParameters.cmake
diff -r 53d583d2c775 -r 867140c61f30 Resources/Configuration.json
--- a/Resources/Configuration.json	Wed Dec 19 18:06:46 2018 +0100
+++ b/Resources/Configuration.json	Thu Dec 20 15:29:28 2018 +0100
@@ -412,12 +412,13 @@
   },
 
   // Whether to run DICOM C-Move operations synchronously. If set to
-  // "false" (the default), each incoming C-Move request results in
-  // creating a new background job. Up to Orthanc 1.3.2, the implicit
-  // behavior was to use synchronous C-Move. Between Orthanc 1.4.0 and
-  // 1.4.2, the default behavior was set to asynchronous C-Move. Since
-  // Orthanc 1.5.0, the default behavior is synchronous C-Move
-  // (backward compatibility with Orthanc <= 1.3.2).
+  // "false" (asynchronous mode), each incoming C-Move request results
+  // in the creation of a new background job. Up to Orthanc 1.3.2, the
+  // implicit behavior was to use synchronous C-Move ("true"). Between
+  // Orthanc 1.4.0 and 1.4.2, the default behavior was set to
+  // asynchronous C-Move ("false"). Since Orthanc 1.5.0, the default
+  // behavior is back to synchronous C-Move ("true", which ensures
+  // backward compatibility with Orthanc <= 1.3.2).
   "SynchronousCMove" : true,
 
   // Maximum number of completed jobs that are kept in memory. A
diff -r 53d583d2c775 -r 867140c61f30 Resources/DownloadOrthancFramework.cmake
--- a/Resources/DownloadOrthancFramework.cmake	Wed Dec 19 18:06:46 2018 +0100
+++ b/Resources/DownloadOrthancFramework.cmake	Thu Dec 20 15:29:28 2018 +0100
@@ -93,6 +93,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "d1ee84927dcf668e60eb5868d24b9394")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.0")
         set(ORTHANC_FRAMEWORK_MD5 "4429d8d9dea4ff6648df80ec3c64d79e")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.1")
+        set(ORTHANC_FRAMEWORK_MD5 "099671538865e5da96208b37494d6718")
       endif()
     endif()
   endif()
diff -r 53d583d2c775 -r 867140c61f30 UnitTestsSources/DicomMapTests.cpp
--- a/UnitTestsSources/DicomMapTests.cpp	Wed Dec 19 18:06:46 2018 +0100
+++ b/UnitTestsSources/DicomMapTests.cpp	Thu Dec 20 15:29:28 2018 +0100
@@ -487,7 +487,8 @@
 
   ASSERT_TRUE(m.HasTag(DICOM_TAG_SERIES_DESCRIPTION));  // Maximum length
   ASSERT_FALSE(m.GetValue(DICOM_TAG_SERIES_DESCRIPTION).IsBinary());
-  ASSERT_EQ(ORTHANC_MAXIMUM_TAG_LENGTH, m.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent().length());
+  ASSERT_EQ(ORTHANC_MAXIMUM_TAG_LENGTH,
+            static_cast<int>(m.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent().length()));
 
   ASSERT_FALSE(m.GetValue(DICOM_TAG_ROWS).IsBinary());
   ASSERT_EQ("512", m.GetValue(DICOM_TAG_ROWS).GetContent());
diff -r 53d583d2c775 -r 867140c61f30 UnitTestsSources/MultiThreadingTests.cpp
--- a/UnitTestsSources/MultiThreadingTests.cpp	Wed Dec 19 18:06:46 2018 +0100
+++ b/UnitTestsSources/MultiThreadingTests.cpp	Thu Dec 20 15:29:28 2018 +0100
@@ -1733,11 +1733,11 @@
     Json::Value s;
     
     DummyInstancesJob job;
-    ASSERT_EQ(0, job.GetCommandsCount());
-    ASSERT_EQ(0, job.GetInstancesCount());
+    ASSERT_EQ(0u, job.GetCommandsCount());
+    ASSERT_EQ(0u, job.GetInstancesCount());
 
     job.Start();
-    ASSERT_EQ(0, job.GetPosition());
+    ASSERT_EQ(0u, job.GetPosition());
     ASSERT_FALSE(job.HasTrailingStep());
     ASSERT_FALSE(job.IsTrailingStepDone());
 
@@ -1747,7 +1747,7 @@
     }
     
     ASSERT_EQ(JobStepCode_Success, job.Step().GetCode());
-    ASSERT_EQ(1, job.GetPosition());
+    ASSERT_EQ(1u, job.GetPosition());
     ASSERT_FALSE(job.IsTrailingStepDone());
     
     {
@@ -1764,11 +1764,11 @@
     DummyInstancesJob job;
     job.AddInstance("hello");
     job.AddInstance("world");
-    ASSERT_EQ(2, job.GetCommandsCount());
-    ASSERT_EQ(2, job.GetInstancesCount());
+    ASSERT_EQ(2u, job.GetCommandsCount());
+    ASSERT_EQ(2u, job.GetInstancesCount());
 
     job.Start();
-    ASSERT_EQ(0, job.GetPosition());
+    ASSERT_EQ(0u, job.GetPosition());
     ASSERT_FALSE(job.HasTrailingStep());
     ASSERT_FALSE(job.IsTrailingStepDone());
 
@@ -1778,7 +1778,7 @@
     }
     
     ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode());
-    ASSERT_EQ(1, job.GetPosition());
+    ASSERT_EQ(1u, job.GetPosition());
     ASSERT_FALSE(job.IsTrailingStepDone());
     
     {
@@ -1787,7 +1787,7 @@
     }
 
     ASSERT_EQ(JobStepCode_Success, job.Step().GetCode());
-    ASSERT_EQ(2, job.GetPosition());
+    ASSERT_EQ(2u, job.GetPosition());
     ASSERT_FALSE(job.IsTrailingStepDone());
     
     {
@@ -1802,14 +1802,14 @@
     Json::Value s;
     
     DummyInstancesJob job;
-    ASSERT_EQ(0, job.GetInstancesCount());
-    ASSERT_EQ(0, job.GetCommandsCount());
+    ASSERT_EQ(0u, job.GetInstancesCount());
+    ASSERT_EQ(0u, job.GetCommandsCount());
     job.AddTrailingStep();
-    ASSERT_EQ(0, job.GetInstancesCount());
-    ASSERT_EQ(1, job.GetCommandsCount());
+    ASSERT_EQ(0u, job.GetInstancesCount());
+    ASSERT_EQ(1u, job.GetCommandsCount());
 
     job.Start(); // This adds the trailing step
-    ASSERT_EQ(0, job.GetPosition());
+    ASSERT_EQ(0u, job.GetPosition());
     ASSERT_TRUE(job.HasTrailingStep());
     ASSERT_FALSE(job.IsTrailingStepDone());
 
@@ -1819,7 +1819,7 @@
     }
     
     ASSERT_EQ(JobStepCode_Success, job.Step().GetCode());
-    ASSERT_EQ(1, job.GetPosition());
+    ASSERT_EQ(1u, job.GetPosition());
     ASSERT_TRUE(job.IsTrailingStepDone());
     
     {
@@ -1835,15 +1835,15 @@
     
     DummyInstancesJob job;
     job.AddInstance("hello");
-    ASSERT_EQ(1, job.GetInstancesCount());
-    ASSERT_EQ(1, job.GetCommandsCount());
+    ASSERT_EQ(1u, job.GetInstancesCount());
+    ASSERT_EQ(1u, job.GetCommandsCount());
     job.AddTrailingStep();
-    ASSERT_EQ(1, job.GetInstancesCount());
-    ASSERT_EQ(2, job.GetCommandsCount());
+    ASSERT_EQ(1u, job.GetInstancesCount());
+    ASSERT_EQ(2u, job.GetCommandsCount());
     
     job.Start();
-    ASSERT_EQ(2, job.GetCommandsCount());
-    ASSERT_EQ(0, job.GetPosition());
+    ASSERT_EQ(2u, job.GetCommandsCount());
+    ASSERT_EQ(0u, job.GetPosition());
     ASSERT_TRUE(job.HasTrailingStep());
     ASSERT_FALSE(job.IsTrailingStepDone());
 
@@ -1853,7 +1853,7 @@
     }
     
     ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode());
-    ASSERT_EQ(1, job.GetPosition());
+    ASSERT_EQ(1u, job.GetPosition());
     ASSERT_FALSE(job.IsTrailingStepDone());
     
     {
@@ -1862,7 +1862,7 @@
     }
 
     ASSERT_EQ(JobStepCode_Success, job.Step().GetCode());
-    ASSERT_EQ(2, job.GetPosition());
+    ASSERT_EQ(2u, job.GetPosition());
     ASSERT_TRUE(job.IsTrailingStepDone());
     
     {