Mercurial > hg > orthanc

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h
3776
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
2 --- dcmtk-3.6.5.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-03-18 10:22:41.555166774 +0100
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
3 +++ dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-03-18 10:22:53.395131056 +0100
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -152,6 +152,12 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 /// returns an iterator to the end of the repeating tag dictionary
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 DcmDictEntryListIterator repeatingEnd() { return repDict.end(); }
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 + // Function by the Orthanc project to load a dictionary from a
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 + // memory buffer, which is necessary in sandboxed
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 + // environments. This is an adapted version of
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 + // DcmDataDictionary::loadDictionary().
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 + OFBool loadFromMemory(const std::string& content, OFBool errorIfAbsent = OFTrue);
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 +
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 private:
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 /** private undefined assignment operator
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 diff -urEb dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc
3776
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
18 --- dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc 2020-03-18 10:22:41.559166762 +0100
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
19 +++ dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc 2020-03-18 10:22:53.395131056 +0100
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 @@ -900,3 +900,6 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 wrlock().clear();
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 wrunlock();
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 }
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 +
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 +
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 +#include "dcdict_orthanc.cc"
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 diff -urEb dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc
3776
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
28 --- dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc 2020-03-18 10:22:41.559166762 +0100
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
29 +++ dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc 2020-03-18 10:22:53.395131056 +0100
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 @@ -36,6 +36,9 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 +#undef max
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 +#include "dcmtk/ofstd/oflimits.h"
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 +
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 // ********************************
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
3776
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
41 --- dcmtk-3.6.5.orig/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-03-18 10:22:41.543166810 +0100
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
42 +++ dcmtk-3.6.5/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-03-18 10:22:53.395131056 +0100
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 @@ -63,7 +63,7 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 DCMTK_LOG4CPLUS_INLINE_EXPORT
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 Mutex::Mutex (Mutex::Type t)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)) + 0)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)))
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 { }
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 @@ -106,7 +106,7 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 DCMTK_LOG4CPLUS_INLINE_EXPORT
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 Semaphore::Semaphore (unsigned DCMTK_LOG4CPLUS_THREADED (max),
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 unsigned DCMTK_LOG4CPLUS_THREADED (initial))
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 - : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)) + 0)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 + : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)))
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 { }
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 @@ -148,7 +148,7 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 DCMTK_LOG4CPLUS_INLINE_EXPORT
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 FairMutex::FairMutex ()
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::FairMutex) + 0)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::FairMutex))
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 { }
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 @@ -190,7 +190,7 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 DCMTK_LOG4CPLUS_INLINE_EXPORT
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 ManualResetEvent::ManualResetEvent (bool DCMTK_LOG4CPLUS_THREADED (sig))
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 - : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)) + 0)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 + : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)))
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 { }
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 @@ -252,7 +252,7 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 DCMTK_LOG4CPLUS_INLINE_EXPORT
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 SharedMutex::SharedMutex ()
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 - : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex) + 0)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 + : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex))
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 { }
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87
3722
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
88 diff -urEb dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc dcmtk-3.6.5/oflog/libsrc/oflog.cc
3776
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
89 --- dcmtk-3.6.5.orig/oflog/libsrc/oflog.cc 2020-03-18 10:22:41.547166798 +0100
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
90 +++ dcmtk-3.6.5/oflog/libsrc/oflog.cc 2020-03-18 10:23:09.347082846 +0100
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
91 @@ -19,6 +19,11 @@
3722
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
92 *
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
93 */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
94
3775
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
95 +#if defined(_WIN32)
3776
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
96 +# define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
3722
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
97 +# include <winsock.h>
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
98 +#endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
99 +
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
100 #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
101 #include "dcmtk/oflog/oflog.h"
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
102
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 diff -urEb dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h
3776
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
104 --- dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h 2020-03-18 10:22:41.587166677 +0100
73ef6e33003f fix for msvc 2015 64bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3775
diff changeset
105 +++ dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h 2020-03-18 10:22:53.395131056 +0100
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 @@ -575,7 +575,7 @@
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 */
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 void setlinebuf()
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 {
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 -#if defined(_WIN32) || defined(__hpux)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 this->setvbuf(NULL, _IOLBF, 0);
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 #else
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 :: setlinebuf(file_);