changeset 3212:304184684107 Orthanc-1.5.4

Orthanc-1.5.4
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 Feb 2019 15:02:50 +0100
parents e1f6c089fe30
children abb204aed6bf a593c20bf79b
files NEWS Resources/CMake/OrthancFrameworkParameters.cmake UnitTestsSources/DicomMapTests.cpp
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Fri Feb 08 13:12:03 2019 +0100
+++ b/NEWS	Fri Feb 08 15:02:50 2019 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.5.4 (2019-02-08)
+==========================
+
 General
 -------
 
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Feb 08 13:12:03 2019 +0100
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Feb 08 15:02:50 2019 +0100
@@ -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.4")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
--- a/UnitTestsSources/DicomMapTests.cpp	Fri Feb 08 13:12:03 2019 +0100
+++ b/UnitTestsSources/DicomMapTests.cpp	Fri Feb 08 15:02:50 2019 +0100
@@ -775,7 +775,7 @@
   ASSERT_EQ("UI", visitor.GetResult() ["00080016"]["Value"][0].asString());
 
   ASSERT_EQ("UL", visitor.GetResult() ["00081161"]["vr"].asString());
-  ASSERT_EQ(128, visitor.GetResult() ["00081161"]["Value"][0].asUInt());
+  ASSERT_EQ(128u, visitor.GetResult() ["00081161"]["Value"][0].asUInt());
 
   ASSERT_EQ("UN", visitor.GetResult() ["43421234"]["vr"].asString());
   Toolbox::DecodeBase64(s, visitor.GetResult() ["43421234"]["InlineBinary"].asString());
@@ -792,7 +792,7 @@
 
 #if DCMTK_VERSION_NUMBER >= 361
   ASSERT_EQ("US", visitor.GetResult() ["00080301"]["vr"].asString());
-  ASSERT_EQ(17, visitor.GetResult() ["00080301"]["Value"][0].asUInt());
+  ASSERT_EQ(17u, visitor.GetResult() ["00080301"]["Value"][0].asUInt());
 #else
   ASSERT_EQ("UN", visitor.GetResult() ["00080301"]["vr"].asString());
   Toolbox::DecodeBase64(s, visitor.GetResult() ["00080301"]["InlineBinary"].asString());