Mercurial > hg > orthanc
comparison Resources/Patches/dcmtk-3.6.4.patch @ 3593:0301f59450fe
improved the patch for loading DICOM dictionary from memory
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 06 Jan 2020 17:58:15 +0100 |
parents | ea54109a7312 |
children | f2df51bff2fd |
comparison
equal
deleted
inserted
replaced
3592:de1665e7b341 | 3593:0301f59450fe |
---|---|
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 | |
3 +++ dcmtk-3.6.4/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-01-06 17:39:29.519603910 +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.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 | |
19 +++ dcmtk-3.6.4/dcmdata/libsrc/dcdict.cc 2020-01-06 17:39:58.927594760 +0100 | |
20 @@ -899,3 +899,6 @@ | |
21 wrlock().clear(); | |
22 wrunlock(); | |
23 } | |
24 + | |
25 + | |
26 +#include "dcdict_orthanc.cc" | |
1 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 |
2 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc 2019-02-21 15:30:21.657110805 +0100 | 28 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc 2020-01-06 17:38:11.327628121 +0100 |
3 +++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2019-02-21 16:28:43.721049550 +0100 | 29 +++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2020-01-06 17:38:14.195627236 +0100 |
4 @@ -36,6 +36,9 @@ | 30 @@ -36,6 +36,9 @@ |
5 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */ | 31 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */ |
6 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */ | 32 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */ |
7 | 33 |
8 +#undef max | 34 +#undef max |
10 + | 36 + |
11 | 37 |
12 // ******************************** | 38 // ******************************** |
13 | 39 |
14 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h | 40 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h |
15 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:21.645110805 +0100 | 41 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2020-01-06 17:38:11.371628108 +0100 |
16 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:48.273110339 +0100 | 42 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2020-01-06 17:38:14.195627236 +0100 |
17 @@ -575,7 +575,7 @@ | 43 @@ -575,7 +575,7 @@ |
18 */ | 44 */ |
19 void setlinebuf() | 45 void setlinebuf() |
20 { | 46 { |
21 -#if defined(_WIN32) || defined(__hpux) | 47 -#if defined(_WIN32) || defined(__hpux) |
22 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__) | 48 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__) |
23 this->setvbuf(NULL, _IOLBF, 0); | 49 this->setvbuf(NULL, _IOLBF, 0); |
24 #else | 50 #else |
25 :: setlinebuf(file_); | 51 :: setlinebuf(file_); |
26 Only in dcmtk-3.6.4/ofstd/include/dcmtk/ofstd: offile.h~ |