Mercurial > hg > orthanc

annotate Resources/Patches/dcmtk-3.6.0-mingw64.patch @ 2840:f4c232bba1eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bgra32 to grayscale conversion
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 25 Sep 2018 10:17:59 +0200
parents 6d5e36e1256f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
495
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h 2010-12-17 11:50:30.000000000 +0100
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h 2013-07-19 15:56:25.688996134 +0200
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -196,7 +196,7 @@
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 OFBool popen(const char *command, const char *modes)
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 {
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 if (file_) fclose();
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 -#ifdef _WIN32
2546
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1951
diff changeset
9 +#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
495
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 file_ = _popen(command, modes);
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 #else
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 file_ = :: popen(command, modes);
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 @@ -258,7 +258,7 @@
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 {
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 if (popened_)
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 {
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 -#ifdef _WIN32
2546
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1951
diff changeset
18 +#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
495
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 result = _pclose(file_);
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 #else
5bb96a6100c0 fixes for mingw64
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 result = :: pclose(file_);