Mercurial > hg > orthanc

comparison Resources/Patches/dcmtk-3.6.5.patch @ 3776:73ef6e33003f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for msvc 2015 64bit
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 18 Mar 2020 10:32:23 +0100
parents 374e0c6c41d6
children 4e680e0e46c4
comparison
equal deleted inserted replaced
3775:374e0c6c41d6 3776:73ef6e33003f
1 diff -urEb dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h 1 diff -urEb dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h
2 --- dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-03-05 19:43:37.678302817 +0100 2 --- dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-03-18 10:22:41.555166774 +0100
3 +++ dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-03-05 19:43:41.198312828 +0100 3 +++ dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-03-18 10:22:53.395131056 +0100
4 @@ -152,6 +152,12 @@ 4 @@ -152,6 +152,12 @@
5 /// returns an iterator to the end of the repeating tag dictionary 5 /// returns an iterator to the end of the repeating tag dictionary
6 DcmDictEntryListIterator repeatingEnd() { return repDict.end(); } 6 DcmDictEntryListIterator repeatingEnd() { return repDict.end(); }
7 7
8 + // Function by the Orthanc project to load a dictionary from a 8 + // Function by the Orthanc project to load a dictionary from a
13 + 13 +
14 private: 14 private:
15 15
16 /** private undefined assignment operator 16 /** private undefined assignment operator
17 diff -urEb dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc 17 diff -urEb dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc
18 --- dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc 2020-03-05 19:43:37.682302828 +0100 18 --- dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc 2020-03-18 10:22:41.559166762 +0100
19 +++ dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc 2020-03-05 19:43:41.198312828 +0100 19 +++ dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc 2020-03-18 10:22:53.395131056 +0100
20 @@ -900,3 +900,6 @@ 20 @@ -900,3 +900,6 @@
21 wrlock().clear(); 21 wrlock().clear();
22 wrunlock(); 22 wrunlock();
23 } 23 }
24 + 24 +
25 + 25 +
26 +#include "dcdict_orthanc.cc" 26 +#include "dcdict_orthanc.cc"
27 diff -urEb dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc 27 diff -urEb dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc
28 --- dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc 2020-03-05 19:43:37.682302828 +0100 28 --- dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc 2020-03-18 10:22:41.559166762 +0100
29 +++ dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc 2020-03-05 19:43:41.198312828 +0100 29 +++ dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc 2020-03-18 10:22:53.395131056 +0100
30 @@ -36,6 +36,9 @@ 30 @@ -36,6 +36,9 @@
31 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */ 31 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */
32 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */ 32 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */
33 33
34 +#undef max 34 +#undef max
36 + 36 +
37 37
38 // ******************************** 38 // ********************************
39 39
40 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 40 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
41 --- dcmtk-3.6.5.orig/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-03-05 19:43:37.686302839 +0100 41 --- dcmtk-3.6.5.orig/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-03-18 10:22:41.543166810 +0100
42 +++ dcmtk-3.6.5/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-03-05 19:43:41.198312828 +0100 42 +++ dcmtk-3.6.5/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-03-18 10:22:53.395131056 +0100
43 @@ -63,7 +63,7 @@ 43 @@ -63,7 +63,7 @@
44 44
45 DCMTK_LOG4CPLUS_INLINE_EXPORT 45 DCMTK_LOG4CPLUS_INLINE_EXPORT
46 Mutex::Mutex (Mutex::Type t) 46 Mutex::Mutex (Mutex::Type t)
47 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)) + 0) 47 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)) + 0)
84 + : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex)) 84 + : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex))
85 { } 85 { }
86 86
87 87
88 diff -urEb dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc dcmtk-3.6.5/oflog/libsrc/oflog.cc 88 diff -urEb dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc dcmtk-3.6.5/oflog/libsrc/oflog.cc
89 --- dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc 2020-03-05 19:43:37.690302851 +0100 89 --- dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc 2020-03-18 10:22:41.547166798 +0100
90 +++ dcmtk-3.6.5/oflog/libsrc/oflog.cc 2020-03-05 19:43:54.622350144 +0100 90 +++ dcmtk-3.6.5/oflog/libsrc/oflog.cc 2020-03-18 10:23:09.347082846 +0100
91 @@ -19,6 +19,10 @@ 91 @@ -19,6 +19,11 @@
92 * 92 *
93 */ 93 */
94 94
95 +#if defined(_WIN32) 95 +#if defined(_WIN32)
96 +# define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
96 +# include <winsock.h> 97 +# include <winsock.h>
97 +#endif 98 +#endif
98 + 99 +
99 #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ 100 #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
100 #include "dcmtk/oflog/oflog.h" 101 #include "dcmtk/oflog/oflog.h"
101 102
102 diff -urEb dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h 103 diff -urEb dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h
103 --- dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h 2020-03-05 19:43:37.714302919 +0100 104 --- dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h 2020-03-18 10:22:41.587166677 +0100
104 +++ dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h 2020-03-05 19:43:41.198312828 +0100 105 +++ dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h 2020-03-18 10:22:53.395131056 +0100
105 @@ -575,7 +575,7 @@ 106 @@ -575,7 +575,7 @@
106 */ 107 */
107 void setlinebuf() 108 void setlinebuf()
108 { 109 {
109 -#if defined(_WIN32) || defined(__hpux) 110 -#if defined(_WIN32) || defined(__hpux)