Mercurial > hg > orthanc-dicomweb
changeset 633:a3bc8844a744
sync Orthanc
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Mon, 13 Nov 2023 20:39:52 +0100 |
| parents | 36e032ff8aff |
| children | d78c4b632ed3 |
| files | CMakeLists.txt Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Resources/SyncOrthancFolder.py TODO |
| diffstat | 6 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Nov 03 18:33:40 2023 +0100 +++ b/CMakeLists.txt Mon Nov 13 20:39:52 2023 +0100 @@ -235,3 +235,5 @@ target_link_libraries(UnitTests ${GOOGLE_TEST_LIBRARIES} ) + +DefineSourceBasenameForTarget(UnitTests) \ No newline at end of file
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Fri Nov 03 18:33:40 2023 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Mon Nov 13 20:39:52 2023 +0100 @@ -271,7 +271,7 @@ else() message("Forking the Orthanc source repository using Mercurial") execute_process( - COMMAND ${ORTHANC_FRAMEWORK_HG} clone "https://hg.orthanc-server.com/orthanc/" + COMMAND ${ORTHANC_FRAMEWORK_HG} clone "https://orthanc.uclouvain.be/hg/orthanc/" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure )
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Fri Nov 03 18:33:40 2023 +0100 +++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Mon Nov 13 20:39:52 2023 +0100 @@ -79,6 +79,10 @@ } } + void ResetGlobalContext() + { + globalContext_ = NULL; + } bool HasGlobalContext() {
--- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Fri Nov 03 18:33:40 2023 +0100 +++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Mon Nov 13 20:39:52 2023 +0100 @@ -137,6 +137,8 @@ void SetGlobalContext(OrthancPluginContext* context); + void ResetGlobalContext(); + bool HasGlobalContext(); OrthancPluginContext* GetGlobalContext();
--- a/Resources/SyncOrthancFolder.py Fri Nov 03 18:33:40 2023 +0100 +++ b/Resources/SyncOrthancFolder.py Mon Nov 13 20:39:52 2023 +0100 @@ -12,7 +12,7 @@ TARGET = os.path.join(os.path.dirname(__file__), 'Orthanc') PLUGIN_SDK_VERSION = '1.12.1' -REPOSITORY = 'https://hg.orthanc-server.com/orthanc/raw-file' +REPOSITORY = 'https://orthanc.uclouvain.be/hg/orthanc/raw-file' FILES = [ ('OrthancFramework/Resources/CMake/AutoGeneratedCode.cmake', 'CMake'),
--- a/TODO Fri Nov 03 18:33:40 2023 +0100 +++ b/TODO Mon Nov 13 20:39:52 2023 +0100 @@ -9,6 +9,7 @@ No such issue in StoneViewer since Stone downloads the whole file. However, Stone uses 2-3 workers at the same time and the file is read 2-3 times at the same time before it ends up in Orthanc cache -> we should introduce a state "is_being_loaded" in caches and have other consumers wait for it to be available. + https://discourse.orthanc-server.org/t/possible-memory-leak-with-multiframe-dicom-orthanc-ohif/3988/12 * Implement capabilities: https://www.dicomstandard.org/using/dicomweb/capabilities/