Mercurial > hg > orthanc
changeset 2355:e2e5dde95027
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 19 Jul 2017 09:10:02 +0200 |
| parents | 415450f11cc7 (diff) 2421c137c304 (current diff) |
| children | 7b3b82d426ed |
| files | |
| diffstat | 6 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp Wed Jul 19 09:08:04 2017 +0200 +++ b/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp Wed Jul 19 09:10:02 2017 +0200 @@ -234,7 +234,7 @@ bool force = GetBooleanValue("Force", request, false); - // As of Orthanc 1.2.1, the default anonymization is done + // As of Orthanc 1.3.0, the default anonymization is done // according to PS 3.15-2017c Table E.1-1 (basic profile) DicomVersion version = DicomVersion_2017c; if (request.isMember("DicomVersion"))
--- a/OrthancServer/ServerEnumerations.cpp Wed Jul 19 09:08:04 2017 +0200 +++ b/OrthancServer/ServerEnumerations.cpp Wed Jul 19 09:10:02 2017 +0200 @@ -433,7 +433,7 @@ if (obsolete) { LOG(WARNING) << "The \"" << manufacturer << "\" manufacturer is obsolete since " - << "Orthanc 1.2.1. To guarantee compatibility with future Orthanc " + << "Orthanc 1.3.0. To guarantee compatibility with future Orthanc " << "releases, you should replace it by \"" << EnumerationToString(result) << "\" in your configuration file.";
--- a/Plugins/Engine/OrthancPlugins.cpp Wed Jul 19 09:08:04 2017 +0200 +++ b/Plugins/Engine/OrthancPlugins.cpp Wed Jul 19 09:10:02 2017 +0200 @@ -3139,7 +3139,7 @@ getValues[i] = getArguments[i].second.c_str(); } - // Improved callback with support for GET arguments, since Orthanc 1.2.1 + // Improved callback with support for GET arguments, since Orthanc 1.3.0 for (PImpl::IncomingHttpRequestFilters2::const_iterator filter = pimpl_->incomingHttpRequestFilters2_.begin(); filter != pimpl_->incomingHttpRequestFilters2_.end(); ++filter)
--- a/Plugins/Include/orthanc/OrthancCPlugin.h Wed Jul 19 09:08:04 2017 +0200 +++ b/Plugins/Include/orthanc/OrthancCPlugin.h Wed Jul 19 09:10:02 2017 +0200 @@ -117,8 +117,8 @@ #endif #define ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER 1 -#define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER 2 -#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER 1 +#define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER 3 +#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER 0
--- a/Resources/CMake/BoostConfiguration.cmake Wed Jul 19 09:08:04 2017 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Wed Jul 19 09:10:02 2017 +0200 @@ -41,7 +41,7 @@ if (BOOST_STATIC) # Parameters for Boost 1.64.0 set(BOOST_NAME boost_1_64_0) - set(BOOST_BCP_SUFFIX bcpdigest-1.2.1) + set(BOOST_BCP_SUFFIX bcpdigest-1.3.0) set(BOOST_MD5 "ecb266cf46adcc7f695ad12685871174") set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz") set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src")
--- a/Resources/CMake/BoostConfiguration.sh Wed Jul 19 09:08:04 2017 +0200 +++ b/Resources/CMake/BoostConfiguration.sh Wed Jul 19 09:10:02 2017 +0200 @@ -16,7 +16,7 @@ ## - Orthanc between 0.9.2 and 0.9.4: Boost 1.58.0 ## - Orthanc between 0.9.5 and 1.0.0: Boost 1.59.0 ## - Orthanc between 1.1.0 and 1.2.0: Boost 1.60.0 -## - Orthanc >= 1.2.1: Boost 1.64.0 +## - Orthanc >= 1.3.0: Boost 1.64.0 rm -rf /tmp/boost_1_64_0 rm -rf /tmp/bcp/boost_1_64_0 @@ -31,7 +31,7 @@ cd /tmp/bcp echo "Compressing the subset..." -tar cfz boost_1_64_0_bcpdigest-1.2.1.tar.gz boost_1_64_0 -ls -l boost_1_64_0_bcpdigest-1.2.1.tar.gz -md5sum boost_1_64_0_bcpdigest-1.2.1.tar.gz -readlink -f boost_1_64_0_bcpdigest-1.2.1.tar.gz +tar cfz boost_1_64_0_bcpdigest-1.3.0.tar.gz boost_1_64_0 +ls -l boost_1_64_0_bcpdigest-1.3.0.tar.gz +md5sum boost_1_64_0_bcpdigest-1.3.0.tar.gz +readlink -f boost_1_64_0_bcpdigest-1.3.0.tar.gz