Mercurial > hg > orthanc

comparison Resources/Patches/dcmtk-3.6.5.patch @ 3731:e7ff4f9b34bd storage-commitment

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->storage-commitment
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Mar 2020 17:19:45 +0100
parents a49d49d945c9
children 374e0c6c41d6
comparison
equal deleted inserted replaced
3718:922c56b76edc 3731:e7ff4f9b34bd
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
3 +++ dcmtk-3.6.5/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-03-05 19:43:41.198312828 +0100
4 @@ -152,6 +152,12 @@
5 /// returns an iterator to the end of the repeating tag dictionary
6 DcmDictEntryListIterator repeatingEnd() { return repDict.end(); }
7
8 + // Function by the Orthanc project to load a dictionary from a
9 + // memory buffer, which is necessary in sandboxed
10 + // environments. This is an adapted version of
11 + // DcmDataDictionary::loadDictionary().
12 + OFBool loadFromMemory(const std::string& content, OFBool errorIfAbsent = OFTrue);
13 +
14 private:
15
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
18 --- dcmtk-3.6.5.orig/dcmdata/libsrc/dcdict.cc 2020-03-05 19:43:37.682302828 +0100
19 +++ dcmtk-3.6.5/dcmdata/libsrc/dcdict.cc 2020-03-05 19:43:41.198312828 +0100
20 @@ -900,3 +900,6 @@
21 wrlock().clear();
22 wrunlock();
23 }
24 +
25 +
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
28 --- dcmtk-3.6.5.orig/dcmdata/libsrc/dcpxitem.cc 2020-03-05 19:43:37.682302828 +0100
29 +++ dcmtk-3.6.5/dcmdata/libsrc/dcpxitem.cc 2020-03-05 19:43:41.198312828 +0100
30 @@ -36,6 +36,9 @@
31 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */
32 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */
33
34 +#undef max
35 +#include "dcmtk/ofstd/oflimits.h"
36 +
37
38 // ********************************
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
41 --- dcmtk-3.6.5.orig/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-03-05 19:43:37.686302839 +0100
42 +++ dcmtk-3.6.5/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-03-05 19:43:41.198312828 +0100
43 @@ -63,7 +63,7 @@
44
45 DCMTK_LOG4CPLUS_INLINE_EXPORT
46 Mutex::Mutex (Mutex::Type t)
47 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)) + 0)
48 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)))
49 { }
50
51
52 @@ -106,7 +106,7 @@
53 DCMTK_LOG4CPLUS_INLINE_EXPORT
54 Semaphore::Semaphore (unsigned DCMTK_LOG4CPLUS_THREADED (max),
55 unsigned DCMTK_LOG4CPLUS_THREADED (initial))
56 - : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)) + 0)
57 + : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)))
58 { }
59
60
61 @@ -148,7 +148,7 @@
62
63 DCMTK_LOG4CPLUS_INLINE_EXPORT
64 FairMutex::FairMutex ()
65 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::FairMutex) + 0)
66 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::FairMutex))
67 { }
68
69
70 @@ -190,7 +190,7 @@
71
72 DCMTK_LOG4CPLUS_INLINE_EXPORT
73 ManualResetEvent::ManualResetEvent (bool DCMTK_LOG4CPLUS_THREADED (sig))
74 - : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)) + 0)
75 + : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)))
76 { }
77
78
79 @@ -252,7 +252,7 @@
80
81 DCMTK_LOG4CPLUS_INLINE_EXPORT
82 SharedMutex::SharedMutex ()
83 - : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex) + 0)
84 + : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex))
85 { }
86
87
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
90 +++ dcmtk-3.6.5/oflog/libsrc/oflog.cc 2020-03-05 19:43:54.622350144 +0100
91 @@ -19,6 +19,10 @@
92 *
93 */
94
95 +#ifdef __MINGW32__
96 +# include <winsock.h>
97 +#endif
98 +
99 #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
100 #include "dcmtk/oflog/oflog.h"
101
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 --- dcmtk-3.6.5.orig/ofstd/include/dcmtk/ofstd/offile.h 2020-03-05 19:43:37.714302919 +0100
104 +++ dcmtk-3.6.5/ofstd/include/dcmtk/ofstd/offile.h 2020-03-05 19:43:41.198312828 +0100
105 @@ -575,7 +575,7 @@
106 */
107 void setlinebuf()
108 {
109 -#if defined(_WIN32) || defined(__hpux)
110 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
111 this->setvbuf(NULL, _IOLBF, 0);
112 #else
113 :: setlinebuf(file_);