# HG changeset patch # User Sebastien Jodogne # Date 1609952304 -3600 # Node ID 3bd0ec7c5a7cbcdf8d48800342bbb17ef4c1429b # Parent cfeda58d0c8ebe0cb370ef2dfbe245c4103e7e2d upgrade to year 2021 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/CMake/AutoGeneratedCode.cmake --- a/Resources/Orthanc/CMake/AutoGeneratedCode.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/CMake/AutoGeneratedCode.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/CMake/Compiler.cmake --- a/Resources/Orthanc/CMake/Compiler.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/CMake/Compiler.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 @@ -139,6 +139,9 @@ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7") # PostgreSQL 3.3 (framework pre-1.8.2) 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_MD5 "9af92080e57c60dd288eba46ce606c00") endif() endif() endif() diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/CMake/DownloadPackage.cmake --- a/Resources/Orthanc/CMake/DownloadPackage.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/CMake/DownloadPackage.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/CMake/EmbedResources.py --- a/Resources/Orthanc/CMake/EmbedResources.py Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/CMake/EmbedResources.py Wed Jan 06 17:58:24 2021 +0100 @@ -3,7 +3,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/CMake/GoogleTestConfiguration.cmake --- a/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/LinuxStandardBaseToolchain.cmake --- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/MinGW-W64-Toolchain32.cmake --- a/Resources/Orthanc/MinGW-W64-Toolchain32.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/MinGW-W64-Toolchain32.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/MinGW-W64-Toolchain64.cmake --- a/Resources/Orthanc/MinGW-W64-Toolchain64.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/MinGW-W64-Toolchain64.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/MinGWToolchain.cmake --- a/Resources/Orthanc/MinGWToolchain.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/MinGWToolchain.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp --- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Wed Jan 06 17:58:24 2021 +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-2020 Osimis S.A., 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 General Public License as @@ -316,12 +316,7 @@ bool ReadJson(Json::Value& target, const std::string& source) { -#if JSONCPP_USE_DEPRECATED == 1 - Json::Reader reader; - return reader.parse(source, target); -#else - return ReadJson(target, source.c_str(), source.size()); -#endif + return ReadJson(target, source.empty() ? NULL : source.c_str(), source.size()); } diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h --- a/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Wed Jan 06 17:58:24 2021 +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-2020 Osimis S.A., 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 General Public License as diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/Plugins/OrthancPluginException.h --- a/Resources/Orthanc/Plugins/OrthancPluginException.h Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/Plugins/OrthancPluginException.h Wed Jan 06 17:58:24 2021 +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-2020 Osimis S.A., 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 General Public License as diff -r cfeda58d0c8e -r 3bd0ec7c5a7c Resources/Orthanc/Plugins/OrthancPluginsExports.cmake --- a/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake Tue Dec 22 08:31:22 2020 +0100 +++ b/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake Wed Jan 06 17:58:24 2021 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2020 Osimis S.A., 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 General Public License as