Mercurial > hg > orthanc-stone
changeset 2143:83efb01991c5 dicom-sr
integration mainline->dicom-sr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 16 Aug 2024 14:59:31 +0200 |
parents | 8bbeb3642951 (current diff) ff1aefb43763 (diff) |
children | 9d77c935f2c3 |
files | |
diffstat | 3 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 )
--- 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
--- 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