Mercurial > hg > orthanc

comparison Resources/Patches/dcmtk-3.6.4.patch @ 3281:ea54109a7312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to GoogleTest 1.8.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 16:30:23 +0100
parents fddf3ceed7e5
children 0301f59450fe
comparison
equal deleted inserted replaced
3280:fddf3ceed7e5 3281:ea54109a7312
1 diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 1 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 2 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc 2019-02-21 15:30:21.657110805 +0100
3 +++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2019-02-21 15:41:01.565099612 +0100 3 +++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2019-02-21 16:28:43.721049550 +0100
4 @@ -28,6 +28,7 @@ 4 @@ -36,6 +36,9 @@
5 #include "dcmtk/ofstd/ofstdinc.h" 5 #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */
6 #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */
6 7
7 #include "dcmtk/ofstd/ofstream.h" 8 +#undef max
8 +#include "dcmtk/ofstd/oflimits.h" 9 +#include "dcmtk/ofstd/oflimits.h"
9 #include "dcmtk/dcmdata/dcpxitem.h" 10 +
10 #include "dcmtk/dcmdata/dcswap.h" 11
11 #include "dcmtk/ofstd/ofstring.h" 12 // ********************************
13
12 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 14 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h
13 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:21.645110805 +0100 15 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:21.645110805 +0100
14 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:48.273110339 +0100 16 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:48.273110339 +0100
15 @@ -575,7 +575,7 @@ 17 @@ -575,7 +575,7 @@
16 */ 18 */