Mercurial > mxe-octave
changeset 1591:bc34d6a5995b
upgrade package dcmtk
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Fri, 18 Feb 2011 13:51:26 +0100 |
| parents | ac63b96079ea |
| children | a74a8aa03f8b |
| files | src/dcmtk-1-explicit-cast.patch src/dcmtk-2-const-correctness.patch src/dcmtk.mk |
| diffstat | 3 files changed, 2 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dcmtk-1-explicit-cast.patch Fri Feb 18 13:35:24 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://forum.dcmtk.org/viewtopic.php?t=2563 - ---- dcmtk-3.5.4.orig/ofstd/libsrc/ofthread.cc 2005-12-08 16:49:02.000000000 +0100 -+++ dcmtk-3.5.4/ofstd/libsrc/ofthread.cc 2010-06-15 21:34:29.234201660 +0200 -@@ -139,7 +139,7 @@ - theThreadHandle = _beginthreadex(NULL, 0, thread_stub, (void *)this, 0, &tid); - if (theThreadHandle == 0) return errno; else - { -- theThread = tid; -+ theThread = (void *)tid; - return 0; - } - #elif defined(POSIX_INTERFACE) -@@ -195,7 +195,7 @@ - #endif - { - #ifdef WINDOWS_INTERFACE -- if (theThread == tID) return OFTrue; else return OFFalse; -+ if (theThread == (void *)tID) return OFTrue; else return OFFalse; - #elif defined(POSIX_INTERFACE) - #ifdef HAVE_POINTER_TYPE_PTHREAD_T - // dangerous - we cast an unsigned long back to a pointer type and hope that it is still valid
--- a/src/dcmtk-2-const-correctness.patch Fri Feb 18 13:35:24 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=9ae9f56c4d40ebc7408fcbf84a7521d1d1341f5e - ---- dcmtk-3.5.4.orig/dcmtls/libsrc/tlslayer.cc 2005-12-08 16:48:28.000000000 +0100 -+++ dcmtk-3.5.4/dcmtls/libsrc/tlslayer.cc 2010-06-16 06:25:12.279931390 +0200 -@@ -188,7 +188,7 @@ - SSLeay_add_all_algorithms(); - seedPRNG(randFile); - -- SSL_METHOD *method = NULL; -+ const SSL_METHOD *method = NULL; - switch (networkRole) - { - case DICOM_APPLICATION_ACCEPTOR:
--- a/src/dcmtk.mk Fri Feb 18 13:35:24 2011 +0100 +++ b/src/dcmtk.mk Fri Feb 18 13:51:26 2011 +0100 @@ -4,8 +4,8 @@ # DCMTK PKG := dcmtk $(PKG)_IGNORE := -$(PKG)_VERSION := 3.5.4 -$(PKG)_CHECKSUM := 169056874947083e68eb941fcd53faaebc862ae5 +$(PKG)_VERSION := 3.6.0 +$(PKG)_CHECKSUM := 469e017cffc56f36e834aa19c8612111f964f757 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://dicom.offis.de/dcmtk.php.en