# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1717602780 -7200
# Node ID b89439c1491651ebe63d02d8a674f9959056d805
# Parent  53ddff5dccaf9a9f16cb271e8eb3f50ba01448d7# Parent  5e99cf9eebcf8e640b83fe9601993dd732a5a71c
back to mainline

diff -r 53ddff5dccaf -r b89439c14916 CITATION.cff
--- a/CITATION.cff	Wed Jun 05 15:42:57 2024 +0200
+++ b/CITATION.cff	Wed Jun 05 17:53:00 2024 +0200
@@ -10,5 +10,5 @@
 doi: "10.1007/s10278-018-0082-y"
 license: "GPL-3.0-or-later"
 repository-code: "https://orthanc.uclouvain.be/hg/orthanc/"
-version: 1.12.3
-date-released: 2024-01-31
+version: 1.12.4
+date-released: 2024-06-05
diff -r 53ddff5dccaf -r b89439c14916 NEWS
--- a/NEWS	Wed Jun 05 15:42:57 2024 +0200
+++ b/NEWS	Wed Jun 05 17:53:00 2024 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.12.4 (2024-06-05)
+===========================
+
 REST API
 --------
 
diff -r 53ddff5dccaf -r b89439c14916 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Jun 05 15:42:57 2024 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Wed Jun 05 17:53:00 2024 +0200
@@ -163,6 +163,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "d2476b9e796e339ac320b5333489bdb3")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.3")
         set(ORTHANC_FRAMEWORK_MD5 "975f5bf2142c22cb1777b4f6a0a614c5")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.4")
+        set(ORTHANC_FRAMEWORK_MD5 "1e61779ea4a7cd705720bdcfed8a6a73")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 53ddff5dccaf -r b89439c14916 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
diff -r 53ddff5dccaf -r b89439c14916 OrthancServer/Resources/RunCppCheck.sh
--- a/OrthancServer/Resources/RunCppCheck.sh	Wed Jun 05 15:42:57 2024 +0200
+++ b/OrthancServer/Resources/RunCppCheck.sh	Wed Jun 05 17:53:00 2024 +0200
@@ -24,7 +24,7 @@
 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h:53
 syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74
 syntaxError:../../OrthancFramework/UnitTestsSources/ZipTests.cpp:133
-syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:311
+syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:322
 uninitMemberVar:../../OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp:417
 unreadVariable:../../OrthancFramework/Sources/FileStorage/StorageAccessor.cpp
 unreadVariable:../../OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp:1123