# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1600431490 -7200
# Node ID f659f79eb12adf74a4d130da7fb31252d72a8250
# Parent  171af1567473f867389fd730e0049df5081b61cb# Parent  116bd42caf49d0a8e6cb3af247c5a0e440abc144
back to mainline

diff -r 171af1567473 -r f659f79eb12a NEWS
--- 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
 -------
 
diff -r 171af1567473 -r f659f79eb12a OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- 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
diff -r 171af1567473 -r f659f79eb12a OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
diff -r 171af1567473 -r f659f79eb12a OrthancServer/Resources/RunCppCheck.sh
--- 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