# HG changeset patch # User Sebastien Jodogne # Date 1590397508 -7200 # Node ID c825ba6ad65223406a0180805c122668f210c33c # Parent ef907d3b38d58d7c53339d5ba5d588a85ee165c3# Parent 5f9a0e13ba2d62978e17769964eac38f6dd90e62 integration diff -r 5f9a0e13ba2d -r c825ba6ad652 Core/DicomNetworking/IGetRequestHandler.h --- a/Core/DicomNetworking/IGetRequestHandler.h Mon May 25 07:47:37 2020 +0200 +++ b/Core/DicomNetworking/IGetRequestHandler.h Mon May 25 11:05:08 2020 +0200 @@ -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-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 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 5f9a0e13ba2d -r c825ba6ad652 Core/DicomNetworking/IGetRequestHandlerFactory.h --- a/Core/DicomNetworking/IGetRequestHandlerFactory.h Mon May 25 07:47:37 2020 +0200 +++ b/Core/DicomNetworking/IGetRequestHandlerFactory.h Mon May 25 11:05:08 2020 +0200 @@ -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-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 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 5f9a0e13ba2d -r c825ba6ad652 Core/DicomNetworking/Internals/GetScp.cpp --- a/Core/DicomNetworking/Internals/GetScp.cpp Mon May 25 07:47:37 2020 +0200 +++ b/Core/DicomNetworking/Internals/GetScp.cpp Mon May 25 11:05:08 2020 +0200 @@ -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-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 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 5f9a0e13ba2d -r c825ba6ad652 Core/DicomNetworking/Internals/GetScp.h --- a/Core/DicomNetworking/Internals/GetScp.h Mon May 25 07:47:37 2020 +0200 +++ b/Core/DicomNetworking/Internals/GetScp.h Mon May 25 11:05:08 2020 +0200 @@ -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-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 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 5f9a0e13ba2d -r c825ba6ad652 Core/HttpServer/IHttpHandler.h --- a/Core/HttpServer/IHttpHandler.h Mon May 25 07:47:37 2020 +0200 +++ b/Core/HttpServer/IHttpHandler.h Mon May 25 11:05:08 2020 +0200 @@ -71,7 +71,7 @@ } /** - * This function allows to deal with chunked transfers (new in + * This function allows one to deal with chunked transfers (new in * Orthanc 1.5.7). It is only called if "method" is POST or PUT. **/ virtual bool CreateChunkedRequestReader(std::unique_ptr& target, diff -r 5f9a0e13ba2d -r c825ba6ad652 Core/Toolbox.cpp --- a/Core/Toolbox.cpp Mon May 25 07:47:37 2020 +0200 +++ b/Core/Toolbox.cpp Mon May 25 11:05:08 2020 +0200 @@ -1998,7 +1998,7 @@ it removes the character set information from the byte stream. However, in the case where the encoding is unique, then suppressing - the escape sequences allows to provide us with a clean string after + the escape sequences allows one to provide us with a clean string after conversion to utf-8 with boost. **/ void Toolbox::RemoveIso2022EscapeSequences(std::string& dest, const std::string& src) diff -r 5f9a0e13ba2d -r c825ba6ad652 NEWS --- a/NEWS Mon May 25 07:47:37 2020 +0200 +++ b/NEWS Mon May 25 11:05:08 2020 +0200 @@ -246,7 +246,7 @@ ---------------- * If performing a Query/Retrieve operation, the default value for the - tags is set to an empty string instead of '*', which allows to match + tags is set to an empty string instead of '*', which allows one to match even if the tag is not present. This allows malformed DICOM files to be matched, even though they lack required tags such as "PatientSex" @@ -482,7 +482,7 @@ General ------- -* "OrthancPeers" configuration option now allows to specify HTTP headers +* "OrthancPeers" configuration option now allows one to specify HTTP headers * New main DICOM tag: "ImageOrientationPatient" at the instance level * New configuration options: - "HttpVerbose" to debug outgoing HTTP connections diff -r 5f9a0e13ba2d -r c825ba6ad652 OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-fp.js --- a/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-fp.js Mon May 25 07:47:37 2020 +0200 +++ b/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-fp.js Mon May 25 11:05:08 2020 +0200 @@ -184,7 +184,7 @@ }, // Processes the files given as files property of the data parameter, - // returns a Promise object that allows to bind a done handler, which + // returns a Promise object that allows one to bind a done handler, which // will be invoked after processing all files (inplace) is done: process: function (data) { var that = this, diff -r 5f9a0e13ba2d -r c825ba6ad652 OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-ui.js --- a/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-ui.js Mon May 25 07:47:37 2020 +0200 +++ b/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-ui.js Mon May 25 11:05:08 2020 +0200 @@ -295,7 +295,7 @@ } }, - // Link handler, that allows to download files + // Link handler, that allows one to download files // by drag & drop of the links to the desktop: _enableDragToDesktop: function () { var link = $(this), diff -r 5f9a0e13ba2d -r c825ba6ad652 OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js --- a/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js Mon May 25 07:47:37 2020 +0200 +++ b/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js Mon May 25 11:05:08 2020 +0200 @@ -126,14 +126,14 @@ // The add callback is invoked as soon as files are added to the fileupload // widget (via file input selection, drag & drop, paste or add API call). // If the singleFileUploads option is enabled, this callback will be - // called once for each file in the selection for XHR file uplaods, else + // called once for each file in the selection for XHR file uploads, else // once for each file selection. // The upload starts when the submit method is invoked on the data parameter. // The data object contains a files property holding the added files - // and allows to override plugin options as well as define ajax settings. + // and allows one to override plugin options as well as define ajax settings. // Listeners for this callback can also be bound the following way: // .bind('fileuploadadd', func); - // data.submit() returns a Promise object and allows to attach additional + // data.submit() returns a Promise object and allows one to attach additional // handlers using jQuery's Deferred callbacks: // data.submit().done(func).fail(func).always(func); add: function (e, data) { @@ -755,7 +755,7 @@ _replaceFileInput: function (input) { var inputClone = input.clone(true); $('
').append(inputClone)[0].reset(); - // Detaching allows to insert the fileInput on another form + // Detaching allows one to insert the fileInput on another form // without loosing the file input value: input.after(inputClone).detach(); // Avoid memory leaks with the detached file input: diff -r 5f9a0e13ba2d -r c825ba6ad652 OrthancExplorer/libs/slimbox2.js --- a/OrthancExplorer/libs/slimbox2.js Mon May 25 07:47:37 2020 +0200 +++ b/OrthancExplorer/libs/slimbox2.js Mon May 25 11:05:08 2020 +0200 @@ -53,7 +53,7 @@ // Open Slimbox with the specified parameters $.slimbox = function(_images, startImage, _options) { options = $.extend({ - loop: false, // Allows to navigate between first and last images + loop: false, // Allows one to navigate between first and last images overlayOpacity: 0.8, // 1 is opaque, 0 is completely transparent (change the color in the CSS file) overlayFadeDuration: 400, // Duration of the overlay fade-in and fade-out animations (in milliseconds) resizeDuration: 400, // Duration of each of the box resize animations (in milliseconds) @@ -241,4 +241,4 @@ return false; } -})(jQuery); \ No newline at end of file +})(jQuery); diff -r 5f9a0e13ba2d -r c825ba6ad652 OrthancServer/OrthancGetRequestHandler.cpp --- a/OrthancServer/OrthancGetRequestHandler.cpp Mon May 25 07:47:37 2020 +0200 +++ b/OrthancServer/OrthancGetRequestHandler.cpp Mon May 25 11:05:08 2020 +0200 @@ -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-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 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 @@ -254,7 +254,7 @@ bool allowTranscoding = (context_.IsTranscodeDicomProtocol() && remote_.IsTranscodingAllowed()); - T_ASC_PresentationContextID presId; + T_ASC_PresentationContextID presId = 0; // Unnecessary initialization, makes code clearer DicomTransferSyntax selectedSyntax; if (!SelectPresentationContext(presId, selectedSyntax, assoc, sopClassUid, sourceSyntax, allowTranscoding) || diff -r 5f9a0e13ba2d -r c825ba6ad652 OrthancServer/OrthancGetRequestHandler.h --- a/OrthancServer/OrthancGetRequestHandler.h Mon May 25 07:47:37 2020 +0200 +++ b/OrthancServer/OrthancGetRequestHandler.h Mon May 25 11:05:08 2020 +0200 @@ -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-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 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 5f9a0e13ba2d -r c825ba6ad652 OrthancServer/OrthancRestApi/OrthancRestResources.cpp --- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp Mon May 25 07:47:37 2020 +0200 +++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp Mon May 25 11:05:08 2020 +0200 @@ -338,7 +338,7 @@ } else { - // This path allows to avoid the JSON decoding if no + // This path allows one to avoid the JSON decoding if no // simplification is asked, and if no "ignore-length" argument // is present std::string full; diff -r 5f9a0e13ba2d -r c825ba6ad652 Resources/CMake/DcmtkConfiguration.cmake --- a/Resources/CMake/DcmtkConfiguration.cmake Mon May 25 07:47:37 2020 +0200 +++ b/Resources/CMake/DcmtkConfiguration.cmake Mon May 25 11:05:08 2020 +0200 @@ -168,7 +168,7 @@ link_libraries(dcmdata dcmnet dcmjpeg oflog ofstd) else() - # The following line allows to manually add libraries at the + # The following line allows one to manually add libraries at the # command-line, which is necessary for Ubuntu/Debian packages set(tmp "${DCMTK_LIBRARIES}") include(FindDCMTK) diff -r 5f9a0e13ba2d -r c825ba6ad652 Resources/CMake/OrthancFrameworkConfiguration.cmake --- a/Resources/CMake/OrthancFrameworkConfiguration.cmake Mon May 25 07:47:37 2020 +0200 +++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake Mon May 25 11:05:08 2020 +0200 @@ -426,7 +426,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/UuidConfiguration.cmake) # We put Boost as the last dependency, as it is the heaviest to -# configure, which allows to quickly spot problems when configuring +# configure, which allows one to quickly spot problems when configuring # static builds in other dependencies include(${CMAKE_CURRENT_LIST_DIR}/BoostConfiguration.cmake) diff -r 5f9a0e13ba2d -r c825ba6ad652 Resources/CMake/OrthancFrameworkParameters.cmake --- a/Resources/CMake/OrthancFrameworkParameters.cmake Mon May 25 07:47:37 2020 +0200 +++ b/Resources/CMake/OrthancFrameworkParameters.cmake Mon May 25 11:05:08 2020 +0200 @@ -3,7 +3,7 @@ ##################################################################### # Version of the build, should always be "mainline" except in release branches -set(ORTHANC_VERSION "1.7.0") +set(ORTHANC_VERSION "mainline") # Version of the database schema. History: # * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning diff -r 5f9a0e13ba2d -r c825ba6ad652 Resources/Configuration.json --- a/Resources/Configuration.json Mon May 25 07:47:37 2020 +0200 +++ b/Resources/Configuration.json Mon May 25 11:05:08 2020 +0200 @@ -274,7 +274,7 @@ /** * This is another, more advanced format to define Orthanc - * peers. It notably allows to specify HTTP headers, a HTTPS + * peers. It notably allows one to specify HTTP headers, a HTTPS * client certificate in the PEM format (as in the "--cert" option * of curl), or to enable PKCS#11 authentication for smart cards. **/ diff -r 5f9a0e13ba2d -r c825ba6ad652 Resources/DownloadOrthancFramework.cmake --- a/Resources/DownloadOrthancFramework.cmake Mon May 25 07:47:37 2020 +0200 +++ b/Resources/DownloadOrthancFramework.cmake Mon May 25 11:05:08 2020 +0200 @@ -116,6 +116,8 @@ set(ORTHANC_FRAMEWORK_MD5 "eab428d6e53f61e847fa360bb17ebe25") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.1") set(ORTHANC_FRAMEWORK_MD5 "3971f5de96ba71dc9d3f3690afeaa7c0") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.0") + set(ORTHANC_FRAMEWORK_MD5 "ce5f689e852b01d3672bd3d2f952a5ef") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc diff -r 5f9a0e13ba2d -r c825ba6ad652 UnitTestsSources/FromDcmtkTests.cpp --- a/UnitTestsSources/FromDcmtkTests.cpp Mon May 25 07:47:37 2020 +0200 +++ b/UnitTestsSources/FromDcmtkTests.cpp Mon May 25 11:05:08 2020 +0200 @@ -514,7 +514,9 @@ std::string s; ASSERT_TRUE(f.LookupTransferSyntax(s)); - ASSERT_EQ(s, GetTransferSyntaxUid(DicomTransferSyntax_LittleEndianExplicit)); + // The default transfer syntax depends on the OS endianness + ASSERT_TRUE(s == GetTransferSyntaxUid(DicomTransferSyntax_LittleEndianExplicit) || + s == GetTransferSyntaxUid(DicomTransferSyntax_BigEndianExplicit)); ASSERT_THROW(f.Replace(DICOM_TAG_ACCESSION_NUMBER, std::string("Accession"), false, DicomReplaceMode_ThrowIfAbsent, ""), OrthancException); diff -r 5f9a0e13ba2d -r c825ba6ad652 UnitTestsSources/ServerIndexTests.cpp --- a/UnitTestsSources/ServerIndexTests.cpp Mon May 25 07:47:37 2020 +0200 +++ b/UnitTestsSources/ServerIndexTests.cpp Mon May 25 11:05:08 2020 +0200 @@ -734,8 +734,10 @@ ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_TransferSyntax) != instanceMetadata.end()); ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end()); - // By default, an Explicit VR Little Endian is used by Orthanc - ASSERT_EQ("1.2.840.10008.1.2.1", instanceMetadata[MetadataType_Instance_TransferSyntax]); + // The default transfer syntax depends on the OS endianness + std::string s = instanceMetadata[MetadataType_Instance_TransferSyntax]; + ASSERT_TRUE(s == "1.2.840.10008.1.2.1" || + s == "1.2.840.10008.1.2.2"); ASSERT_EQ("1.2.840.10008.5.1.4.1.1.1", instanceMetadata[MetadataType_Instance_SopClassUid]);