Mercurial > hg > orthanc

annotate Resources/Patches/dcmtk-3.6.4.patch @ 3493:c465c6ee2bfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 19 Aug 2019 10:18:04 +0200
parents ea54109a7312
children 0301f59450fe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3280
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc 2019-02-21 15:30:21.657110805 +0100
3281
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
3 +++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2019-02-21 16:28:43.721049550 +0100
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
4 @@ -36,6 +36,9 @@
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
5 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
6 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */
3280
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7
3281
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
8 +#undef max
3280
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +#include "dcmtk/ofstd/oflimits.h"
3281
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
10 +
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
11
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
12 // ********************************
ea54109a7312 upgrade to GoogleTest 1.8.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
13
3280
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:21.645110805 +0100
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:48.273110339 +0100
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 @@ -575,7 +575,7 @@
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 */
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 void setlinebuf()
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 {
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 -#if defined(_WIN32) || defined(__hpux)
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 this->setvbuf(NULL, _IOLBF, 0);
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #else
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 :: setlinebuf(file_);
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 Only in dcmtk-3.6.4/ofstd/include/dcmtk/ofstd: offile.h~