Mercurial > hg > orthanc
annotate OrthancFramework/Resources/Patches/dcmtk-3.6.6.patch @ 4708:a53a58489cc0 openssl-3.x
integration mainline->openssl-3.x
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 22 Jun 2021 09:29:29 +0200 |
| parents | b6818bbef7b8 |
| children | 1b6b88f017b9 |
| rev | line source |
|---|---|
| 4470 | 1 diff -urEb dcmtk-3.6.6.orig/CMake/GenerateDCMTKConfigure.cmake dcmtk-3.6.6/CMake/GenerateDCMTKConfigure.cmake |
|
4471
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
2 --- dcmtk-3.6.6.orig/CMake/GenerateDCMTKConfigure.cmake 2021-01-26 08:51:48.815071681 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
3 +++ dcmtk-3.6.6/CMake/GenerateDCMTKConfigure.cmake 2021-01-26 08:52:06.331135995 +0100 |
| 4470 | 4 @@ -169,6 +169,8 @@ |
| 5 endif() | |
| 6 | |
| 7 # Check the sizes of various types | |
| 8 +if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten") | |
| 9 + # This doesn't work for wasm, Orthanc defines the macros manually | |
| 10 include (CheckTypeSize) | |
| 11 CHECK_TYPE_SIZE("char" SIZEOF_CHAR) | |
| 12 CHECK_TYPE_SIZE("double" SIZEOF_DOUBLE) | |
| 13 @@ -177,6 +179,7 @@ | |
| 14 CHECK_TYPE_SIZE("long" SIZEOF_LONG) | |
| 15 CHECK_TYPE_SIZE("short" SIZEOF_SHORT) | |
| 16 CHECK_TYPE_SIZE("void*" SIZEOF_VOID_P) | |
| 17 +endif() | |
| 18 | |
| 19 # Check for include files, libraries, and functions | |
| 20 include("${DCMTK_CMAKE_INCLUDE}CMake/dcmtkTryCompile.cmake") | |
| 21 diff -urEb dcmtk-3.6.6.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.6/dcmdata/include/dcmtk/dcmdata/dcdict.h | |
|
4471
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
22 --- dcmtk-3.6.6.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h 2021-01-26 08:51:48.859071844 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
23 +++ dcmtk-3.6.6/dcmdata/include/dcmtk/dcmdata/dcdict.h 2021-01-26 08:52:06.331135995 +0100 |
| 4470 | 24 @@ -152,6 +152,12 @@ |
| 25 /// returns an iterator to the end of the repeating tag dictionary | |
| 26 DcmDictEntryListIterator repeatingEnd() { return repDict.end(); } | |
| 27 | |
| 28 + // Function by the Orthanc project to load a dictionary from a | |
| 29 + // memory buffer, which is necessary in sandboxed | |
| 30 + // environments. This is an adapted version of | |
| 31 + // DcmDataDictionary::loadDictionary(). | |
| 32 + OFBool loadFromMemory(const std::string& content, OFBool errorIfAbsent = OFTrue); | |
| 33 + | |
| 34 private: | |
| 35 | |
| 36 /** private undefined assignment operator | |
|
4471
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
37 diff -urEb dcmtk-3.6.6.orig/dcmdata/libsrc/dcdicdir.cc dcmtk-3.6.6/dcmdata/libsrc/dcdicdir.cc |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
38 --- dcmtk-3.6.6.orig/dcmdata/libsrc/dcdicdir.cc 2021-01-26 08:51:48.863071859 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
39 +++ dcmtk-3.6.6/dcmdata/libsrc/dcdicdir.cc 2021-01-26 08:56:03.519887982 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
40 @@ -1032,7 +1032,14 @@ |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
41 // insert Media Stored SOP Class UID |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
42 insertMediaSOPUID(metainfo); |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
43 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
44 - getDirFileFormat().validateMetaInfo(outxfer); |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
45 + /** |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
46 + * Patch for Orthanc: In DCMTK 3.6.6, the default value for the |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
47 + * second argument changed from "EWM_fileformat" to |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
48 + * "EWM_createNewMeta". This sets "MediaStorageSOPClassUID" |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
49 + * (0002,0002) in meta-header to "1.2.276.0.7230010.3.1.0.1" |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
50 + * instead of expected "1.2.840.10008.1.3.10". |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
51 + **/ |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
52 + getDirFileFormat().validateMetaInfo(outxfer, EWM_fileformat); |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
53 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
54 { |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
55 // it is important that the cache object is destroyed before the file is renamed! |
| 4470 | 56 diff -urEb dcmtk-3.6.6.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.6/dcmdata/libsrc/dcdict.cc |
|
4471
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
57 --- dcmtk-3.6.6.orig/dcmdata/libsrc/dcdict.cc 2021-01-26 08:51:48.863071859 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
58 +++ dcmtk-3.6.6/dcmdata/libsrc/dcdict.cc 2021-01-26 08:52:06.331135995 +0100 |
| 4470 | 59 @@ -900,3 +900,6 @@ |
| 60 wrlock().clear(); | |
| 61 wrunlock(); | |
| 62 } | |
| 63 + | |
| 64 + | |
| 65 +#include "dcdict_orthanc.cc" | |
| 66 diff -urEb dcmtk-3.6.6.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.6/dcmdata/libsrc/dcpxitem.cc | |
|
4471
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
67 --- dcmtk-3.6.6.orig/dcmdata/libsrc/dcpxitem.cc 2021-01-26 08:51:48.863071859 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
68 +++ dcmtk-3.6.6/dcmdata/libsrc/dcpxitem.cc 2021-01-26 08:52:06.335136010 +0100 |
| 4470 | 69 @@ -36,6 +36,9 @@ |
| 70 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */ | |
| 71 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */ | |
| 72 | |
| 73 +#undef max | |
| 74 +#include "dcmtk/ofstd/oflimits.h" | |
| 75 + | |
| 76 | |
| 77 // ******************************** | |
| 78 | |
| 79 diff -urEb dcmtk-3.6.6.orig/oflog/include/dcmtk/oflog/thread/syncpub.h dcmtk-3.6.6/oflog/include/dcmtk/oflog/thread/syncpub.h | |
|
4471
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
80 --- dcmtk-3.6.6.orig/oflog/include/dcmtk/oflog/thread/syncpub.h 2021-01-26 08:51:48.847071800 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
81 +++ dcmtk-3.6.6/oflog/include/dcmtk/oflog/thread/syncpub.h 2021-01-26 08:52:06.335136010 +0100 |
| 4470 | 82 @@ -63,7 +63,7 @@ |
| 83 | |
| 84 DCMTK_LOG4CPLUS_INLINE_EXPORT | |
| 85 Mutex::Mutex (Mutex::Type t) | |
| 86 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)) + 0) | |
| 87 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t))) | |
| 88 { } | |
| 89 | |
| 90 | |
| 91 @@ -106,7 +106,7 @@ | |
| 92 DCMTK_LOG4CPLUS_INLINE_EXPORT | |
| 93 Semaphore::Semaphore (unsigned DCMTK_LOG4CPLUS_THREADED (max), | |
| 94 unsigned DCMTK_LOG4CPLUS_THREADED (initial)) | |
| 95 - : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)) + 0) | |
| 96 + : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial))) | |
| 97 { } | |
| 98 | |
| 99 | |
| 100 @@ -148,7 +148,7 @@ | |
| 101 | |
| 102 DCMTK_LOG4CPLUS_INLINE_EXPORT | |
| 103 FairMutex::FairMutex () | |
| 104 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::FairMutex) + 0) | |
| 105 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::FairMutex)) | |
| 106 { } | |
| 107 | |
| 108 | |
| 109 @@ -190,7 +190,7 @@ | |
| 110 | |
| 111 DCMTK_LOG4CPLUS_INLINE_EXPORT | |
| 112 ManualResetEvent::ManualResetEvent (bool DCMTK_LOG4CPLUS_THREADED (sig)) | |
| 113 - : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)) + 0) | |
| 114 + : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig))) | |
| 115 { } | |
| 116 | |
| 117 | |
| 118 @@ -252,7 +252,7 @@ | |
| 119 | |
| 120 DCMTK_LOG4CPLUS_INLINE_EXPORT | |
| 121 SharedMutex::SharedMutex () | |
| 122 - : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex) + 0) | |
| 123 + : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex)) | |
| 124 { } | |
| 125 | |
| 126 | |
| 127 diff -urEb dcmtk-3.6.6.orig/oflog/libsrc/oflog.cc dcmtk-3.6.6/oflog/libsrc/oflog.cc | |
|
4471
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
128 --- dcmtk-3.6.6.orig/oflog/libsrc/oflog.cc 2021-01-26 08:51:48.847071800 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
129 +++ dcmtk-3.6.6/oflog/libsrc/oflog.cc 2021-01-26 08:52:06.335136010 +0100 |
| 4470 | 130 @@ -19,6 +19,10 @@ |
| 131 * | |
| 132 */ | |
| 133 | |
| 134 +#if defined(_WIN32) | |
| 135 +# include <winsock2.h> | |
| 136 +#endif | |
| 137 + | |
| 138 #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ | |
| 139 #include "dcmtk/oflog/oflog.h" | |
| 140 | |
| 141 diff -urEb dcmtk-3.6.6.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.6/ofstd/include/dcmtk/ofstd/offile.h | |
|
4471
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
142 --- dcmtk-3.6.6.orig/ofstd/include/dcmtk/ofstd/offile.h 2021-01-26 08:51:48.863071859 +0100 |
|
b6818bbef7b8
patch of DCMTK 3.6.6 to fix value of "MediaStorageSOPClassUID" if writing DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4470
diff
changeset
|
143 +++ dcmtk-3.6.6/ofstd/include/dcmtk/ofstd/offile.h 2021-01-26 08:52:06.335136010 +0100 |
| 4470 | 144 @@ -586,7 +586,7 @@ |
| 145 */ | |
| 146 void setlinebuf() | |
| 147 { | |
| 148 -#if defined(_WIN32) || defined(__hpux) | |
| 149 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__) | |
| 150 this->setvbuf(NULL, _IOLBF, 0); | |
| 151 #else | |
| 152 :: setlinebuf(file_); |