Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package orthanc-tcia for openSUSE:Factory checked in at 2024-03-20 21:15:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orthanc-tcia (Old) and /work/SRC/openSUSE:Factory/.orthanc-tcia.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orthanc-tcia" Wed Mar 20 21:15:08 2024 rev:2 rq:1159862 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/orthanc-tcia/orthanc-tcia.changes 2021-10-27 22:21:07.879196374 +0200 +++ /work/SRC/openSUSE:Factory/.orthanc-tcia.new.1905/orthanc-tcia.changes 2024-03-20 21:17:17.216530755 +0100 @@ -1,0 +2,8 @@ +Wed Mar 13 13:35:46 UTC 2024 - Axel Braun <axel.br...@gmx.de> + +- version 1.1 + enable gcc13 for Leap 15 + gcc11.diff removed (included in source) + download changed to university louvain (new orthanc host) + +------------------------------------------------------------------- Old: ---- OrthancTcia-1.0.tar.gz gcc11.diff New: ---- OrthancTcia-1.1.tar.gz BETA DEBUG BEGIN: Old: enable gcc13 for Leap 15 gcc11.diff removed (included in source) download changed to university louvain (new orthanc host) BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orthanc-tcia.spec ++++++ --- /var/tmp/diff_new_pack.BG0CT1/_old 2024-03-20 21:17:17.824553090 +0100 +++ /var/tmp/diff_new_pack.BG0CT1/_new 2024-03-20 21:17:17.824553090 +0100 @@ -1,8 +1,8 @@ # # spec file for package orthanc-tcia # -# Copyright (c) 2021 SUSE LLC -# Copyright (c) 2021 Dr. Axel Braun <d...@opensuse.org> +# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2021-2024 Dr. Axel Braun <d...@opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,20 +21,22 @@ Summary: TCIA plugin for Orthanc License: GPL-3.0-or-later Group: Productivity/Graphics/Viewers -Version: 1.0 +Version: 1.1 Release: 0 URL: http://orthanc-server.com -Source0: https://www.orthanc-server.com/downloads/get.php?path=/plugin-tcia/OrthancTcia-%{version}.tar.gz -Source10: http://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/bootstrap-4.3.1.zip -Source11: http://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/vuejs-2.6.10.tar.gz -Source12: http://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/axios-0.19.0.tar.gz +Source0: https://orthanc.uclouvain.be/downloads/sources/%{name}/OrthancTcia-%{version}.tar.gz +Source10: https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/bootstrap-4.3.1.zip +Source11: https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/vuejs-2.6.10.tar.gz +Source12: https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/axios-0.19.0.tar.gz Source20: orthanc-tcia-readme.openSUSE -# Required for TW: -Patch0: gcc11.diff BuildRequires: cmake +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200 +BuildRequires: gcc13-c++ +%else BuildRequires: gcc-c++ +%endif BuildRequires: googletest-devel BuildRequires: jsoncpp-devel BuildRequires: libboost_date_time-devel >= 1.66 @@ -46,9 +48,9 @@ BuildRequires: libboost_thread-devel >= 1.66 BuildRequires: libcsv-devel BuildRequires: libuuid-devel -BuildRequires: sqlite3-devel BuildRequires: orthanc-devel BuildRequires: orthanc-source +BuildRequires: sqlite3-devel BuildRequires: unzip Requires: orthanc @@ -59,17 +61,18 @@ Plugin to import data from The Cancer Image Archive %prep -%setup -q -n OrthancTcia-%{version} -%autopatch -p1 +%autosetup -n OrthancTcia-%{version} #OrthancPlugins may ask for additional files to be loaded #Putting them into this folder prevents download of sources from the web mkdir ThirdPartyDownloads cp %{S:10} %{S:11} %{S:12} ThirdPartyDownloads/. - %build - +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200 +export CC=gcc-13 +export CXX=g++-13 +%endif %cmake .. \ -DALLOW_DOWNLOADS=OFF \ -DUSE_SYSTEM_GOOGLE_TEST=ON \ ++++++ OrthancTcia-1.0.tar.gz -> OrthancTcia-1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/.hg_archival.txt new/OrthancTcia-1.1/.hg_archival.txt --- old/OrthancTcia-1.0/.hg_archival.txt 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/.hg_archival.txt 2021-12-14 14:19:20.000000000 +0100 @@ -1,6 +1,6 @@ repo: 2464bacb730bae24dbbe54fb003f814285f8c374 -node: 00b79b4079a09b4b846bfd7dde801b4f44c4a50b -branch: OrthancTcia-1.0 +node: acedf6311c813a491951eed748cc0cf22a2447b9 +branch: OrthancTcia-1.1 latesttag: null -latesttagdistance: 9 -changessincelatesttag: 9 +latesttagdistance: 19 +changessincelatesttag: 21 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/.hgignore new/OrthancTcia-1.1/.hgignore --- old/OrthancTcia-1.0/.hgignore 1970-01-01 01:00:00.000000000 +0100 +++ new/OrthancTcia-1.1/.hgignore 2021-12-14 14:19:20.000000000 +0100 @@ -0,0 +1,4 @@ +syntax: glob +*.cpp.orig +*.h.orig +*~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/CMakeLists.txt new/OrthancTcia-1.1/CMakeLists.txt --- old/OrthancTcia-1.0/CMakeLists.txt 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/CMakeLists.txt 2021-12-14 14:19:20.000000000 +0100 @@ -19,13 +19,13 @@ project(OrthancTcia) -set(ORTHANC_PLUGIN_VERSION "1.0") +set(ORTHANC_PLUGIN_VERSION "1.1") if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.6") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.7") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() @@ -67,9 +67,9 @@ include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake) set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) - set(ENABLE_SQLITE ON) set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "") set(ENABLE_MODULE_DICOM OFF CACHE INTERNAL "") + set(ENABLE_MODULE_IMAGES OFF CACHE INTERNAL "") include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake) include_directories(${ORTHANC_FRAMEWORK_ROOT}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/NEWS new/OrthancTcia-1.1/NEWS --- old/OrthancTcia-1.0/NEWS 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/NEWS 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,12 @@ =============================== +Version 1.1 (2021-12-14) +======================== + +* Fix import of collections with a space in their names + + Version 1.0 (2021-08-29) ======================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Plugin/HttpCache.h new/OrthancTcia-1.1/Plugin/HttpCache.h --- old/OrthancTcia-1.0/Plugin/HttpCache.h 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Plugin/HttpCache.h 2021-12-14 14:19:20.000000000 +0100 @@ -22,6 +22,7 @@ #include <boost/date_time/posix_time/posix_time_types.hpp> #include <boost/noncopyable.hpp> #include <boost/thread/mutex.hpp> +#include <map> namespace OrthancPlugins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Plugin/TciaImportJob.cpp new/OrthancTcia-1.1/Plugin/TciaImportJob.cpp --- old/OrthancTcia-1.0/Plugin/TciaImportJob.cpp 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Plugin/TciaImportJob.cpp 2021-12-14 14:19:20.000000000 +0100 @@ -260,9 +260,9 @@ else { const Series& series = series_[position_]; - const std::string url = ( - std::string(TCIA_BASE_URL) + "/getImage?Collection" + series.GetCollection() + - "&SeriesInstanceUID=" + series.GetSeriesInstanceUid()); + + const std::string url = (std::string(TCIA_BASE_URL) + + "/getImage?SeriesInstanceUID=" + series.GetSeriesInstanceUid()); Json::Value query; query["Level"] = "Instance"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/CMake/AutoGeneratedCode.cmake new/OrthancTcia-1.1/Resources/Orthanc/CMake/AutoGeneratedCode.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/CMake/AutoGeneratedCode.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/CMake/AutoGeneratedCode.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/CMake/Compiler.cmake new/OrthancTcia-1.1/Resources/Orthanc/CMake/Compiler.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/CMake/Compiler.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/CMake/Compiler.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake new/OrthancTcia-1.1/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License @@ -71,7 +72,10 @@ if (NOT ORTHANC_FRAMEWORK_MAJOR MATCHES "^[0-9]+$" OR NOT ORTHANC_FRAMEWORK_MINOR MATCHES "^[0-9]+$" OR NOT ORTHANC_FRAMEWORK_REVISION MATCHES "^[0-9]+$") - message("Bad version of the Orthanc framework: ${ORTHANC_FRAMEWORK_VERSION}") + message("Bad version of the Orthanc framework, assuming a pre-release: ${ORTHANC_FRAMEWORK_VERSION}") + set(ORTHANC_FRAMEWORK_MAJOR 999) + set(ORTHANC_FRAMEWORK_MINOR 999) + set(ORTHANC_FRAMEWORK_REVISION 999) endif() if (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.1") @@ -136,6 +140,8 @@ set(ORTHANC_FRAMEWORK_MD5 "10fc64de1254a095e5d3ed3931f0cfbb") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.6") set(ORTHANC_FRAMEWORK_MD5 "4b5d05683d747c29b2860ad79d11e62e") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.7") + set(ORTHANC_FRAMEWORK_MD5 "c912bbb860d640d3ae3003b5c9698205") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc @@ -156,6 +162,9 @@ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "23ad1b9c7800") # For "Toolbox::ReadJson()" and "Toolbox::Write{...}Json()" (pre-1.9.0) set(ORTHANC_FRAMEWORK_MD5 "9af92080e57c60dd288eba46ce606c00") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "b2e08d83e21d") + # WSI 1.1 (framework pre-1.9.8), to remove "-std=c++11" + set(ORTHANC_FRAMEWORK_MD5 "2eaa073cbb4b44ffba199ad93393b2b1") endif() endif() endif() @@ -498,35 +507,6 @@ message(FATAL_ERROR "Please install the libjsoncpp-dev package") endif() - # Switch to the C++11 standard if the version of JsonCpp is 1.y.z - # (same as variable JSONCPP_CXX11 in the source code of Orthanc) - if (EXISTS ${JSONCPP_INCLUDE_DIR}/json/version.h) - file(STRINGS - "${JSONCPP_INCLUDE_DIR}/json/version.h" - JSONCPP_VERSION_MAJOR1 REGEX - ".*define JSONCPP_VERSION_MAJOR.*") - - if (NOT JSONCPP_VERSION_MAJOR1) - message(FATAL_ERROR "Unable to extract the major version of JsonCpp") - endif() - - string(REGEX REPLACE - ".*JSONCPP_VERSION_MAJOR.*([0-9]+)$" "\\1" - JSONCPP_VERSION_MAJOR ${JSONCPP_VERSION_MAJOR1}) - message("JsonCpp major version: ${JSONCPP_VERSION_MAJOR}") - - if (JSONCPP_VERSION_MAJOR GREATER 0) - message("Switching to C++11 standard, as version of JsonCpp is >= 1.0.0") - if (CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") - elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - endif() - else() - message("Unable to detect the major version of JsonCpp, assuming < 1.0.0") - endif() - # Look for Orthanc framework shared library include(CheckCXXSymbolExists) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/CMake/DownloadPackage.cmake new/OrthancTcia-1.1/Resources/Orthanc/CMake/DownloadPackage.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/CMake/DownloadPackage.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/CMake/DownloadPackage.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/CMake/EmbedResources.py new/OrthancTcia-1.1/Resources/Orthanc/CMake/EmbedResources.py --- old/OrthancTcia-1.0/Resources/Orthanc/CMake/EmbedResources.py 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/CMake/EmbedResources.py 2021-12-14 14:19:20.000000000 +0100 @@ -4,6 +4,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake new/OrthancTcia-1.1/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -# Orthanc - A Lightweight, RESTful DICOM Store -# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics -# Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2021 Osimis S.A., Belgium -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. - - -if (USE_GOOGLE_TEST_DEBIAN_PACKAGE) - find_path(GOOGLE_TEST_DEBIAN_SOURCES_DIR - NAMES src/gtest-all.cc - PATHS - ${CROSSTOOL_NG_IMAGE}/usr/src/gtest - ${CROSSTOOL_NG_IMAGE}/usr/src/googletest/googletest - PATH_SUFFIXES src - ) - - find_path(GOOGLE_TEST_DEBIAN_INCLUDE_DIR - NAMES gtest.h - PATHS - ${CROSSTOOL_NG_IMAGE}/usr/include/gtest - ) - - message("Path to the Debian Google Test sources: ${GOOGLE_TEST_DEBIAN_SOURCES_DIR}") - message("Path to the Debian Google Test includes: ${GOOGLE_TEST_DEBIAN_INCLUDE_DIR}") - - set(GOOGLE_TEST_SOURCES - ${GOOGLE_TEST_DEBIAN_SOURCES_DIR}/src/gtest-all.cc - ) - - include_directories(${GOOGLE_TEST_DEBIAN_SOURCES_DIR}) - - if (NOT EXISTS ${GOOGLE_TEST_SOURCES} OR - NOT EXISTS ${GOOGLE_TEST_DEBIAN_INCLUDE_DIR}/gtest.h) - message(FATAL_ERROR "Please install the libgtest-dev package") - endif() - -elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST) - set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/googletest-release-1.8.1) - set(GOOGLE_TEST_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gtest-1.8.1.tar.gz";) - set(GOOGLE_TEST_MD5 "2e6fbeb6a91310a16efe181886c59596") - - DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}") - - include_directories( - ${GOOGLE_TEST_SOURCES_DIR}/googletest - ${GOOGLE_TEST_SOURCES_DIR}/googletest/include - ${GOOGLE_TEST_SOURCES_DIR} - ) - - set(GOOGLE_TEST_SOURCES - ${GOOGLE_TEST_SOURCES_DIR}/googletest/src/gtest-all.cc - ) - - # https://code.google.com/p/googletest/issues/detail?id=412 - if (MSVC) # VS2012 does not support tuples correctly yet - add_definitions(/D _VARIADIC_MAX=10) - endif() - - if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") - add_definitions(-DGTEST_HAS_CLONE=0) - endif() - - source_group(ThirdParty\\GoogleTest REGULAR_EXPRESSION ${GOOGLE_TEST_SOURCES_DIR}/.*) - -else() - include(FindGTest) - if (NOT GTEST_FOUND) - message(FATAL_ERROR "Unable to find GoogleTest") - endif() - - include_directories(${GTEST_INCLUDE_DIRS}) - - # The variable GTEST_LIBRARIES contains the shared library of - # Google Test, create an alias for more uniformity - set(GOOGLE_TEST_LIBRARIES ${GTEST_LIBRARIES}) -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp new/OrthancTcia-1.1/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp --- old/OrthancTcia-1.0/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp 2021-12-14 14:19:20.000000000 +0100 @@ -3,6 +3,7 @@ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017-2021 Osimis S.A., Belgium + * Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM 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 @@ -539,6 +540,13 @@ const std::string& password) { Clear(); + + if (body.size() > 0xffffffffu) + { + LogError("Cannot handle body size > 4GB"); + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + return CheckHttp(OrthancPluginHttpPost(GetGlobalContext(), &buffer_, url.c_str(), body.c_str(), body.size(), username.empty() ? NULL : username.c_str(), @@ -552,6 +560,13 @@ const std::string& password) { Clear(); + + if (body.size() > 0xffffffffu) + { + LogError("Cannot handle body size > 4GB"); + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + return CheckHttp(OrthancPluginHttpPut(GetGlobalContext(), &buffer_, url.c_str(), body.empty() ? NULL : body.c_str(), body.size(), @@ -1892,6 +1907,12 @@ ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); } + if (body.size() > 0xffffffffu) + { + LogError("Cannot handle body size > 4GB"); + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + OrthancPlugins::MemoryBuffer answer; uint16_t status; OrthancPluginErrorCode code = OrthancPluginCallPeerApi @@ -1920,6 +1941,12 @@ ORTHANC_PLUGINS_THROW_PLUGIN_ERROR_CODE(OrthancPluginErrorCode_ParameterOutOfRange); } + if (body.size() > 0xffffffffu) + { + LogError("Cannot handle body size > 4GB"); + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + OrthancPlugins::MemoryBuffer answer; uint16_t status; OrthancPluginErrorCode code = OrthancPluginCallPeerApi @@ -2569,8 +2596,8 @@ void HttpClient::ClearCredentials() { - username_.empty(); - password_.empty(); + username_.clear(); + password_.clear(); } @@ -2883,6 +2910,12 @@ MemoryBuffer answerBodyBuffer, answerHeadersBuffer; + if (body.size() > 0xffffffffu) + { + LogError("Cannot handle body size > 4GB"); + ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError); + } + OrthancPluginErrorCode error = OrthancPluginHttpClient( GetGlobalContext(), *answerBodyBuffer, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h new/OrthancTcia-1.1/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h --- old/OrthancTcia-1.0/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h 2021-12-14 14:19:20.000000000 +0100 @@ -3,6 +3,7 @@ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017-2021 Osimis S.A., Belgium + * Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/Plugins/OrthancPluginException.h new/OrthancTcia-1.1/Resources/Orthanc/Plugins/OrthancPluginException.h --- old/OrthancTcia-1.0/Resources/Orthanc/Plugins/OrthancPluginException.h 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/Plugins/OrthancPluginException.h 2021-12-14 14:19:20.000000000 +0100 @@ -3,6 +3,7 @@ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017-2021 Osimis S.A., Belgium + * Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake new/OrthancTcia-1.1/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake new/OrthancTcia-1.1/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake new/OrthancTcia-1.1/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain32.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake new/OrthancTcia-1.1/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/Toolchains/MinGW-W64-Toolchain64.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/Orthanc/Toolchains/MinGWToolchain.cmake new/OrthancTcia-1.1/Resources/Orthanc/Toolchains/MinGWToolchain.cmake --- old/OrthancTcia-1.0/Resources/Orthanc/Toolchains/MinGWToolchain.cmake 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/Orthanc/Toolchains/MinGWToolchain.cmake 2021-12-14 14:19:20.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium # Copyright (C) 2017-2021 Osimis S.A., Belgium +# Copyright (C) 2021-2021 Sebastien Jodogne, ICTEAM UCLouvain, Belgium # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/Resources/SyncOrthancFolder.py new/OrthancTcia-1.1/Resources/SyncOrthancFolder.py --- old/OrthancTcia-1.0/Resources/SyncOrthancFolder.py 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/Resources/SyncOrthancFolder.py 2021-12-14 14:19:20.000000000 +0100 @@ -19,7 +19,6 @@ ('OrthancFramework/Resources/CMake/Compiler.cmake', 'CMake'), ('OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake', 'CMake'), ('OrthancFramework/Resources/CMake/DownloadPackage.cmake', 'CMake'), - ('OrthancFramework/Resources/CMake/GoogleTestConfiguration.cmake', 'CMake'), ('OrthancFramework/Resources/EmbedResources.py', 'CMake'), ('OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake', 'Toolchains'), ('OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain32.cmake', 'Toolchains'), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OrthancTcia-1.0/WebApplication/index.html new/OrthancTcia-1.1/WebApplication/index.html --- old/OrthancTcia-1.0/WebApplication/index.html 2021-08-29 12:18:15.000000000 +0200 +++ new/OrthancTcia-1.1/WebApplication/index.html 2021-12-14 14:19:20.000000000 +0100 @@ -21,7 +21,7 @@ </a> </div> <div class="row justify-content-center"> - <a href="../app/explorer.html" target="_blank"> + <a href="../../app/explorer.html" target="_blank"> <img src="images/orthanc-logo.png" class="mt-4" style="max-width:100%" width="256px" /> </a> </div>
