Mercurial > hg > orthanc

comparison Resources/Patches/dcmtk-3.6.4.patch @ 3598:f2df51bff2fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 06 Jan 2020 19:57:11 +0100
parents 0301f59450fe
children
comparison
equal deleted inserted replaced
3597:e1904cfdca2c 3598:f2df51bff2fd
1 diff -urEb dcmtk-3.6.4.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.4/dcmdata/include/dcmtk/dcmdata/dcdict.h 1 diff -urEb dcmtk-3.6.4.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.4/dcmdata/include/dcmtk/dcmdata/dcdict.h
2 --- dcmtk-3.6.4.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-01-06 17:38:11.323628123 +0100 2 --- dcmtk-3.6.4.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-01-06 19:55:12.887153062 +0100
3 +++ dcmtk-3.6.4/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-01-06 17:39:29.519603910 +0100 3 +++ dcmtk-3.6.4/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-01-06 19:55:28.156447233 +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.4.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.4/dcmdata/libsrc/dcdict.cc 17 diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.4/dcmdata/libsrc/dcdict.cc
18 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcdict.cc 2020-01-06 17:38:11.327628121 +0100 18 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcdict.cc 2020-01-06 19:55:12.899154075 +0100
19 +++ dcmtk-3.6.4/dcmdata/libsrc/dcdict.cc 2020-01-06 17:39:58.927594760 +0100 19 +++ dcmtk-3.6.4/dcmdata/libsrc/dcdict.cc 2020-01-06 19:55:28.156447233 +0100
20 @@ -899,3 +899,6 @@ 20 @@ -899,3 +899,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.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 27 diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc
28 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc 2020-01-06 17:38:11.327628121 +0100 28 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc 2020-01-06 19:55:12.899154075 +0100
29 +++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2020-01-06 17:38:14.195627236 +0100 29 +++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2020-01-06 19:55:28.156447233 +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
35 +#include "dcmtk/ofstd/oflimits.h" 35 +#include "dcmtk/ofstd/oflimits.h"
36 + 36 +
37 37
38 // ******************************** 38 // ********************************
39 39
40 diff -urEb dcmtk-3.6.4.orig/oflog/include/dcmtk/oflog/thread/syncpub.h dcmtk-3.6.4/oflog/include/dcmtk/oflog/thread/syncpub.h
41 --- dcmtk-3.6.4.orig/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-01-06 19:55:12.911155088 +0100
42 +++ dcmtk-3.6.4/oflog/include/dcmtk/oflog/thread/syncpub.h 2020-01-06 19:56:26.991372656 +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
40 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 88 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h
41 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2020-01-06 17:38:11.371628108 +0100 89 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2020-01-06 19:55:12.951158464 +0100
42 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2020-01-06 17:38:14.195627236 +0100 90 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2020-01-06 19:55:28.156447233 +0100
43 @@ -575,7 +575,7 @@ 91 @@ -575,7 +575,7 @@
44 */ 92 */
45 void setlinebuf() 93 void setlinebuf()
46 { 94 {
47 -#if defined(_WIN32) || defined(__hpux) 95 -#if defined(_WIN32) || defined(__hpux)