Mercurial > hg > orthanc

comparison Resources/Patches/dcmtk-3.6.0-speed.patch @ 1951:01de36d949c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 05 Apr 2016 14:45:55 +0200
parents Resources/Patches/dcmtk-linux-speed.patch@bf6db7d2f8b1
children bfcf5a7f92e7
comparison
equal deleted inserted replaced
1950:533ff46e944b 1951:01de36d949c3
1 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.0/dcmnet/libsrc/dul.cc
2 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc 2016-04-05 14:30:18.254459281 +0200
3 +++ dcmtk-3.6.0/dcmnet/libsrc/dul.cc 2016-04-05 14:32:07.246463713 +0200
4 @@ -1770,7 +1770,7 @@
5 // send number of socket handle in child process over anonymous pipe
6 DWORD bytesWritten;
7 char buf[20];
8 - sprintf(buf, "%i", OFreinterpret_cast(int, childSocketHandle));
9 + sprintf(buf, "%i", OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle)));
10 if (!WriteFile(hChildStdInWriteDup, buf, strlen(buf) + 1, &bytesWritten, NULL))
11 {
12 CloseHandle(hChildStdInWriteDup);
13 @@ -1780,7 +1780,7 @@
14 // return OF_ok status code DULC_FORKEDCHILD with descriptive text
15 OFOStringStream stream;
16 stream << "New child process started with pid " << OFstatic_cast(int, pi.dwProcessId)
17 - << ", socketHandle " << OFreinterpret_cast(int, childSocketHandle) << OFStringStream_ends;
18 + << ", socketHandle " << OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle)) << OFStringStream_ends;
19 OFSTRINGSTREAM_GETOFSTRING(stream, msg)
20 return makeDcmnetCondition(DULC_FORKEDCHILD, OF_ok, msg.c_str());
21 }
22 @@ -1840,7 +1840,7 @@
23 }
24 #endif
25 #endif
26 - setTCPBufferLength(sock);
27 + //setTCPBufferLength(sock);
28
29 #ifndef DONT_DISABLE_NAGLE_ALGORITHM
30 /*
31 Only in dcmtk-3.6.0/dcmnet/libsrc: dul.cc~
32 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc
33 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc 2016-04-05 14:30:18.250459281 +0200
34 +++ dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc 2016-04-05 14:32:20.566464254 +0200
35 @@ -2417,7 +2417,7 @@
36 return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
37 }
38 #endif
39 - setTCPBufferLength(s);
40 + //setTCPBufferLength(s);
41
42 #ifndef DONT_DISABLE_NAGLE_ALGORITHM
43 /*
44 Only in dcmtk-3.6.0/dcmnet/libsrc: dulfsm.cc~