Hello community,
here is the log from the commit of package orthanc for openSUSE:Factory checked
in at 2020-06-02 14:34:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/orthanc (Old)
and /work/SRC/openSUSE:Factory/.orthanc.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orthanc"
Tue Jun 2 14:34:23 2020 rev:7 rq:809643 version:1.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2020-05-26
17:21:09.116211063 +0200
+++ /work/SRC/openSUSE:Factory/.orthanc.new.3606/orthanc.changes
2020-06-02 14:34:29.986735659 +0200
@@ -1,0 +2,7 @@
+Wed May 27 14:24:06 UTC 2020 - Axel Braun <axel.br...@gmx.de>
+
+- version 1.7.1
+* Fix decoding of DICOM images for plugins (for compatibility with
+ Orthanc Web Viewer 2.6)
+
+-------------------------------------------------------------------
Old:
----
Orthanc-1.7.0.tar.gz
New:
----
Orthanc-1.7.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ orthanc.spec ++++++
--- /var/tmp/diff_new_pack.dMmLip/_old 2020-06-02 14:34:31.250739659 +0200
+++ /var/tmp/diff_new_pack.dMmLip/_new 2020-06-02 14:34:31.250739659 +0200
@@ -18,7 +18,7 @@
Name: orthanc
-Version: 1.7.0
+Version: 1.7.1
Release: 0
Summary: RESTful DICOM server for healthcare and medical research
License: GPL-3.0-or-later
++++++ Orthanc-1.7.0.tar.gz -> Orthanc-1.7.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/.hg_archival.txt
new/Orthanc-1.7.1/.hg_archival.txt
--- old/Orthanc-1.7.0/.hg_archival.txt 2020-05-22 12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/.hg_archival.txt 2020-05-27 08:12:33.000000000 +0200
@@ -1,6 +1,6 @@
repo: 3959d33612ccaadc0d4d707227fbed09ac35e5fe
-node: 22eb9453b3f5df679edad13152e15d0cfb9da5d1
-branch: Orthanc-1.7.0
+node: adc6f1fa7417d10e7a2e7a1529a0f973a5d67de9
+branch: Orthanc-1.7.1
latesttag: toa2020012703
-latesttagdistance: 226
-changessincelatesttag: 341
+latesttagdistance: 237
+changessincelatesttag: 354
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/Core/DicomNetworking/IGetRequestHandler.h
new/Orthanc-1.7.1/Core/DicomNetworking/IGetRequestHandler.h
--- old/Orthanc-1.7.0/Core/DicomNetworking/IGetRequestHandler.h 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Core/DicomNetworking/IGetRequestHandler.h 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/Core/DicomNetworking/IGetRequestHandlerFactory.h
new/Orthanc-1.7.1/Core/DicomNetworking/IGetRequestHandlerFactory.h
--- old/Orthanc-1.7.0/Core/DicomNetworking/IGetRequestHandlerFactory.h
2020-05-22 12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Core/DicomNetworking/IGetRequestHandlerFactory.h
2020-05-27 08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/Core/DicomNetworking/Internals/GetScp.cpp
new/Orthanc-1.7.1/Core/DicomNetworking/Internals/GetScp.cpp
--- old/Orthanc-1.7.0/Core/DicomNetworking/Internals/GetScp.cpp 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Core/DicomNetworking/Internals/GetScp.cpp 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/Core/DicomNetworking/Internals/GetScp.h
new/Orthanc-1.7.1/Core/DicomNetworking/Internals/GetScp.h
--- old/Orthanc-1.7.0/Core/DicomNetworking/Internals/GetScp.h 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Core/DicomNetworking/Internals/GetScp.h 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/Core/DicomParsing/DcmtkTranscoder.cpp
new/Orthanc-1.7.1/Core/DicomParsing/DcmtkTranscoder.cpp
--- old/Orthanc-1.7.0/Core/DicomParsing/DcmtkTranscoder.cpp 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Core/DicomParsing/DcmtkTranscoder.cpp 2020-05-27
08:12:33.000000000 +0200
@@ -284,6 +284,28 @@
return false;
}
+ {
+ std::string s;
+ for (std::set<DicomTransferSyntax>::const_iterator
+ it = allowedSyntaxes.begin(); it != allowedSyntaxes.end(); ++it)
+ {
+ if (!s.empty())
+ {
+ s += ", ";
+ }
+
+ s += GetTransferSyntaxUid(*it);
+ }
+
+ if (s.empty())
+ {
+ s = "<none>";
+ }
+
+ LOG(INFO) << "DCMTK transcoding from " <<
GetTransferSyntaxUid(sourceSyntax)
+ << " to one of: " << s;
+ }
+
#if !defined(NDEBUG)
const std::string sourceSopInstanceUid =
GetSopInstanceUid(source.GetParsed());
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/Core/HttpServer/IHttpHandler.h
new/Orthanc-1.7.1/Core/HttpServer/IHttpHandler.h
--- old/Orthanc-1.7.0/Core/HttpServer/IHttpHandler.h 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Core/HttpServer/IHttpHandler.h 2020-05-27
08:12:33.000000000 +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<IChunkedRequestReader>& target,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/Core/Toolbox.cpp
new/Orthanc-1.7.1/Core/Toolbox.cpp
--- old/Orthanc-1.7.0/Core/Toolbox.cpp 2020-05-22 12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Core/Toolbox.cpp 2020-05-27 08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/NEWS new/Orthanc-1.7.1/NEWS
--- old/Orthanc-1.7.0/NEWS 2020-05-22 12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/NEWS 2020-05-27 08:12:33.000000000 +0200
@@ -2,6 +2,12 @@
===============================
+Version 1.7.1 (2020-05-27)
+==========================
+
+* Fix decoding of DICOM images for plugins (for compatibility with
+ Orthanc Web Viewer 2.6)
+
Version 1.7.0 (2020-05-22)
==========================
@@ -9,7 +15,7 @@
General
-------
-* Support of DICOM C-GET SCP (contribution by Varian)
+* Support of DICOM C-GET SCP (contribution by Varian Medical Systems)
* DICOM transcoding over the REST API
* Transcoding from compressed to uncompressed transfer syntaxes over DICOM
C-STORE SCU (if the remote modality doesn't support compressed syntaxes)
@@ -246,7 +252,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 +488,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-fp.js
new/Orthanc-1.7.1/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-fp.js
---
old/Orthanc-1.7.0/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-fp.js
2020-05-22 12:30:36.000000000 +0200
+++
new/Orthanc-1.7.1/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-fp.js
2020-05-27 08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-ui.js
new/Orthanc-1.7.1/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-ui.js
---
old/Orthanc-1.7.0/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-ui.js
2020-05-22 12:30:36.000000000 +0200
+++
new/Orthanc-1.7.1/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload-ui.js
2020-05-27 08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js
new/Orthanc-1.7.1/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js
---
old/Orthanc-1.7.0/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js
2020-05-22 12:30:36.000000000 +0200
+++
new/Orthanc-1.7.1/OrthancExplorer/libs/jquery-file-upload/js/jquery.fileupload.js
2020-05-27 08:12:33.000000000 +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);
$('<form></form>').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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/OrthancExplorer/libs/slimbox2.js
new/Orthanc-1.7.1/OrthancExplorer/libs/slimbox2.js
--- old/Orthanc-1.7.0/OrthancExplorer/libs/slimbox2.js 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/OrthancExplorer/libs/slimbox2.js 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/OrthancServer/OrthancGetRequestHandler.cpp
new/Orthanc-1.7.1/OrthancServer/OrthancGetRequestHandler.cpp
--- old/Orthanc-1.7.0/OrthancServer/OrthancGetRequestHandler.cpp
2020-05-22 12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/OrthancServer/OrthancGetRequestHandler.cpp
2020-05-27 08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/OrthancServer/OrthancGetRequestHandler.h
new/Orthanc-1.7.1/OrthancServer/OrthancGetRequestHandler.h
--- old/Orthanc-1.7.0/OrthancServer/OrthancGetRequestHandler.h 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/OrthancServer/OrthancGetRequestHandler.h 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/OrthancServer/OrthancRestApi/OrthancRestResources.cpp
new/Orthanc-1.7.1/OrthancServer/OrthancRestApi/OrthancRestResources.cpp
--- old/Orthanc-1.7.0/OrthancServer/OrthancRestApi/OrthancRestResources.cpp
2020-05-22 12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/OrthancServer/OrthancRestApi/OrthancRestResources.cpp
2020-05-27 08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/OrthancServer/ServerContext.cpp
new/Orthanc-1.7.1/OrthancServer/ServerContext.cpp
--- old/Orthanc-1.7.0/OrthancServer/ServerContext.cpp 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/OrthancServer/ServerContext.cpp 2020-05-27
08:12:33.000000000 +0200
@@ -1296,6 +1296,16 @@
}
+ ImageAccessor* ServerContext::DecodeDicomFrame(const void* dicom,
+ size_t size,
+ unsigned int frameIndex)
+ {
+ DicomInstanceToStore instance;
+ instance.SetBuffer(dicom, size);
+ return DecodeDicomFrame(instance, frameIndex);
+ }
+
+
void ServerContext::StoreWithTranscoding(std::string& sopClassUid,
std::string& sopInstanceUid,
DicomStoreUserConnection&
connection,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/OrthancServer/ServerContext.h
new/Orthanc-1.7.1/OrthancServer/ServerContext.h
--- old/Orthanc-1.7.0/OrthancServer/ServerContext.h 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/OrthancServer/ServerContext.h 2020-05-27
08:12:33.000000000 +0200
@@ -469,6 +469,10 @@
ImageAccessor* DecodeDicomFrame(const DicomInstanceToStore& dicom,
unsigned int frameIndex);
+ ImageAccessor* DecodeDicomFrame(const void* dicom,
+ size_t size,
+ unsigned int frameIndex);
+
void StoreWithTranscoding(std::string& sopClassUid,
std::string& sopInstanceUid,
DicomStoreUserConnection& connection,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/Plugins/Engine/OrthancPlugins.cpp
new/Orthanc-1.7.1/Plugins/Engine/OrthancPlugins.cpp
--- old/Orthanc-1.7.0/Plugins/Engine/OrthancPlugins.cpp 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Plugins/Engine/OrthancPlugins.cpp 2020-05-27
08:12:33.000000000 +0200
@@ -2922,7 +2922,8 @@
case OrthancPluginImageFormat_Dicom:
{
- image.reset(Decode(p.data, p.size, 0));
+ PImpl::ServerContextLock lock(*pimpl_);
+ image.reset(lock.GetContext().DecodeDicomFrame(p.data, p.size, 0));
break;
}
@@ -3485,7 +3486,8 @@
case _OrthancPluginService_DecodeDicomImage:
{
- result.reset(Decode(p.constBuffer, p.bufferSize, p.frameIndex));
+ PImpl::ServerContextLock lock(*pimpl_);
+ result.reset(lock.GetContext().DecodeDicomFrame(p.constBuffer,
p.bufferSize, p.frameIndex));
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/Resources/CMake/DcmtkConfiguration.cmake
new/Orthanc-1.7.1/Resources/CMake/DcmtkConfiguration.cmake
--- old/Orthanc-1.7.0/Resources/CMake/DcmtkConfiguration.cmake 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Resources/CMake/DcmtkConfiguration.cmake 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/Resources/CMake/OrthancFrameworkConfiguration.cmake
new/Orthanc-1.7.1/Resources/CMake/OrthancFrameworkConfiguration.cmake
--- old/Orthanc-1.7.0/Resources/CMake/OrthancFrameworkConfiguration.cmake
2020-05-22 12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Resources/CMake/OrthancFrameworkConfiguration.cmake
2020-05-27 08:12:33.000000000 +0200
@@ -44,6 +44,7 @@
unset(ENABLE_SSL CACHE)
unset(ENABLE_PKCS11 CACHE)
unset(ENABLE_OPENSSL_ENGINES CACHE)
+ unset(OPENSSL_STATIC_VERSION CACHE)
unset(USE_SYSTEM_OPENSSL CACHE)
unset(USE_SYSTEM_LIBP11 CACHE)
add_definitions(
@@ -115,6 +116,8 @@
unset(USE_SYSTEM_DCMTK CACHE)
unset(ENABLE_DCMTK_JPEG CACHE)
unset(ENABLE_DCMTK_JPEG_LOSSLESS CACHE)
+ unset(DCMTK_STATIC_VERSION CACHE)
+ unset(ENABLE_DCMTK_LOG CACHE)
endif()
@@ -426,7 +429,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/Resources/CMake/OrthancFrameworkParameters.cmake
new/Orthanc-1.7.1/Resources/CMake/OrthancFrameworkParameters.cmake
--- old/Orthanc-1.7.0/Resources/CMake/OrthancFrameworkParameters.cmake
2020-05-22 12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Resources/CMake/OrthancFrameworkParameters.cmake
2020-05-27 08:12:33.000000000 +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 "1.7.1")
# Version of the database schema. History:
# * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/Resources/Configuration.json
new/Orthanc-1.7.1/Resources/Configuration.json
--- old/Orthanc-1.7.0/Resources/Configuration.json 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Resources/Configuration.json 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Orthanc-1.7.0/Resources/DownloadOrthancFramework.cmake
new/Orthanc-1.7.1/Resources/DownloadOrthancFramework.cmake
--- old/Orthanc-1.7.0/Resources/DownloadOrthancFramework.cmake 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/Resources/DownloadOrthancFramework.cmake 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/UnitTestsSources/FromDcmtkTests.cpp
new/Orthanc-1.7.1/UnitTestsSources/FromDcmtkTests.cpp
--- old/Orthanc-1.7.0/UnitTestsSources/FromDcmtkTests.cpp 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/UnitTestsSources/FromDcmtkTests.cpp 2020-05-27
08:12:33.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Orthanc-1.7.0/UnitTestsSources/ServerIndexTests.cpp
new/Orthanc-1.7.1/UnitTestsSources/ServerIndexTests.cpp
--- old/Orthanc-1.7.0/UnitTestsSources/ServerIndexTests.cpp 2020-05-22
12:30:36.000000000 +0200
+++ new/Orthanc-1.7.1/UnitTestsSources/ServerIndexTests.cpp 2020-05-27
08:12:33.000000000 +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]);
