Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/dcmtk-3.6.6.patch @ 5219:802e2e3d9bfc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration db-protobuf->mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 03 Apr 2023 17:00:51 +0200
parents 1b6b88f017b9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4470
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -169,6 +169,8 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 endif()
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 # Check the sizes of various types
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 + # This doesn't work for wasm, Orthanc defines the macros manually
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 include (CheckTypeSize)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 CHECK_TYPE_SIZE("char" SIZEOF_CHAR)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 CHECK_TYPE_SIZE("double" SIZEOF_DOUBLE)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 @@ -177,6 +179,7 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 CHECK_TYPE_SIZE("long" SIZEOF_LONG)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 CHECK_TYPE_SIZE("short" SIZEOF_SHORT)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 CHECK_TYPE_SIZE("void*" SIZEOF_VOID_P)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 +endif()
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 # Check for include files, libraries, and functions
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 include("${DCMTK_CMAKE_INCLUDE}CMake/dcmtkTryCompile.cmake")
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 @@ -152,6 +152,12 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 /// returns an iterator to the end of the repeating tag dictionary
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 DcmDictEntryListIterator repeatingEnd() { return repDict.end(); }
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 + // Function by the Orthanc project to load a dictionary from a
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 + // memory buffer, which is necessary in sandboxed
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 + // environments. This is an adapted version of
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 + // DcmDataDictionary::loadDictionary().
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 + OFBool loadFromMemory(const std::string& content, OFBool errorIfAbsent = OFTrue);
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 +
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 private:
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 @@ -900,3 +900,6 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 wrlock().clear();
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 wrunlock();
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 }
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 +
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 +
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 +#include "dcdict_orthanc.cc"
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 @@ -36,6 +36,9 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 +#undef max
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 +#include "dcmtk/ofstd/oflimits.h"
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 +
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 // ********************************
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 @@ -63,7 +63,7 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 DCMTK_LOG4CPLUS_INLINE_EXPORT
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 Mutex::Mutex (Mutex::Type t)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)) + 0)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)))
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 { }
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 @@ -106,7 +106,7 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 DCMTK_LOG4CPLUS_INLINE_EXPORT
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 Semaphore::Semaphore (unsigned DCMTK_LOG4CPLUS_THREADED (max),
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 unsigned DCMTK_LOG4CPLUS_THREADED (initial))
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 - : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)) + 0)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 + : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)))
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 { }
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 @@ -148,7 +148,7 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 DCMTK_LOG4CPLUS_INLINE_EXPORT
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 FairMutex::FairMutex ()
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::FairMutex) + 0)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::FairMutex))
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 { }
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 @@ -190,7 +190,7 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 DCMTK_LOG4CPLUS_INLINE_EXPORT
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 ManualResetEvent::ManualResetEvent (bool DCMTK_LOG4CPLUS_THREADED (sig))
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 - : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)) + 0)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 + : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)))
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 { }
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 @@ -252,7 +252,7 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 DCMTK_LOG4CPLUS_INLINE_EXPORT
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 SharedMutex::SharedMutex ()
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 - : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex) + 0)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 + : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex))
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 { }
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 @@ -19,6 +19,10 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 *
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 */
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 +#if defined(_WIN32)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 +# include <winsock2.h>
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 +#endif
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 +
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 #include "dcmtk/oflog/oflog.h"
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 @@ -586,7 +586,7 @@
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 */
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 void setlinebuf()
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 {
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 -#if defined(_WIN32) || defined(__hpux)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 this->setvbuf(NULL, _IOLBF, 0);
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 #else
06d164d8a0fd upgrade to dcmtk 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 :: setlinebuf(file_);
4968
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
153
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
154 diff -urEb dcmtk-3.6.6.orig/config/tests/arith.cc dcmtk-3.6.6/config/tests/arith.cc
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
155 --- dcmtk-3.6.6.orig/config/tests/arith.cc 2022-03-28 19:17:03.000000000 +0000
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
156 +++ dcmtk-3.6.6/config/tests/arith.cc 2022-03-28 19:18:12.000000000 +0000
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
157 @@ -40,7 +40,7 @@
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
158 #include <ieeefp.h>
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
159 #endif
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
160
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
161 -#ifdef __APPLE__
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
162 +#if defined(__APPLE__) && !defined(__aarch64__)
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
163 // For controlling floating point exceptions on OS X.
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
164 #include <xmmintrin.h>
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
165 #endif
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
166 @@ -340,7 +340,7 @@
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
167 #ifdef HAVE_WINDOWS_H
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
168 _clearfp();
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
169 _controlfp( _controlfp(0,0) & ~_EM_INVALID, _MCW_EM );
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
170 -#elif defined(__APPLE__)
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
171 +#elif defined(__APPLE__) && !defined(__aarch64__)
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
172 _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() & ~_MM_MASK_INVALID );
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
173 #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT)
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
174 feenableexcept( FE_INVALID );
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
175 @@ -382,7 +382,7 @@
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
176 _controlfp( _controlfp(0,0) | _EM_INVALID, _MCW_EM );
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
177 #elif defined(HAVE_FENV_H)
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
178 feclearexcept( FE_INVALID );
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
179 -#ifdef __APPLE__
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
180 +#if defined(__APPLE__) && !defined(__aarch64__)
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
181 _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() | _MM_MASK_INVALID );
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
182 #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT)
1b6b88f017b9 try to fix dcmtk build for Apple M1
Alain Mazy <am@osimis.io>
parents: 4471
diff changeset
183 fedisableexcept( FE_INVALID );