Mercurial > hg > orthanc
changeset 3213:abb204aed6bf
back to mainline
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 08 Feb 2019 16:33:09 +0100 |
| parents | e1f6c089fe30 (current diff) 304184684107 (diff) |
| children | 2a688e8b3c49 |
| files | Resources/CMake/OrthancFrameworkParameters.cmake Resources/DownloadOrthancFramework.cmake |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri Feb 08 13:12:03 2019 +0100 +++ b/NEWS Fri Feb 08 16:33:09 2019 +0100 @@ -1,6 +1,10 @@ Pending changes in the mainline =============================== + +Version 1.5.4 (2019-02-08) +========================== + General -------
--- a/Resources/DownloadOrthancFramework.cmake Fri Feb 08 13:12:03 2019 +0100 +++ b/Resources/DownloadOrthancFramework.cmake Fri Feb 08 16:33:09 2019 +0100 @@ -99,6 +99,8 @@ set(ORTHANC_FRAMEWORK_MD5 "8867050f3e9a1ce6157c1ea7a9433b1b") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.3") set(ORTHANC_FRAMEWORK_MD5 "bf2f5ed1adb8b0fc5f10d278e68e1dfe") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.4") + set(ORTHANC_FRAMEWORK_MD5 "404baef5d4c43e7c5d9410edda8ef5a5") endif() endif() endif()
--- a/UnitTestsSources/DicomMapTests.cpp Fri Feb 08 13:12:03 2019 +0100 +++ b/UnitTestsSources/DicomMapTests.cpp Fri Feb 08 16:33:09 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());