changeset 4208:f659f79eb12a

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 18 Sep 2020 14:18:10 +0200
parents 171af1567473 (current diff) 116bd42caf49 (diff)
children c3fc0b884442
files OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
diffstat 3 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Sep 17 20:49:15 2020 +0200
+++ b/NEWS	Fri Sep 18 14:18:10 2020 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.7.4 (2020-09-18)
+==========================
+
 General
 -------
 
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Thu Sep 17 20:49:15 2020 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Fri Sep 18 14:18:10 2020 +0200
@@ -114,6 +114,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "328f94dcbd78c169655a13f7ad58a2c2")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.3")
         set(ORTHANC_FRAMEWORK_MD5 "3f1ba9502ec7c5449971d3b56087bcde")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.4")
+        set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
--- a/OrthancServer/Resources/RunCppCheck.sh	Thu Sep 17 20:49:15 2020 +0200
+++ b/OrthancServer/Resources/RunCppCheck.sh	Fri Sep 18 14:18:10 2020 +0200
@@ -22,6 +22,7 @@
 uninitMemberVar:../../OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp:427
 unreadVariable:../../OrthancFramework/Sources/FileStorage/StorageAccessor.cpp
 unreadVariable:../../OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp:714
+unusedFunction
 useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:89
 useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:285
 EOF
@@ -77,4 +78,4 @@
             ../../OrthancServer/Sources \
             ../../OrthancServer/UnitTestsSources \
             \
-            2>&1 | grep -vE '\[unusedFunction\]$|^\^$|^$|function .* is never used'
+            2>&1