Mercurial > hg > orthanc
diff Resources/Patches/dcmtk-3.6.4.patch @ 3281:ea54109a7312
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 |
line wrap: on
line diff
--- a/Resources/Patches/dcmtk-3.6.4.patch Thu Feb 21 15:46:13 2019 +0100 +++ b/Resources/Patches/dcmtk-3.6.4.patch Thu Feb 21 16:30:23 2019 +0100 @@ -1,14 +1,16 @@ diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc 2019-02-21 15:30:21.657110805 +0100 -+++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2019-02-21 15:41:01.565099612 +0100 -@@ -28,6 +28,7 @@ - #include "dcmtk/ofstd/ofstdinc.h" ++++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2019-02-21 16:28:43.721049550 +0100 +@@ -36,6 +36,9 @@ + #include "dcmtk/dcmdata/dcostrma.h" /* for class DcmOutputStream */ + #include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */ - #include "dcmtk/ofstd/ofstream.h" ++#undef max +#include "dcmtk/ofstd/oflimits.h" - #include "dcmtk/dcmdata/dcpxitem.h" - #include "dcmtk/dcmdata/dcswap.h" - #include "dcmtk/ofstd/ofstring.h" ++ + + // ******************************** + diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:21.645110805 +0100 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:48.273110339 +0100