Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/dcmtk-3.6.8.patch @ 5811:a451777236fb attach-custom-data

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
advanced storage: fix + customizable path
author Alain Mazy <am@orthanc.team>
date Tue, 24 Sep 2024 17:52:45 +0200
parents 50910d241dd7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb dcmtk-DCMTK-3.6.8.orig/CMake/GenerateDCMTKConfigure.cmake dcmtk-DCMTK-3.6.8/CMake/GenerateDCMTKConfigure.cmake
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- dcmtk-DCMTK-3.6.8.orig/CMake/GenerateDCMTKConfigure.cmake 2024-01-09 17:13:10.329673608 +0100
5489
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
3 +++ dcmtk-DCMTK-3.6.8/CMake/GenerateDCMTKConfigure.cmake 2024-01-09 18:21:52.568142681 +0100
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -224,6 +224,8 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 # Check the sizes of various types
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 include (CheckTypeSize)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 + # This doesn't work for wasm, Orthanc defines the macros manually
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 CHECK_TYPE_SIZE("char" SIZEOF_CHAR)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 CHECK_TYPE_SIZE("double" SIZEOF_DOUBLE)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 CHECK_TYPE_SIZE("float" SIZEOF_FLOAT)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 @@ -231,6 +233,7 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 CHECK_TYPE_SIZE("long" SIZEOF_LONG)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 CHECK_TYPE_SIZE("short" SIZEOF_SHORT)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 CHECK_TYPE_SIZE("void*" SIZEOF_VOID_P)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 +endif()
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 # Check for include files, libraries, and functions
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 include("${DCMTK_CMAKE_INCLUDE}CMake/dcmtkTryCompile.cmake")
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-DCMTK-3.6.8/dcmdata/include/dcmtk/dcmdata/dcdict.h
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 --- dcmtk-DCMTK-3.6.8.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h 2024-01-09 17:13:10.337673529 +0100
5489
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
23 +++ dcmtk-DCMTK-3.6.8/dcmdata/include/dcmtk/dcmdata/dcdict.h 2024-01-09 18:21:52.568142681 +0100
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 @@ -162,6 +162,12 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 /// returns an iterator to the end of the repeating tag dictionary
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 DcmDictEntryListIterator repeatingEnd() { return repDict.end(); }
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 + // Function by the Orthanc project to load a dictionary from a
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 + // memory buffer, which is necessary in sandboxed
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 + // environments. This is an adapted version of
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 + // DcmDataDictionary::loadDictionary().
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 + OFBool loadFromMemory(const std::string& content, OFBool errorIfAbsent = OFTrue);
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 +
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 private:
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 /** private undefined assignment operator
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmdata/libsrc/dcdict.cc dcmtk-DCMTK-3.6.8/dcmdata/libsrc/dcdict.cc
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 --- dcmtk-DCMTK-3.6.8.orig/dcmdata/libsrc/dcdict.cc 2024-01-09 17:13:10.337673529 +0100
5489
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
39 +++ dcmtk-DCMTK-3.6.8/dcmdata/libsrc/dcdict.cc 2024-01-09 18:21:52.568142681 +0100
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 @@ -914,3 +914,5 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 wrlock().clear();
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 wrunlock();
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 }
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 +
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 +#include "dcdict_orthanc.cc"
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-DCMTK-3.6.8/dcmdata/libsrc/dcpxitem.cc
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 --- dcmtk-DCMTK-3.6.8.orig/dcmdata/libsrc/dcpxitem.cc 2024-01-09 17:13:10.337673529 +0100
5489
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
48 +++ dcmtk-DCMTK-3.6.8/dcmdata/libsrc/dcpxitem.cc 2024-01-09 18:21:52.568142681 +0100
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 @@ -31,6 +31,9 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 +#undef max
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 +#include "dcmtk/ofstd/oflimits.h"
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 +
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 // ********************************
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58
5489
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
59 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmnet/libsrc/scu.cc dcmtk-DCMTK-3.6.8/dcmnet/libsrc/scu.cc
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
60 --- dcmtk-DCMTK-3.6.8.orig/dcmnet/libsrc/scu.cc 2024-01-09 17:13:10.349673411 +0100
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
61 +++ dcmtk-DCMTK-3.6.8/dcmnet/libsrc/scu.cc 2024-01-09 18:23:08.723435667 +0100
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
62 @@ -19,6 +19,11 @@
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
63 *
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
64 */
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
65
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
66 +#if defined(_WIN32)
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
67 +# define __STDC_LIMIT_MACROS // Get access to UINT16_MAX
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
68 +# include <stdint.h>
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
69 +#endif
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
70 +
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
71 #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
72
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
73 #include "dcmtk/dcmdata/dcostrmf.h" /* for class DcmOutputFileStream */
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 diff -urEb dcmtk-DCMTK-3.6.8.orig/oflog/include/dcmtk/oflog/thread/syncpub.h dcmtk-DCMTK-3.6.8/oflog/include/dcmtk/oflog/thread/syncpub.h
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 --- dcmtk-DCMTK-3.6.8.orig/oflog/include/dcmtk/oflog/thread/syncpub.h 2024-01-09 17:13:10.389673016 +0100
5489
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
76 +++ dcmtk-DCMTK-3.6.8/oflog/include/dcmtk/oflog/thread/syncpub.h 2024-01-09 18:21:52.568142681 +0100
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 @@ -63,7 +63,7 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 DCMTK_LOG4CPLUS_INLINE_EXPORT
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 Mutex::Mutex (Mutex::Type t)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 - : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t) + 0))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 + : mtx (DCMTK_LOG4CPLUS_THREADED (new impl::Mutex (t)))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 { }
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 @@ -106,7 +106,7 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 DCMTK_LOG4CPLUS_INLINE_EXPORT
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 Semaphore::Semaphore (unsigned DCMTK_LOG4CPLUS_THREADED (max),
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 unsigned DCMTK_LOG4CPLUS_THREADED (initial))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 - : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial) + 0))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 + : sem (DCMTK_LOG4CPLUS_THREADED (new impl::Semaphore (max, initial)))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 { }
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 @@ -190,7 +190,7 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 DCMTK_LOG4CPLUS_INLINE_EXPORT
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 ManualResetEvent::ManualResetEvent (bool DCMTK_LOG4CPLUS_THREADED (sig))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 - : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig) + 0))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 + : ev (DCMTK_LOG4CPLUS_THREADED (new impl::ManualResetEvent (sig)))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 { }
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 @@ -252,7 +252,7 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 DCMTK_LOG4CPLUS_INLINE_EXPORT
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 SharedMutex::SharedMutex ()
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 - : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex + 0))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 + : sm (DCMTK_LOG4CPLUS_THREADED (new impl::SharedMutex))
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 { }
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 diff -urEb dcmtk-DCMTK-3.6.8.orig/oflog/libsrc/oflog.cc dcmtk-DCMTK-3.6.8/oflog/libsrc/oflog.cc
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 --- dcmtk-DCMTK-3.6.8.orig/oflog/libsrc/oflog.cc 2024-01-09 17:13:10.389673016 +0100
5489
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
115 +++ dcmtk-DCMTK-3.6.8/oflog/libsrc/oflog.cc 2024-01-09 18:21:52.568142681 +0100
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 @@ -19,6 +19,11 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 *
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 */
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 +
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 +#if defined(_WIN32)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 +# include <winsock2.h>
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 +#endif
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 +
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 #include "dcmtk/oflog/oflog.h"
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 diff -urEb dcmtk-DCMTK-3.6.8.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-DCMTK-3.6.8/ofstd/include/dcmtk/ofstd/offile.h
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 --- dcmtk-DCMTK-3.6.8.orig/ofstd/include/dcmtk/ofstd/offile.h 2024-01-09 17:13:10.389673016 +0100
5489
50910d241dd7 fix for mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5487
diff changeset
130 +++ dcmtk-DCMTK-3.6.8/ofstd/include/dcmtk/ofstd/offile.h 2024-01-09 18:21:52.568142681 +0100
5487
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 @@ -570,7 +570,7 @@
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 */
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 void setlinebuf()
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 {
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 -#if defined(_WIN32) || defined(__hpux)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 this->setvbuf(NULL, _IOLBF, 0);
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 #else
33f8e180edcf upgraded static build to dcmtk 3.6.8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 :: setlinebuf(file_);