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-12-02 19:09:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orthanc-ohif (Old) and /work/SRC/openSUSE:Factory/.orthanc-ohif.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orthanc-ohif" Mon Dec 2 19:09:15 2024 rev:5 rq:1227709 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/orthanc-ohif/orthanc-ohif.changes 2024-07-15 19:50:33.170500825 +0200 +++ /work/SRC/openSUSE:Factory/.orthanc-ohif.new.28523/orthanc-ohif.changes 2024-12-02 19:09:16.580355623 +0100 @@ -1,0 +2,9 @@ +Sat Nov 30 11:21:41 UTC 2024 - Axel Braun <[email protected]> + +- version 1.4 + * Updated OHIF to 3.9.1 + * The default value for the "DataSource" configuration is now "dicom-web" + instead of "dicom-json" since "dicom-web" is usually + more optimized. + +------------------------------------------------------------------- Old: ---- OrthancOHIF-1.3.tar.gz New: ---- OrthancOHIF-1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orthanc-ohif.spec ++++++ --- /var/tmp/diff_new_pack.mXi9O1/_old 2024-12-02 19:09:17.376388654 +0100 +++ /var/tmp/diff_new_pack.mXi9O1/_new 2024-12-02 19:09:17.380388820 +0100 @@ -22,11 +22,11 @@ Summary: OHIF plugin for Orthanc License: AGPL-3.0-or-later Group: Productivity/Graphics/Viewers -Version: 1.3 +Version: 1.4 Release: 0 URL: https://orthanc-server.com 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 +Source1: https://orthanc.uclouvain.be/downloads/linux-standard-base/orthanc-ohif/%{version}/dist.zip BuildRequires: cmake BuildRequires: e2fsprogs-devel ++++++ OrthancOHIF-1.3.tar.gz -> OrthancOHIF-1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/.hg_archival.txt new/OrthancOHIF-1.4/.hg_archival.txt --- old/OrthancOHIF-1.3/.hg_archival.txt 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/.hg_archival.txt 2024-11-26 17:51:13.000000000 +0100 @@ -1,6 +1,6 @@ repo: 39585ba26f209c4a9d12ece8e4eda1c466775a94 -node: 7a0d9fab6ae8abf83ca259b1453837d1378705cc -branch: OrthancOHIF-1.3 +node: 9f36196247d74b9d979911dd3c966d5917c749c5 +branch: OrthancOHIF-1.4 latesttag: null -latesttagdistance: 51 -changessincelatesttag: 51 +latesttagdistance: 58 +changessincelatesttag: 58 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/.reuse/dep5 new/OrthancOHIF-1.4/.reuse/dep5 --- old/OrthancOHIF-1.3/.reuse/dep5 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/.reuse/dep5 2024-11-26 17:51:13.000000000 +0100 @@ -3,7 +3,7 @@ Upstream-Contact: Sebastien Jodogne <[email protected]> Source: https://orthanc.uclouvain.be/ -Files: NEWS README +Files: NEWS README TODO CITATION.cff Copyright: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium, and 2018-2024 Open Health Imaging Foundation License: GPL-3.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/CITATION.cff new/OrthancOHIF-1.4/CITATION.cff --- old/OrthancOHIF-1.3/CITATION.cff 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/CITATION.cff 2024-11-26 17:51:13.000000000 +0100 @@ -10,5 +10,5 @@ doi: "10.1007/s10278-018-0082-y" license: "GPL-3.0-or-later" repository-code: "https://orthanc.uclouvain.be/hg/orthanc/"; -version: 1.12.3 -date-released: 2024-01-31 +version: 1.12.4 +date-released: 2024-06-05 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/CMakeLists.txt new/OrthancOHIF-1.4/CMakeLists.txt --- old/OrthancOHIF-1.3/CMakeLists.txt 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/CMakeLists.txt 2024-11-26 17:51:13.000000000 +0100 @@ -22,13 +22,13 @@ cmake_minimum_required(VERSION 2.8) project(OrthancOHIF) -set(ORTHANC_OHIF_VERSION "1.3") +set(ORTHANC_OHIF_VERSION "1.4") 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.2") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/NEWS new/OrthancOHIF-1.4/NEWS --- old/OrthancOHIF-1.3/NEWS 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/NEWS 2024-11-26 17:51:13.000000000 +0100 @@ -1,3 +1,16 @@ +Pending changes in the mainline +=============================== + + +Version 1.4 (2024-11-26) +======================== + +* Updated OHIF to 3.9.1 +* The default value for the "DataSource" configuration is now "dicom-web" + instead of "dicom-json" since "dicom-web" is usually + more optimized. + + Version 1.3 (2024-07-12) ======================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/ClearMetadataCache.py new/OrthancOHIF-1.4/Resources/ClearMetadataCache.py --- old/OrthancOHIF-1.3/Resources/ClearMetadataCache.py 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/ClearMetadataCache.py 2024-11-26 17:51:13.000000000 +0100 @@ -1,5 +1,25 @@ #!/usr/bin/env python3 +# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-License-Identifier: GPL-3.0-or-later + +# OHIF plugin for Orthanc +# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + + import argparse import requests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/CreateOHIFDist.sh new/OrthancOHIF-1.4/Resources/CreateOHIFDist.sh --- old/OrthancOHIF-1.3/Resources/CreateOHIFDist.sh 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/CreateOHIFDist.sh 2024-11-26 17:51:13.000000000 +0100 @@ -28,7 +28,7 @@ set -ex if [ "$1" = "" ]; then - PACKAGE=Viewers-3.8.3 + PACKAGE=Viewers-3.9.1 else PACKAGE=$1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/CMake/AutoGeneratedCode.cmake new/OrthancOHIF-1.4/Resources/Orthanc/CMake/AutoGeneratedCode.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/CMake/AutoGeneratedCode.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/CMake/AutoGeneratedCode.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/CMake/Compiler.cmake new/OrthancOHIF-1.4/Resources/Orthanc/CMake/Compiler.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/CMake/Compiler.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/CMake/Compiler.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or @@ -231,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 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake new/OrthancOHIF-1.4/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or @@ -162,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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/CMake/DownloadPackage.cmake new/OrthancOHIF-1.4/Resources/Orthanc/CMake/DownloadPackage.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/CMake/DownloadPackage.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/CMake/DownloadPackage.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/CMake/EmbedResources.py new/OrthancOHIF-1.4/Resources/Orthanc/CMake/EmbedResources.py --- old/OrthancOHIF-1.3/Resources/Orthanc/CMake/EmbedResources.py 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/CMake/EmbedResources.py 2024-11-26 17:51:13.000000000 +0100 @@ -3,7 +3,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp new/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp --- old/OrthancOHIF-1.3/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp 2024-11-26 17:51:13.000000000 +0100 @@ -2,7 +2,8 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2024 Osimis S.A., Belgium + * Copyright (C) 2017-2023 Osimis S.A., Belgium + * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h new/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h --- old/OrthancOHIF-1.3/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h 2024-11-26 17:51:13.000000000 +0100 @@ -2,7 +2,8 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2024 Osimis S.A., Belgium + * Copyright (C) 2017-2023 Osimis S.A., Belgium + * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/Plugins/OrthancPluginException.h new/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginException.h --- old/OrthancOHIF-1.3/Resources/Orthanc/Plugins/OrthancPluginException.h 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginException.h 2024-11-26 17:51:13.000000000 +0100 @@ -2,7 +2,8 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2024 Osimis S.A., Belgium + * Copyright (C) 2017-2023 Osimis S.A., Belgium + * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake new/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake new/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake new/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake new/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Resources/Orthanc/Toolchains/MinGWToolchain.cmake new/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGWToolchain.cmake --- old/OrthancOHIF-1.3/Resources/Orthanc/Toolchains/MinGWToolchain.cmake 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Resources/Orthanc/Toolchains/MinGWToolchain.cmake 2024-11-26 17:51:13.000000000 +0100 @@ -1,7 +1,8 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2024 Osimis S.A., Belgium +# Copyright (C) 2017-2023 Osimis S.A., Belgium +# Copyright (C) 2024-2024 Orthanc Team SRL, Belgium # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancOHIF-1.3/Sources/Plugin.cpp new/OrthancOHIF-1.4/Sources/Plugin.cpp --- old/OrthancOHIF-1.3/Sources/Plugin.cpp 2024-07-12 15:48:31.000000000 +0200 +++ new/OrthancOHIF-1.4/Sources/Plugin.cpp 2024-11-26 17:51:13.000000000 +0100 @@ -751,13 +751,13 @@ } std::string jsonModalities; - for (std::set<std::string>::const_iterator it = modalities.begin(); it != modalities.end(); ++it) + for (std::set<std::string>::const_iterator it2 = modalities.begin(); it2 != modalities.end(); ++it2) { if (!jsonModalities.empty()) { jsonModalities += ","; } - jsonModalities += *it; + jsonModalities += *it2; } study["NumInstances"] = countInstances; @@ -944,15 +944,18 @@ } routerBasename_ = configuration.GetStringValue("RouterBasename", "/ohif/"); - std::string s = configuration.GetStringValue("DataSource", "dicom-json"); + std::string s = configuration.GetStringValue("DataSource", "dicom-web"); std::string userConfigurationPath = configuration.GetStringValue("UserConfiguration", ""); preload_ = configuration.GetBooleanValue("Preload", true); - if (s == "dicom-web") + static const std::string SOURCE_DICOM_WEB = "dicom-web"; + static const std::string SOURCE_DICOM_JSON = "dicom-json"; + + if (s == SOURCE_DICOM_WEB) { dataSource_ = DataSource_DicomWeb; } - else if (s == "dicom-json") + else if (s == SOURCE_DICOM_JSON) { dataSource_ = DataSource_DicomJson; } @@ -960,7 +963,7 @@ { throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange, "Configuration option \"OHIF.DataSource\" must be either " - "\"dicomweb\" or \"dicom-json\", but found: " + s); + "\"" + SOURCE_DICOM_WEB +"\" or \"" + SOURCE_DICOM_JSON + "\", but found: " + s); } if (userConfigurationPath.empty()) ++++++ dist.zip ++++++ /work/SRC/openSUSE:Factory/orthanc-ohif/dist.zip /work/SRC/openSUSE:Factory/.orthanc-ohif.new.28523/dist.zip differ: char 11, line 2
