Mercurial > hg > orthanc
view Resources/Patches/dcmtk-3.6.0-speed.patch @ 2271:fc260803b5df
Merged in Barnerd/orthanc-1/Barnerd/fix-build-with-libressl-libressl-comp-1488028354841 (pull request #5)
Fix build with LibreSSL
| author | Sébastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 28 Feb 2017 08:28:37 +0000 |
| parents | 01de36d949c3 |
| children | bfcf5a7f92e7 |
line wrap: on
line source
diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.0/dcmnet/libsrc/dul.cc --- dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc 2016-04-05 14:30:18.254459281 +0200 +++ dcmtk-3.6.0/dcmnet/libsrc/dul.cc 2016-04-05 14:32:07.246463713 +0200 @@ -1770,7 +1770,7 @@ // send number of socket handle in child process over anonymous pipe DWORD bytesWritten; char buf[20]; - sprintf(buf, "%i", OFreinterpret_cast(int, childSocketHandle)); + sprintf(buf, "%i", OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle))); if (!WriteFile(hChildStdInWriteDup, buf, strlen(buf) + 1, &bytesWritten, NULL)) { CloseHandle(hChildStdInWriteDup); @@ -1780,7 +1780,7 @@ // return OF_ok status code DULC_FORKEDCHILD with descriptive text OFOStringStream stream; stream << "New child process started with pid " << OFstatic_cast(int, pi.dwProcessId) - << ", socketHandle " << OFreinterpret_cast(int, childSocketHandle) << OFStringStream_ends; + << ", socketHandle " << OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle)) << OFStringStream_ends; OFSTRINGSTREAM_GETOFSTRING(stream, msg) return makeDcmnetCondition(DULC_FORKEDCHILD, OF_ok, msg.c_str()); } @@ -1840,7 +1840,7 @@ } #endif #endif - setTCPBufferLength(sock); + //setTCPBufferLength(sock); #ifndef DONT_DISABLE_NAGLE_ALGORITHM /* Only in dcmtk-3.6.0/dcmnet/libsrc: dul.cc~ diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc --- dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc 2016-04-05 14:30:18.250459281 +0200 +++ dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc 2016-04-05 14:32:20.566464254 +0200 @@ -2417,7 +2417,7 @@ return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); } #endif - setTCPBufferLength(s); + //setTCPBufferLength(s); #ifndef DONT_DISABLE_NAGLE_ALGORITHM /* Only in dcmtk-3.6.0/dcmnet/libsrc: dulfsm.cc~