Mercurial > hg > orthanc

changeset 1858:483f26479743 dcmtk-3.6.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update to latest dcmtk snapshot
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 02 Dec 2015 10:05:45 +0100
parents 4f2386d0f326
children 950745f3f48b
files Resources/CMake/DcmtkConfiguration.cmake Resources/Patches/dcmtk-speed.patch
diffstat 2 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Dec 02 09:52:56 2015 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Wed Dec 02 10:05:45 2015 +0100
@@ -1,9 +1,9 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
   SET(DCMTK_VERSION_NUMBER 361)
   SET(DCMTK_PACKAGE_VERSION "3.6.1")
-  SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.1_20150629)
-  SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.1_20150629.tar.gz")
-  SET(DCMTK_MD5 "2faf73786fc638ae05fef0103cce0eea")
+  SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.1_20150924)
+  SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.1_20150924.tar.gz")
+  SET(DCMTK_MD5 "0d60ea9e1c886124fe45122855cecd30")
 
   if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}")
     set(FirstRun OFF)
@@ -123,7 +123,7 @@
   list(REMOVE_ITEM DCMTK_SOURCES 
     ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
     ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
-    ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
+    #${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
     )
 
   #set_source_files_properties(${DCMTK_SOURCES}
--- a/Resources/Patches/dcmtk-speed.patch	Wed Dec 02 09:52:56 2015 +0100
+++ b/Resources/Patches/dcmtk-speed.patch	Wed Dec 02 10:05:45 2015 +0100
@@ -1,6 +1,6 @@
-diff -r -u dcmtk-3.6.1_20150629.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.1_20150629/dcmnet/libsrc/dul.cc
---- dcmtk-3.6.1_20150629.orig/dcmnet/libsrc/dul.cc	2015-06-29 10:56:45.000000000 +0200
-+++ dcmtk-3.6.1_20150629/dcmnet/libsrc/dul.cc	2015-09-23 10:18:58.796546032 +0200
+diff -Naur dcmtk-3.6.1_20150924.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.1_20150924/dcmnet/libsrc/dul.cc
+--- dcmtk-3.6.1_20150924.orig/dcmnet/libsrc/dul.cc	2015-12-02 09:56:30.845194735 +0100
++++ dcmtk-3.6.1_20150924/dcmnet/libsrc/dul.cc	2015-12-02 09:56:49.925194253 +0100
 @@ -1833,7 +1833,7 @@
          return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
      }
@@ -10,10 +10,9 @@
  
  #ifndef DONT_DISABLE_NAGLE_ALGORITHM
      /*
-Only in dcmtk-3.6.1_20150629/dcmnet/libsrc: dul.cc~
-diff -r -u dcmtk-3.6.1_20150629.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.1_20150629/dcmnet/libsrc/dulfsm.cc
---- dcmtk-3.6.1_20150629.orig/dcmnet/libsrc/dulfsm.cc	2015-06-29 10:56:45.000000000 +0200
-+++ dcmtk-3.6.1_20150629/dcmnet/libsrc/dulfsm.cc	2015-09-23 10:19:10.088545747 +0200
+diff -Naur dcmtk-3.6.1_20150924.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.1_20150924/dcmnet/libsrc/dulfsm.cc
+--- dcmtk-3.6.1_20150924.orig/dcmnet/libsrc/dulfsm.cc	2015-12-02 09:56:30.845194735 +0100
++++ dcmtk-3.6.1_20150924/dcmnet/libsrc/dulfsm.cc	2015-12-02 09:57:03.709193904 +0100
 @@ -2421,7 +2421,7 @@
            return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
          }
@@ -23,4 +22,3 @@
  
  #ifndef DONT_DISABLE_NAGLE_ALGORITHM
          /*
-Only in dcmtk-3.6.1_20150629/dcmnet/libsrc: dulfsm.cc~