Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package orthanc-ohif for openSUSE:Factory 
checked in at 2024-01-04 15:57:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/orthanc-ohif (Old)
 and      /work/SRC/openSUSE:Factory/.orthanc-ohif.new.28375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "orthanc-ohif"

Thu Jan  4 15:57:23 2024 rev:2 rq:1136570 version:1.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/orthanc-ohif/orthanc-ohif.changes        
2023-07-07 15:48:58.384786683 +0200
+++ /work/SRC/openSUSE:Factory/.orthanc-ohif.new.28375/orthanc-ohif.changes     
2024-01-04 15:59:15.544599187 +0100
@@ -1,0 +2,20 @@
+Wed Jan  3 13:47:17 UTC 2024 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Use dist.zip related to version 1.1, not nightly build.
+
+-------------------------------------------------------------------
+Thu Dec  7 10:21:32 UTC 2023 - Ben Greiner <c...@bnavigator.de>
+
+- Force Python > 3.8 for the build stage
+
+-------------------------------------------------------------------
+Tue Nov 28 12:53:18 UTC 2023 - Axel Braun <axel.br...@gmx.de>
+
+- version 1.1
+  * Download moved to https://orthanc.uclouvain.be/downloads/sources/
+  * Updated OHIF to 3.7.0
+  * The default configuration has been adapted to avoid unneccesary
+    transcoding on Orthanc side
+  * Patch to make the build of static assets reproducible, following a
+   suggestion by Bernhard M. Wiedemann (bwiedem...@suse.de)
+-------------------------------------------------------------------

Old:
----
  OrthancOHIF-1.0.tar.gz

New:
----
  OrthancOHIF-1.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ orthanc-ohif.spec ++++++
--- /var/tmp/diff_new_pack.YwZMPa/_old  2024-01-04 15:59:17.012652816 +0100
+++ /var/tmp/diff_new_pack.YwZMPa/_new  2024-01-04 15:59:17.016652962 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package orthanc-ohif
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2023 Dr. Axel Braun <d...@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -16,15 +16,17 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
+%{?sle15_python_module_pythons}
 Name:           orthanc-ohif
 Summary:        OHIF plugin for Orthanc
 License:        AGPL-3.0-or-later
 Group:          Productivity/Graphics/Viewers
-Version:        1.0
+Version:        1.1
 Release:        0
 URL:            https://orthanc-server.com
-Source0:        
https://www.orthanc-server.com/downloads/get.php?path=/plugin-ohif/OrthancOHIF-%{version}.tar.gz
-Source1:        https://lsb.orthanc-server.com/plugin-ohif/%{version}/dist.zip
+Source0:        
https://orthanc.uclouvain.be/downloads/sources/%{name}/OrthancOHIF-%{version}.tar.gz
+Source1:        
https://orthanc.uclouvain.be/downloads/linux-standard-base/orthanc-ohif/1.1/dist.zip
 
 BuildRequires:  cmake
 BuildRequires:  e2fsprogs-devel
@@ -41,8 +43,16 @@
 BuildRequires:  orthanc-devel
 BuildRequires:  orthanc-source
 BuildRequires:  pugixml-devel
+BuildRequires:  python-rpm-macros
 BuildRequires:  unzip
 BuildRequires:  uuid-devel
+%if %{?suse_version} > 1550
+BuildRequires:  python3-base >= 3.8
+%define __mybuildpython %__python3
+%else
+BuildRequires:  %{python_module base >= 3.8}
+%define __mybuildpython %{expand:%%__%pythons}
+%endif
 
 Requires:       orthanc
 
@@ -71,7 +81,8 @@
        -DORTHANC_FRAMEWORK_SOURCE=path \
        -DBoost_NO_BOOST_CMAKE=ON \
        -DORTHANC_FRAMEWORK_ROOT=/usr/src/orthanc/OrthancFramework/Sources \
-       -DLIB_INSTALL_DIR=%{_libdir}/share/orthanc/plugins/
+       -DLIB_INSTALL_DIR=%{_libdir}/share/orthanc/plugins/ \
+       -DPYTHON_EXECUTABLE=%{__mybuildpython}
 
 %cmake_build %{?_smp_mflags}
 

++++++ OrthancOHIF-1.0.tar.gz -> OrthancOHIF-1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/.hg_archival.txt 
new/OrthancOHIF-1.1/.hg_archival.txt
--- old/OrthancOHIF-1.0/.hg_archival.txt        2023-06-19 10:03:44.000000000 
+0200
+++ new/OrthancOHIF-1.1/.hg_archival.txt        2023-11-24 14:19:16.000000000 
+0100
@@ -1,6 +1,6 @@
 repo: 39585ba26f209c4a9d12ece8e4eda1c466775a94
-node: 44538e47573dc74ad562ac75c7b71d1ee2cb9e93
-branch: OrthancOHIF-1.0
+node: 020716fe2ac8942a80fa4d2d6789fafb1e280502
+branch: OrthancOHIF-1.1
 latesttag: null
-latesttagdistance: 16
-changessincelatesttag: 16
+latesttagdistance: 25
+changessincelatesttag: 25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/.hgignore 
new/OrthancOHIF-1.1/.hgignore
--- old/OrthancOHIF-1.0/.hgignore       2023-06-19 10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/.hgignore       2023-11-24 14:19:16.000000000 +0100
@@ -7,3 +7,4 @@
 OHIF/Viewers-*.tar.gz
 OHIF/dist
 i/
+.vscode/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/CMakeLists.txt 
new/OrthancOHIF-1.1/CMakeLists.txt
--- old/OrthancOHIF-1.0/CMakeLists.txt  2023-06-19 10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/CMakeLists.txt  2023-11-24 14:19:16.000000000 +0100
@@ -22,13 +22,13 @@
 cmake_minimum_required(VERSION 2.8)
 project(OrthancOHIF)
 
-set(ORTHANC_OHIF_VERSION "1.0")
+set(ORTHANC_OHIF_VERSION "1.1")
 
 if (ORTHANC_OHIF_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.0")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.1")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
@@ -196,6 +196,10 @@
   VERSION ${ORTHANC_OHIF_VERSION} 
   SOVERSION ${ORTHANC_OHIF_VERSION})
 
+if (DEFINED DefineSourceBasenameForTarget)
+  DefineSourceBasenameForTarget(OrthancOHIF)
+endif()
+
 install(
   TARGETS OrthancOHIF
   RUNTIME DESTINATION lib    # Destination for Windows
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/NEWS new/OrthancOHIF-1.1/NEWS
--- old/OrthancOHIF-1.0/NEWS    2023-06-19 10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/NEWS    2023-11-24 14:19:16.000000000 +0100
@@ -2,6 +2,16 @@
 ===============================
 
 
+Version 1.1 (2023-11-24)
+========================
+
+* Updated OHIF to 3.7.0
+* The default configuration has been adapted to avoid unneccesary
+  transcoding on Orthanc side
+* Patch to make the build of static assets reproducible, following a
+  suggestion by Bernhard M. Wiedemann (bwiedem...@suse.de)
+
+
 Version 1.0 (2023-06-19)
 ========================
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/README new/OrthancOHIF-1.1/README
--- old/OrthancOHIF-1.0/README  2023-06-19 10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/README  2023-11-24 14:19:16.000000000 +0100
@@ -22,7 +22,15 @@
 ----------------------
 
 Build and usage instructions are available in the Orthanc Book:
-http://book.orthanc-server.com/plugins/ohif.html
+https://orthanc.uclouvain.be/book/plugins/ohif.html
+
+
+Contributing
+------------
+
+Instructions for contributing to the Orthanc project are included in
+the Orthanc Book:
+https://orthanc.uclouvain.be/book/developers/repositories.html
 
 
 Licensing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/Resources/CreateOHIFDist/Dockerfile 
new/OrthancOHIF-1.1/Resources/CreateOHIFDist/Dockerfile
--- old/OrthancOHIF-1.0/Resources/CreateOHIFDist/Dockerfile     2023-06-19 
10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Resources/CreateOHIFDist/Dockerfile     2023-11-24 
14:19:16.000000000 +0100
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-FROM node:20.3.0-bullseye-slim
+FROM node:21.2-bullseye-slim
 
 MAINTAINER Sebastien Jodogne <s.jodo...@gmail.com>
 LABEL Description="Orthanc, free DICOM server" Vendor="The Orthanc project"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/Resources/CreateOHIFDist.sh 
new/OrthancOHIF-1.1/Resources/CreateOHIFDist.sh
--- old/OrthancOHIF-1.0/Resources/CreateOHIFDist.sh     2023-06-19 
10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Resources/CreateOHIFDist.sh     2023-11-24 
14:19:16.000000000 +0100
@@ -28,7 +28,7 @@
 set -ex
 
 if [ "$1" = "" ]; then
-    PACKAGE=Viewers-3.6.0
+    PACKAGE=Viewers-3.7.0
 else
     PACKAGE=$1
 fi
@@ -51,7 +51,7 @@
 if [ ! -f "${ROOT_DIR}/OHIF/${PACKAGE}.tar.gz" ]; then
     mkdir -p "${ROOT_DIR}/OHIF"
     ( cd ${ROOT_DIR}/OHIF && \
-          wget 
https://orthanc.uclouvain.be/third-party-downloads/OHIF/${PACKAGE}.tar.gz )
+          wget 
https://orthanc.uclouvain.be/downloads/third-party-downloads/OHIF/${PACKAGE}.tar.gz
 )
 fi
 
 mkdir -p ${ROOT_DIR}/OHIF/dist/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/Resources/EmbedStaticAssets.py 
new/OrthancOHIF-1.1/Resources/EmbedStaticAssets.py
--- old/OrthancOHIF-1.0/Resources/EmbedStaticAssets.py  2023-06-19 
10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Resources/EmbedStaticAssets.py  2023-11-24 
14:19:16.000000000 +0100
@@ -95,6 +95,9 @@
     count = 0
 
     for root, dirs, files in os.walk(SOURCE):
+        files.sort()
+        dirs.sort()
+
         for f in files:
             fullPath = os.path.join(root, f)
             relativePath = os.path.relpath(os.path.join(root, f), SOURCE)
@@ -106,11 +109,11 @@
             if sys.version_info < (3, 0):
                 # Python 2.7
                 fileobj = io.BytesIO()
-                gzip.GzipFile(fileobj=fileobj, mode='w').write(content)
+                gzip.GzipFile(fileobj=fileobj, mode='w', 
mtime=0).write(content)
                 compressed = fileobj.getvalue()
             else:
                 # Python 3.x
-                compressed = gzip.compress(content)
+                compressed = gzip.compress(content, mtime=0)
 
             EncodeFileAsCString(g, variable, compressed)
             WriteChecksum(g, variable + '_md5', content)
@@ -121,7 +124,7 @@
     
     g.write('void ReadStaticAsset(std::string& target, const std::string& 
path)\n')
     g.write('{\n')
-    for (path, variable) in index.items():
+    for (path, variable) in sorted(index.items()):
         g.write('  if (path == "%s")\n' % path)
         g.write('  {\n')
         g.write('    Uncompress(target, %s, sizeof(%s) - 1, %s_md5);\n' % 
(variable, variable, variable))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/OrthancOHIF-1.0/Resources/Orthanc/CMake/Compiler.cmake 
new/OrthancOHIF-1.1/Resources/Orthanc/CMake/Compiler.cmake
--- old/OrthancOHIF-1.0/Resources/Orthanc/CMake/Compiler.cmake  2023-06-19 
10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Resources/Orthanc/CMake/Compiler.cmake  2023-11-24 
14:19:16.000000000 +0100
@@ -263,3 +263,24 @@
   # preceding batches. https://cmake.org/Bug/view.php?id=14874
   set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> <LINK_FLAGS> q <TARGET> <OBJECTS>")
 endif()
+
+
+# This function defines macro "__ORTHANC_FILE__" as a replacement to
+# macro "__FILE__", as the latter leaks the full path of the source
+# files in the binaries
+# https://stackoverflow.com/questions/8487986/file-macro-shows-full-path
+# https://twitter.com/wget42/status/1676877802375634944?s=20
+function(DefineSourceBasenameForTarget targetname)
+  # Microsoft Visual Studio is extremely slow if using
+  # "set_property()", we only enable this feature for gcc and clang
+  if (CMAKE_COMPILER_IS_GNUCXX OR
+      CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    get_target_property(source_files "${targetname}" SOURCES)
+    foreach(sourcefile ${source_files})
+      get_filename_component(basename "${sourcefile}" NAME)
+      set_property(
+        SOURCE "${sourcefile}" APPEND
+        PROPERTY COMPILE_DEFINITIONS "__ORTHANC_FILE__=\"${basename}\"")
+    endforeach()
+  endif()
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/OrthancOHIF-1.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 
new/OrthancOHIF-1.1/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- old/OrthancOHIF-1.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake  
2023-06-19 10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake  
2023-11-24 14:19:16.000000000 +0100
@@ -153,9 +153,11 @@
       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 "5c1b11009d782f248739919db6bf7f7a")
+        set(ORTHANC_FRAMEWORK_MD5 "f941c0f5771db7616e7b7961026a60e2")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.0")
         set(ORTHANC_FRAMEWORK_MD5 "d32a0cde03b6eb603d8dd2b33d38bf1b")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.1")
+        set(ORTHANC_FRAMEWORK_MD5 "8a435140efc8ff4a01d8242f092f21de")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
@@ -166,19 +168,28 @@
       #
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
         # DICOMweb 1.1 (framework pre-1.6.0)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
         # Stone Web viewer 1.0 (framework pre-1.8.1)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
         # PostgreSQL 3.3 (framework pre-1.8.2)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "23ad1b9c7800")
         # For "Toolbox::ReadJson()" and "Toolbox::Write{...}Json()" (pre-1.9.0)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "9af92080e57c60dd288eba46ce606c00")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "b2e08d83e21d")
         # WSI 1.1 (framework pre-1.10.0), to remove "-std=c++11"
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "2eaa073cbb4b44ffba199ad93393b2b1")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5")
+        # DICOMweb 1.15 (framework pre-1.12.2)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
+        set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f")
       endif()
     endif()
   endif()
@@ -266,7 +277,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
       )    
@@ -315,7 +326,11 @@
   else()
     # Default case: Download from the official Web site
     set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz)
-    set(ORTHANC_FRAMEWORK_URL 
"https://orthanc.uclouvain.be/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}";)
+    if (ORTHANC_FRAMEWORK_PRE_RELEASE)
+      set(ORTHANC_FRAMEWORK_URL 
"https://orthanc.uclouvain.be/downloads/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}";)
+    else()
+      set(ORTHANC_FRAMEWORK_URL 
"https://orthanc.uclouvain.be/downloads/sources/orthanc/${ORTHANC_FRAMEMORK_FILENAME}";)
+    endif()
   endif()
 
   set(ORTHANC_FRAMEWORK_ARCHIVE 
"${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/OrthancOHIF-1.0/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp 
new/OrthancOHIF-1.1/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp
--- old/OrthancOHIF-1.0/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp   
2023-06-19 10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp   
2023-11-24 14:19:16.000000000 +0100
@@ -79,6 +79,10 @@
     }
   }
 
+  void ResetGlobalContext()
+  {
+    globalContext_ = NULL;
+  }
 
   bool HasGlobalContext()
   {
@@ -1670,15 +1674,16 @@
       return true;
     }
 
-    // Parse the version
-    int aa, bb, cc;
-    if (
 #ifdef _MSC_VER
-      sscanf_s
+#define ORTHANC_SCANF sscanf_s
 #else
-      sscanf
+#define ORTHANC_SCANF sscanf
 #endif
-      (version, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 ||
+
+    // Parse the version
+    int aa, bb, cc = 0;
+    if ((ORTHANC_SCANF(version, "%4d.%4d.%4d", &aa, &bb, &cc) != 3 &&
+         ORTHANC_SCANF(version, "%4d.%4d", &aa, &bb) != 2) ||
       aa < 0 ||
       bb < 0 ||
       cc < 0)
@@ -2602,7 +2607,7 @@
 
     if (body.isMember(KEY_PRIORITY))
     {
-      if (body[KEY_PRIORITY].type() != Json::booleanValue)
+      if (body[KEY_PRIORITY].type() != Json::intValue)
       {
 #if HAS_ORTHANC_EXCEPTION == 1
         throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
@@ -3740,6 +3745,27 @@
 
     if (instance == NULL)
     {
+      ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin);
+    }
+    else
+    {
+      boost::movelib::unique_ptr<DicomInstance> result(new 
DicomInstance(instance));
+      result->toFree_ = true;
+      return result.release();
+    }
+  }
+#endif
+
+
+#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 1)
+  DicomInstance* DicomInstance::Load(const std::string& instanceId,
+                                     OrthancPluginLoadDicomInstanceMode mode)
+  {
+    OrthancPluginDicomInstance* instance = OrthancPluginLoadDicomInstance(
+      GetGlobalContext(), instanceId.c_str(), mode);
+
+    if (instance == NULL)
+    {
       ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin);
     }
     else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/OrthancOHIF-1.0/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h 
new/OrthancOHIF-1.1/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h
--- old/OrthancOHIF-1.0/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h     
2023-06-19 10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h     
2023-11-24 14:19:16.000000000 +0100
@@ -137,6 +137,8 @@
 
   void SetGlobalContext(OrthancPluginContext* context);
 
+  void ResetGlobalContext();
+
   bool HasGlobalContext();
 
   OrthancPluginContext* GetGlobalContext();
@@ -1264,6 +1266,11 @@
 
     ~DicomInstance();
 
+    const OrthancPluginDicomInstance* GetObject() const
+    {
+      return instance_;
+    }
+
     std::string GetRemoteAet() const;
 
     const void* GetBuffer() const
@@ -1318,6 +1325,11 @@
                                     size_t size,
                                     const std::string& transferSyntax);
 #endif
+
+#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 1)
+    static DicomInstance* Load(const std::string& instanceId,
+                               OrthancPluginLoadDicomInstanceMode mode);
+#endif
   };
 
 // helper method to convert Http headers from the plugin SDK to a std::map
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/Resources/SyncOrthancFolder.py 
new/OrthancOHIF-1.1/Resources/SyncOrthancFolder.py
--- old/OrthancOHIF-1.0/Resources/SyncOrthancFolder.py  2023-06-19 
10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Resources/SyncOrthancFolder.py  2023-11-24 
14:19:16.000000000 +0100
@@ -32,7 +32,7 @@
 
 TARGET = os.path.join(os.path.dirname(__file__), 'Orthanc')
 PLUGIN_SDK_VERSION = '1.0.0'
-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'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/OrthancOHIF-1.0/Sources/app-config-system.js 
new/OrthancOHIF-1.1/Sources/app-config-system.js
--- old/OrthancOHIF-1.0/Sources/app-config-system.js    2023-06-19 
10:03:44.000000000 +0200
+++ new/OrthancOHIF-1.1/Sources/app-config-system.js    2023-11-24 
14:19:16.000000000 +0100
@@ -27,7 +27,8 @@
         supportsFuzzyMatching: false,
         supportsWildcard: true,
         staticWado: true,
-        singlepart: 'bulkdata'
+        singlepart: 'bulkdata,pdf,video',
+        acceptHeader: [ 'multipart/related; type=application/octet-stream; 
transfer-syntax=*']
       }
     }
   ];

++++++ dist.zip ++++++
++++ 861921 lines of diff (skipped)

Reply via email to