Mercurial > hg > orthanc
annotate Resources/Patches/dcmtk-3.6.2.patch @ 3814:023b2a9f3aa1 transcoding
new enum: StoreInstanceMode
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 07 Apr 2020 17:35:44 +0200 |
parents | 0301f59450fe |
children |
rev | line source |
---|---|
2500
3b802ac81a27
dcmtk-3.6.2-cmath.patch
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 diff -urEb dcmtk-3.6.2.orig/CMake/GenerateDCMTKConfigure.cmake dcmtk-3.6.2/CMake/GenerateDCMTKConfigure.cmake |
3593
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
2 --- dcmtk-3.6.2.orig/CMake/GenerateDCMTKConfigure.cmake 2020-01-06 17:42:52.299540389 +0100 |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
3 +++ dcmtk-3.6.2/CMake/GenerateDCMTKConfigure.cmake 2020-01-06 17:43:56.707520036 +0100 |
2829 | 4 @@ -568,12 +568,12 @@ |
2806
4fdb25c5df9c
Fix issue #98 (DCMTK configuration fails with GCC 6.4.0 on Alpine)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2500
diff
changeset
|
5 ENDIF(HAVE_CSTDDEF) |
4fdb25c5df9c
Fix issue #98 (DCMTK configuration fails with GCC 6.4.0 on Alpine)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2500
diff
changeset
|
6 |
4fdb25c5df9c
Fix issue #98 (DCMTK configuration fails with GCC 6.4.0 on Alpine)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2500
diff
changeset
|
7 CHECK_FUNCTIONWITHHEADER_EXISTS(feenableexcept "${HEADERS}" HAVE_PROTOTYPE_FEENABLEEXCEPT) |
4fdb25c5df9c
Fix issue #98 (DCMTK configuration fails with GCC 6.4.0 on Alpine)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2500
diff
changeset
|
8 - CHECK_FUNCTIONWITHHEADER_EXISTS(isinf "${HEADERS}" HAVE_PROTOTYPE_ISINF) |
4fdb25c5df9c
Fix issue #98 (DCMTK configuration fails with GCC 6.4.0 on Alpine)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2500
diff
changeset
|
9 - CHECK_FUNCTIONWITHHEADER_EXISTS(isnan "${HEADERS}" HAVE_PROTOTYPE_ISNAN) |
2829 | 10 - CHECK_FUNCTIONWITHHEADER_EXISTS(finite "${HEADERS}" HAVE_PROTOTYPE_FINITE) |
2500
3b802ac81a27
dcmtk-3.6.2-cmath.patch
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 - CHECK_FUNCTIONWITHHEADER_EXISTS(std::isinf "${HEADERS}" HAVE_PROTOTYPE_STD__ISINF) |
3b802ac81a27
dcmtk-3.6.2-cmath.patch
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 - CHECK_FUNCTIONWITHHEADER_EXISTS(std::isnan "${HEADERS}" HAVE_PROTOTYPE_STD__ISNAN) |
2829 | 13 - CHECK_FUNCTIONWITHHEADER_EXISTS(std::finite "${HEADERS}" HAVE_PROTOTYPE_STD__FINITE) |
14 + CHECK_FUNCTIONWITHHEADER_EXISTS("isinf(0.)" "${HEADERS}" HAVE_PROTOTYPE_ISINF) | |
15 + CHECK_FUNCTIONWITHHEADER_EXISTS("isnan(0.)" "${HEADERS}" HAVE_PROTOTYPE_ISNAN) | |
16 + CHECK_FUNCTIONWITHHEADER_EXISTS("finite(0.)" "${HEADERS}" HAVE_PROTOTYPE_FINITE) | |
2806
4fdb25c5df9c
Fix issue #98 (DCMTK configuration fails with GCC 6.4.0 on Alpine)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2500
diff
changeset
|
17 + CHECK_FUNCTIONWITHHEADER_EXISTS("std::isinf(0.)" "${HEADERS}" HAVE_PROTOTYPE_STD__ISINF) |
4fdb25c5df9c
Fix issue #98 (DCMTK configuration fails with GCC 6.4.0 on Alpine)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2500
diff
changeset
|
18 + CHECK_FUNCTIONWITHHEADER_EXISTS("std::isnan(0.)" "${HEADERS}" HAVE_PROTOTYPE_STD__ISNAN) |
2829 | 19 + CHECK_FUNCTIONWITHHEADER_EXISTS("std::finite(0.)" "${HEADERS}" HAVE_PROTOTYPE_STD__FINITE) |
2500
3b802ac81a27
dcmtk-3.6.2-cmath.patch
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 CHECK_FUNCTIONWITHHEADER_EXISTS(flock "${HEADERS}" HAVE_PROTOTYPE_FLOCK) |
3b802ac81a27
dcmtk-3.6.2-cmath.patch
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 CHECK_FUNCTIONWITHHEADER_EXISTS(gethostbyname "${HEADERS}" HAVE_PROTOTYPE_GETHOSTBYNAME) |
2829 | 22 CHECK_FUNCTIONWITHHEADER_EXISTS(gethostbyname_r "${HEADERS}" HAVE_PROTOTYPE_GETHOSTBYNAME_R) |
3593
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
23 diff -urEb dcmtk-3.6.2.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.2/dcmdata/include/dcmtk/dcmdata/dcdict.h |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
24 --- dcmtk-3.6.2.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-01-06 17:42:52.283540394 +0100 |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
25 +++ dcmtk-3.6.2/dcmdata/include/dcmtk/dcmdata/dcdict.h 2020-01-06 17:46:21.711473976 +0100 |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
26 @@ -152,6 +152,12 @@ |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
27 /// returns an iterator to the end of the repeating tag dictionary |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
28 DcmDictEntryListIterator repeatingEnd() { return repDict.end(); } |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
29 |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
30 + // Function by the Orthanc project to load a dictionary from a |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
31 + // memory buffer, which is necessary in sandboxed |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
32 + // environments. This is an adapted version of |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
33 + // DcmDataDictionary::loadDictionary(). |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
34 + OFBool loadFromMemory(const std::string& content, OFBool errorIfAbsent = OFTrue); |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
35 + |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
36 private: |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
37 |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
38 /** private undefined assignment operator |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
39 diff -urEb dcmtk-3.6.2.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.2/dcmdata/libsrc/dcdict.cc |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
40 --- dcmtk-3.6.2.orig/dcmdata/libsrc/dcdict.cc 2020-01-06 17:42:52.287540392 +0100 |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
41 +++ dcmtk-3.6.2/dcmdata/libsrc/dcdict.cc 2020-01-06 17:47:18.335299472 +0100 |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
42 @@ -876,3 +876,6 @@ |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
43 wrlock().clear(); |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
44 unlock(); |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
45 } |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
46 + |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
47 + |
0301f59450fe
improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2829
diff
changeset
|
48 +#include "dcdict_orthanc.cc" |