Mercurial > hg > orthanc-dicomweb
changeset 639:7f3f3dd90701 OrthancDicomWeb-1.16
1.16
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Tue, 19 Dec 2023 12:06:33 +0100 |
| parents | d1f61cb1abf9 |
| children | c85e05785f9f 98cff3bedf60 |
| files | CMakeLists.txt NEWS Resources/Orthanc/CMake/DownloadOrthancFramework.cmake |
| diffstat | 3 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Dec 19 11:52:07 2023 +0100 +++ b/CMakeLists.txt Tue Dec 19 12:06:33 2023 +0100 @@ -22,7 +22,7 @@ project(OrthancDicomWeb) -set(ORTHANC_DICOM_WEB_VERSION "mainline") +set(ORTHANC_DICOM_WEB_VERSION "1.16") if (ORTHANC_DICOM_WEB_VERSION STREQUAL "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
--- a/NEWS Tue Dec 19 11:52:07 2023 +0100 +++ b/NEWS Tue Dec 19 12:06:33 2023 +0100 @@ -1,5 +1,5 @@ -Pending changes in the mainline -=============================== +Version 1.16 (2023-12-19) +========================= * Removed misleading log messages about transcoding. https://discourse.orthanc-server.org/t/dicomweb-plugin-1-13-possible-unnecessary-transcoding/3979
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Dec 19 11:52:07 2023 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Dec 19 12:06:33 2023 +0100 @@ -191,11 +191,7 @@ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5") # DICOMweb 1.15 (framework pre-1.12.2) set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) -<<<<<<< working copy - set(ORTHANC_FRAMEWORK_MD5 "ebe8bdf388319f1c9536b2b680451848") -======= set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f") ->>>>>>> merge rev endif() endif() endif()