Hello community,
here is the log from the commit of package orthanc-dicomweb for
openSUSE:Factory checked in at 2020-12-21 10:22:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/orthanc-dicomweb (Old)
and /work/SRC/openSUSE:Factory/.orthanc-dicomweb.new.5145 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orthanc-dicomweb"
Mon Dec 21 10:22:37 2020 rev:5 rq:856908 version:1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/orthanc-dicomweb/orthanc-dicomweb.changes
2020-11-12 22:38:29.174085077 +0100
+++
/work/SRC/openSUSE:Factory/.orthanc-dicomweb.new.5145/orthanc-dicomweb.changes
2020-12-21 10:23:12.271969249 +0100
@@ -1,0 +2,14 @@
+Fri Dec 18 14:27:16 UTC 2020 - Axel Braun <[email protected]>
+
+- Version 1.4
+* "Extrapolate" mode doesn't fail if no consensus is found in WADO-RS Retrieve
Metadata.
+ This is necessary for proper behavior of the Stone Web viewer on very small
series.
+* Fix issue #190 (STOW-RS fails is multipart boundary is surrounded by quotes
in headers)
+* patches_logging.patch removed (included in source)
+
+-------------------------------------------------------------------
+Thu Dec 10 13:49:00 UTC 2020 - Axel Braun <[email protected]>
+
+- patches_logging.patch added to fix issue with orthanc 1.8.1
+
+-------------------------------------------------------------------
Old:
----
OrthancDicomWeb-1.3.tar.gz
New:
----
OrthancDicomWeb-1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ orthanc-dicomweb.spec ++++++
--- /var/tmp/diff_new_pack.Z8loFT/_old 2020-12-21 10:23:13.379970222 +0100
+++ /var/tmp/diff_new_pack.Z8loFT/_new 2020-12-21 10:23:13.383970226 +0100
@@ -21,7 +21,7 @@
Summary: WebViewer plugin for Orthanc
License: AGPL-3.0-or-later
Group: Productivity/Graphics/Viewers
-Version: 1.3
+Version: 1.4
Release: 0
URL: https://orthanc-server.com
Source0:
https://www.orthanc-server.com/downloads/get.php?path=/plugin-dicom-web/OrthancDicomWeb-%{version}.tar.gz
++++++ OrthancDicomWeb-1.3.tar.gz -> OrthancDicomWeb-1.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OrthancDicomWeb-1.3/.hg_archival.txt
new/OrthancDicomWeb-1.4/.hg_archival.txt
--- old/OrthancDicomWeb-1.3/.hg_archival.txt 2020-10-19 19:18:23.000000000
+0200
+++ new/OrthancDicomWeb-1.4/.hg_archival.txt 2020-12-18 07:15:27.000000000
+0100
@@ -1,6 +1,6 @@
repo: d5f45924411123cfd02d035fd50b8e37536eadef
-node: 4bfe89488bc1eec56b6b3eb8716b68e4ed3663dd
-branch: OrthancDicomWeb-1.3
+node: b751b1383e075319ab286e1388aebc032f34d0b2
+branch: OrthancDicomWeb-1.4
latesttag: null
-latesttagdistance: 437
-changessincelatesttag: 466
+latesttagdistance: 443
+changessincelatesttag: 472
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OrthancDicomWeb-1.3/CMakeLists.txt
new/OrthancDicomWeb-1.4/CMakeLists.txt
--- old/OrthancDicomWeb-1.3/CMakeLists.txt 2020-10-19 19:18:23.000000000
+0200
+++ new/OrthancDicomWeb-1.4/CMakeLists.txt 2020-12-18 07:15:27.000000000
+0100
@@ -21,13 +21,13 @@
project(OrthancDicomWeb)
-set(ORTHANC_DICOM_WEB_VERSION "1.3")
+set(ORTHANC_DICOM_WEB_VERSION "1.4")
if (ORTHANC_DICOM_WEB_VERSION STREQUAL "mainline")
set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
else()
- set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.0")
+ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.1")
set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OrthancDicomWeb-1.3/NEWS new/OrthancDicomWeb-1.4/NEWS
--- old/OrthancDicomWeb-1.3/NEWS 2020-10-19 19:18:23.000000000 +0200
+++ new/OrthancDicomWeb-1.4/NEWS 2020-12-18 07:15:27.000000000 +0100
@@ -2,6 +2,14 @@
===============================
+Version 1.4 (2020-12-18)
+========================
+
+* "Extrapolate" mode doesn't fail if no consensus is found in WADO-RS Retrieve
Metadata.
+ This is necessary for proper behavior of the Stone Web viewer on very small
series.
+* Fix issue #190 (STOW-RS fails is multipart boundary is surrounded by quotes
in headers)
+
+
Version 1.3 (2020-10-19)
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OrthancDicomWeb-1.3/Plugin/DicomWebClient.cpp
new/OrthancDicomWeb-1.4/Plugin/DicomWebClient.cpp
--- old/OrthancDicomWeb-1.3/Plugin/DicomWebClient.cpp 2020-10-19
19:18:23.000000000 +0200
+++ new/OrthancDicomWeb-1.4/Plugin/DicomWebClient.cpp 2020-12-18
07:15:27.000000000 +0100
@@ -24,9 +24,10 @@
#include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
#include "DicomWebServers.h"
+#include <ChunkedBuffer.h>
#include <Compatibility.h>
#include <HttpServer/MultipartStreamReader.h>
-#include <ChunkedBuffer.h>
+#include <Logging.h>
#include <Toolbox.h>
#include <json/reader.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OrthancDicomWeb-1.3/Plugin/Plugin.cpp
new/OrthancDicomWeb-1.4/Plugin/Plugin.cpp
--- old/OrthancDicomWeb-1.3/Plugin/Plugin.cpp 2020-10-19 19:18:23.000000000
+0200
+++ new/OrthancDicomWeb-1.4/Plugin/Plugin.cpp 2020-12-18 07:15:27.000000000
+0100
@@ -26,6 +26,7 @@
#include "WadoRs.h"
#include "WadoUri.h"
+#include <Logging.h>
#include <SystemToolbox.h>
#include <Toolbox.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OrthancDicomWeb-1.3/Plugin/QidoRs.cpp
new/OrthancDicomWeb-1.4/Plugin/QidoRs.cpp
--- old/OrthancDicomWeb-1.3/Plugin/QidoRs.cpp 2020-10-19 19:18:23.000000000
+0200
+++ new/OrthancDicomWeb-1.4/Plugin/QidoRs.cpp 2020-12-18 07:15:27.000000000
+0100
@@ -27,6 +27,7 @@
#include <DicomFormat/DicomMap.h>
#include <DicomFormat/DicomTag.h>
+#include <Logging.h>
#include <Toolbox.h>
#include <list>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OrthancDicomWeb-1.3/Plugin/StowRs.cpp
new/OrthancDicomWeb-1.4/Plugin/StowRs.cpp
--- old/OrthancDicomWeb-1.3/Plugin/StowRs.cpp 2020-10-19 19:18:23.000000000
+0200
+++ new/OrthancDicomWeb-1.4/Plugin/StowRs.cpp 2020-12-18 07:15:27.000000000
+0100
@@ -59,6 +59,16 @@
"The STOW-RS plugin currently only
supports \"application/dicom\" subtype");
}
+ // Hotfix for bug #190, until the Orthanc Framework is fixed
+ // https://bugs.orthanc-server.com/show_bug.cgi?id=190
+ if (!boundary.empty() &&
+ boundary.size() >= 2 &&
+ boundary[0] == '"' &&
+ boundary[boundary.size() - 1] == '"')
+ {
+ boundary = boundary.substr(1, boundary.size() - 2);
+ }
+
parser_.reset(new Orthanc::MultipartStreamReader(boundary));
parser_->SetHandler(*this);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OrthancDicomWeb-1.3/Plugin/WadoRs.cpp
new/OrthancDicomWeb-1.4/Plugin/WadoRs.cpp
--- old/OrthancDicomWeb-1.3/Plugin/WadoRs.cpp 2020-10-19 19:18:23.000000000
+0200
+++ new/OrthancDicomWeb-1.4/Plugin/WadoRs.cpp 2020-12-18 07:15:27.000000000
+0100
@@ -25,6 +25,7 @@
#include <Compatibility.h>
#include <ChunkedBuffer.h>
+#include <Logging.h>
#include <Toolbox.h>
#include <memory>
@@ -394,11 +395,14 @@
++current;
}
+ target.SetValue(tag, maxValue, false);
+
// Take the ceiling of the number of available instances
const size_t threshold = instances_.size() / 2 + 1;
- if (maxCount >= threshold)
+ if (maxCount < threshold)
{
- target.SetValue(tag, maxValue, false);
+ LOG(WARNING) << "No consensus on the value of a tag during WADO-RS
Retrieve "
+ << "Metadata in Extrapolate mode: " << tag.Format();
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OrthancDicomWeb-1.3/Plugin/WadoRsRetrieveRendered.cpp
new/OrthancDicomWeb-1.4/Plugin/WadoRsRetrieveRendered.cpp
--- old/OrthancDicomWeb-1.3/Plugin/WadoRsRetrieveRendered.cpp 2020-10-19
19:18:23.000000000 +0200
+++ new/OrthancDicomWeb-1.4/Plugin/WadoRsRetrieveRendered.cpp 2020-12-18
07:15:27.000000000 +0100
@@ -25,6 +25,7 @@
#include <Images/Image.h>
#include <Images/ImageProcessing.h>
#include <Images/ImageTraits.h>
+#include <Logging.h>
#include <Toolbox.h>
#include <boost/algorithm/string/predicate.hpp>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OrthancDicomWeb-1.3/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
new/OrthancDicomWeb-1.4/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
---
old/OrthancDicomWeb-1.3/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
2020-10-19 19:18:23.000000000 +0200
+++
new/OrthancDicomWeb-1.4/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
2020-12-18 07:15:27.000000000 +0100
@@ -118,6 +118,8 @@
set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.1")
+ set(ORTHANC_FRAMEWORK_MD5 "db094f96399cbe8b9bbdbce34884c220")
# Below this point are development snapshots that were used to
# release some plugin, before an official release of the Orthanc
@@ -129,6 +131,12 @@
elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
# DICOMweb 1.1 (framework pre-1.6.0)
set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
+ # Stone Web viewer 1.0 (framework pre-1.8.1)
+ set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
+ # PostgreSQL 3.3 (framework pre-1.8.2)
+ set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
endif()
endif()
endif()
@@ -524,6 +532,16 @@
include_directories(${DCMTK_INCLUDE_DIRS})
link_libraries(${DCMTK_LIBRARIES})
endif()
+
+ # Optional component - OpenSSL
+ if (ENABLE_SSL)
+ include(FindOpenSSL)
+ if (NOT ${OPENSSL_FOUND})
+ message(FATAL_ERROR "Unable to find OpenSSL")
+ endif()
+ include_directories(${OPENSSL_INCLUDE_DIR})
+ link_libraries(${OPENSSL_LIBRARIES})
+ endif()
endif()
# Look for Orthanc framework shared library
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
