[med-svn] [Git][med-team/orthanc-dicomweb][upstream] New upstream version 1.4+dfsg

[Sebastien Jodogne]

Sebastien Jodogne pushed to branch upstream at Debian Med / orthanc-dicomweb


Commits:
f8e2d8ca by jodogne-guest at 2020-12-18T09:03:48+01:00
New upstream version 1.4+dfsg
- - - - -


10 changed files:

- .hg_archival.txt
- CMakeLists.txt
- NEWS
- Plugin/DicomWebClient.cpp
- Plugin/Plugin.cpp
- Plugin/QidoRs.cpp
- Plugin/StowRs.cpp
- Plugin/WadoRs.cpp
- Plugin/WadoRsRetrieveRendered.cpp
- Resources/Orthanc/CMake/DownloadOrthancFramework.cmake


Changes:

=====================================
.hg_archival.txt
=====================================
@@ -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


=====================================
CMakeLists.txt
=====================================
@@ -21,13 +21,13 @@ cmake_minimum_required(VERSION 2.8)
 
 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()
 


=====================================
NEWS
=====================================
@@ -2,6 +2,14 @@ Pending changes in the mainline
 ===============================
 
 
+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)
 ========================
 


=====================================
Plugin/DicomWebClient.cpp
=====================================
@@ -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>


=====================================
Plugin/Plugin.cpp
=====================================
@@ -26,6 +26,7 @@
 #include "WadoRs.h"
 #include "WadoUri.h"
 
+#include <Logging.h>
 #include <SystemToolbox.h>
 #include <Toolbox.h>
 


=====================================
Plugin/QidoRs.cpp
=====================================
@@ -27,6 +27,7 @@
 
 #include <DicomFormat/DicomMap.h>
 #include <DicomFormat/DicomTag.h>
+#include <Logging.h>
 #include <Toolbox.h>
 
 #include <list>


=====================================
Plugin/StowRs.cpp
=====================================
@@ -59,6 +59,16 @@ namespace OrthancPlugins
                                       "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);
   }


=====================================
Plugin/WadoRs.cpp
=====================================
@@ -25,6 +25,7 @@
 
 #include <Compatibility.h>
 #include <ChunkedBuffer.h>
+#include <Logging.h>
 #include <Toolbox.h>
 
 #include <memory>
@@ -394,11 +395,14 @@ namespace
           ++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();
         }
       }
     }


=====================================
Plugin/WadoRsRetrieveRendered.cpp
=====================================
@@ -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>


=====================================
Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
=====================================
@@ -118,6 +118,8 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "hg" OR
         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 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "hg" OR
       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 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
       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



View it on GitLab: https://salsa.debian.org/med-team/orthanc-dicomweb/-/commit/f8e2d8ca744dbfc898377b55007e12185583127f

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc-dicomweb/-/commit/f8e2d8ca744dbfc898377b55007e12185583127f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201218/7780341b/attachment-0001.html>