Mercurial > hg > orthanc

changeset 3781:d912b0b1628d transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->transcoding
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 18 Mar 2020 15:53:38 +0100
parents a11d1d4b5849 (current diff) df69a5fdc836 (diff)
children b07fc9ed0dc5
files
diffstat 5 files changed, 40 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Tue Mar 17 19:20:15 2020 +0100
+++ b/NEWS	Wed Mar 18 15:53:38 2020 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.6.0 (2020-03-18)
+==========================
+
 General
 -------
 
--- a/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake	Tue Mar 17 19:20:15 2020 +0100
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake	Wed Mar 18 15:53:38 2020 +0100
@@ -185,11 +185,26 @@
   )
 
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND
-    CMAKE_COMPILER_IS_GNUCXX)
-  # This is MinGW
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  # For compatibility with Windows XP, avoid using fiber-local-storage
+  # in log4cplus, but use thread-local-storage instead. Otherwise,
+  # Windows XP complains about missing "FlsGetValue()" in KERNEL32.dll
   add_definitions(
     -DDCMTK_LOG4CPLUS_AVOID_WIN32_FLS
-    -DDCMTK_LOG4CPLUS_SINGLE_THREADED
     )
+
+  if (CMAKE_COMPILER_IS_GNUCXX OR             # MinGW
+      "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")  # MSVC for 32bit (*)
+
+    # (*) With multithreaded logging enabled, Visual Studio 2008 fails
+    # with error: ".\dcmtk-3.6.5\oflog\libsrc\globinit.cc(422) : error
+    # C2664: 'dcmtk::log4cplus::thread::impl::tls_init' : cannot
+    # convert parameter 1 from 'void (__stdcall *)(void *)' to
+    # 'dcmtk::log4cplus::thread::impl::tls_init_cleanup_func_type'"
+    #   None of the functions with this name in scope match the target type
+
+    add_definitions(
+      -DDCMTK_LOG4CPLUS_SINGLE_THREADED
+      )
+  endif()
 endif()
--- a/Resources/DownloadOrthancFramework.cmake	Tue Mar 17 19:20:15 2020 +0100
+++ b/Resources/DownloadOrthancFramework.cmake	Wed Mar 18 15:53:38 2020 +0100
@@ -112,6 +112,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8")
         set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.0")
+        set(ORTHANC_FRAMEWORK_MD5 "eab428d6e53f61e847fa360bb17ebe25")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
--- a/Resources/Patches/dcmtk-3.6.5.patch	Tue Mar 17 19:20:15 2020 +0100
+++ b/Resources/Patches/dcmtk-3.6.5.patch	Wed Mar 18 15:53:38 2020 +0100
@@ -1,6 +1,6 @@
 diff -urEb dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h
---- dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h	2020-03-05 19:43:37.678302817 +0100
-+++ dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h	2020-03-05 19:43:41.198312828 +0100
+--- dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h	2020-03-18 10:22:41.555166774 +0100
++++ dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h	2020-03-18 10:22:53.395131056 +0100
 @@ -152,6 +152,12 @@
      /// returns an iterator to the end of the repeating tag dictionary
      DcmDictEntryListIterator repeatingEnd() { return repDict.end(); }
@@ -15,8 +15,8 @@
  
      /** private undefined assignment operator
 diff -urEb dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc
---- dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc	2020-03-05 19:43:37.682302828 +0100
-+++ dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc	2020-03-05 19:43:41.198312828 +0100
+--- dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc	2020-03-18 10:22:41.559166762 +0100
++++ dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc	2020-03-18 10:22:53.395131056 +0100
 @@ -900,3 +900,6 @@
    wrlock().clear();
    wrunlock();
@@ -25,8 +25,8 @@
 +
 +#include "dcdict_orthanc.cc"
 diff -urEb dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc
---- dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc	2020-03-05 19:43:37.682302828 +0100
-+++ dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc	2020-03-05 19:43:41.198312828 +0100
+--- dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc	2020-03-18 10:22:41.559166762 +0100
++++ dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc	2020-03-18 10:22:53.395131056 +0100
 @@ -36,6 +36,9 @@
  #include "dcmtk/dcmdata/dcostrma.h"    /* for class DcmOutputStream */
  #include "dcmtk/dcmdata/dcwcache.h"    /* for class DcmWriteCache */
@@ -38,8 +38,8 @@
  // ********************************
  
 diff -urEb dcmtk-3.6.5.orig/oflog/include/dcmtk/oflog/thread/syncpub.h dcmtk-3.6.5/oflog/include/dcmtk/oflog/thread/syncpub.h
---- dcmtk-3.6.5.orig/oflog/include/dcmtk/oflog/thread/syncpub.h	2020-03-05 19:43:37.686302839 +0100
-+++ dcmtk-3.6.5/oflog/include/dcmtk/oflog/thread/syncpub.h	2020-03-05 19:43:41.198312828 +0100
+--- dcmtk-3.6.5.orig/oflog/include/dcmtk/oflog/thread/syncpub.h	2020-03-18 10:22:41.543166810 +0100
++++ dcmtk-3.6.5/oflog/include/dcmtk/oflog/thread/syncpub.h	2020-03-18 10:22:53.395131056 +0100
 @@ -63,7 +63,7 @@
  
  DCMTK_LOG4CPLUS_INLINE_EXPORT
@@ -86,22 +86,22 @@
  
  
 diff -urEb dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc dcmtk-3.6.5/oflog/libsrc/oflog.cc
---- dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc	2020-03-05 19:43:37.690302851 +0100
-+++ dcmtk-3.6.5/oflog/libsrc/oflog.cc	2020-03-05 19:43:54.622350144 +0100
+--- dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc	2020-03-18 10:22:41.547166798 +0100
++++ dcmtk-3.6.5/oflog/libsrc/oflog.cc	2020-03-18 11:55:50.116856932 +0100
 @@ -19,6 +19,10 @@
   *
   */
  
-+#ifdef __MINGW32__
-+#  include <winsock.h>
++#if defined(_WIN32)
++#  include <winsock2.h>
 +#endif
 +
  #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
  #include "dcmtk/oflog/oflog.h"
  
 diff -urEb dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h
---- dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h	2020-03-05 19:43:37.714302919 +0100
-+++ dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h	2020-03-05 19:43:41.198312828 +0100
+--- dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h	2020-03-18 10:22:41.587166677 +0100
++++ dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h	2020-03-18 10:22:53.395131056 +0100
 @@ -575,7 +575,7 @@
     */
    void setlinebuf()
--- a/Resources/Patches/dcmtk.txt	Tue Mar 17 19:20:15 2020 +0100
+++ b/Resources/Patches/dcmtk.txt	Wed Mar 18 15:53:38 2020 +0100
@@ -4,6 +4,7 @@
 diff -urEb dcmtk-3.6.0.orig/ dcmtk-3.6.0
 diff -urEb dcmtk-3.6.2.orig/ dcmtk-3.6.2
 diff -urEb dcmtk-3.6.4.orig/ dcmtk-3.6.4
+diff -urEb dcmtk-3.6.5.orig/ dcmtk-3.6.5
 
 For "dcmtk-3.6.2-private.dic"
 =============================