Mercurial > hg > orthanc-webviewer

changeset 316:591ca447ebf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade to Orthanc framework 1.12.3
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 26 Mar 2024 11:15:27 +0100
parents 05bf4ccfdca9
children f09050e06811 c6db463fd4e0
files CMakeLists.txt NEWS Plugin/Cache/CacheIndex.h Plugin/Cache/CacheManager.cpp Plugin/Cache/CacheManager.h Plugin/Cache/CacheScheduler.cpp Plugin/Cache/CacheScheduler.h Plugin/Cache/ICacheFactory.h Plugin/Cache/IPrefetchPolicy.h Plugin/DecodedImageAdapter.cpp Plugin/DecodedImageAdapter.h Plugin/Plugin.cpp Plugin/SeriesInformationAdapter.cpp Plugin/SeriesInformationAdapter.h Plugin/ViewerPrefetchPolicy.cpp Plugin/ViewerPrefetchPolicy.h Plugin/ViewerToolbox.cpp Plugin/ViewerToolbox.h Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
diffstat 19 files changed, 20 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri Mar 22 15:46:33 2024 +0100
+++ b/CMakeLists.txt	Tue Mar 26 11:15:27 2024 +0100
@@ -28,7 +28,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.7")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.3")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
--- a/NEWS	Fri Mar 22 15:46:33 2024 +0100
+++ b/NEWS	Tue Mar 26 11:15:27 2024 +0100
@@ -1,6 +1,8 @@
 Pending changes in the mainline
 ===============================
 
+* Upgrade to Orthanc framework 1.12.3
+
 
 Version 2.8 (2022-02-22)
 ========================
--- a/Plugin/Cache/CacheIndex.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/Cache/CacheIndex.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/Cache/CacheManager.cpp	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/Cache/CacheManager.cpp	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/Cache/CacheManager.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/Cache/CacheManager.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/Cache/CacheScheduler.cpp	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/Cache/CacheScheduler.cpp	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/Cache/CacheScheduler.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/Cache/CacheScheduler.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/Cache/ICacheFactory.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/Cache/ICacheFactory.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/Cache/IPrefetchPolicy.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/Cache/IPrefetchPolicy.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/DecodedImageAdapter.cpp	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/DecodedImageAdapter.cpp	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/DecodedImageAdapter.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/DecodedImageAdapter.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/Plugin.cpp	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/Plugin.cpp	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/SeriesInformationAdapter.cpp	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/SeriesInformationAdapter.cpp	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/SeriesInformationAdapter.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/SeriesInformationAdapter.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/ViewerPrefetchPolicy.cpp	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/ViewerPrefetchPolicy.cpp	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/ViewerPrefetchPolicy.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/ViewerPrefetchPolicy.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/ViewerToolbox.cpp	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/ViewerToolbox.cpp	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Plugin/ViewerToolbox.h	Fri Mar 22 15:46:33 2024 +0100
+++ b/Plugin/ViewerToolbox.h	Tue Mar 26 11:15:27 2024 +0100
@@ -2,7 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2022 Osimis S.A., Belgium
+ * Copyright (C) 2017-2024 Osimis S.A., Belgium
  * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
  *
  * This program is free software: you can redistribute it and/or
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Mar 22 15:46:33 2024 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Mar 26 11:15:27 2024 +0100
@@ -153,7 +153,7 @@
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.11.2")
         set(ORTHANC_FRAMEWORK_MD5 "ede3de356493a8868545f8cb4b8bc8b5")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.11.3")
-        set(ORTHANC_FRAMEWORK_MD5 "f941c0f5771db7616e7b7961026a60e2")
+        set(ORTHANC_FRAMEWORK_MD5 "e48fc0cb09c4856803791a1be28c07dc")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.0")
         set(ORTHANC_FRAMEWORK_MD5 "d32a0cde03b6eb603d8dd2b33d38bf1b")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.1")