# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1723813171 -7200
# Node ID 83efb01991c578446d3dab4a43510a204cd7d8f8
# Parent  8bbeb3642951a820c31f6129010af4c918b4448e# Parent  ff1aefb43763c08dc43a65c6a5a09b9b3864a41e
integration mainline->dicom-sr

diff -r 8bbeb3642951 -r 83efb01991c5 OrthancStone/Resources/Orthanc/CMake/Compiler.cmake
--- a/OrthancStone/Resources/Orthanc/CMake/Compiler.cmake	Mon Jun 24 21:00:53 2024 +0200
+++ b/OrthancStone/Resources/Orthanc/CMake/Compiler.cmake	Fri Aug 16 14:59:31 2024 +0200
@@ -232,6 +232,10 @@
   endif()
 
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+
+  # fix this error that appears with recent compilers on MacOS: boost/mpl/aux_/integral_wrapper.hpp:73:31: error: integer value -1 is outside the valid range of values [0, 3] for this enumeration type [-Wenum-constexpr-conversion]
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-enum-constexpr-conversion")
+
   add_definitions(
     -D_XOPEN_SOURCE=1
     )
diff -r 8bbeb3642951 -r 83efb01991c5 OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Jun 24 21:00:53 2024 +0200
+++ b/OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Aug 16 14:59:31 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 8bbeb3642951 -r 83efb01991c5 TODO
--- a/TODO	Mon Jun 24 21:00:53 2024 +0200
+++ b/TODO	Fri Aug 16 14:59:31 2024 +0200
@@ -52,6 +52,9 @@
   accession number:
   https://discourse.orthanc-server.org/t/stone-web-viewer-what-is-the-link-to-use-through-the-access-number/4808
 
+* Add configuration options to disable annotations and measurements:
+  https://discourse.orthanc-server.org/t/niveles-de-acceso-y-permisos-a-funcionalidades-del-stone-web-viewer/5106
+
 
 ------------
 Known issues