third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1109 MinGW/32. Correction to r4538 for all versions of msvc.

Browse Source
This commit is contained in:
Robin Mills 2016-09-22 22:46:44 +00:00
parent df62afe552
commit c78a76c45c
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/actions.cpp
View File

@ -70,6 +70,11 @@ EXIV2_RCSID("@(#) $Id$")
# include <utime.h>
#endif
#if !defined(__MINGW__) && !defined(_MSC_VER)
#define _fileno(a)
#define _setmod(a,b)
#endif
// *****************************************************************************
// local declarations
namespace {
@ -247,9 +252,7 @@ namespace Action {
option = option == Exiv2::kpsNone ? Exiv2::kpsXMP : option; // drop
case Params::pmIccProfile:{
option = option == Exiv2::kpsNone ? Exiv2::kpsIccProfile : option;
#ifdef __MINGW__
_setmode(_fileno(stdout),O_BINARY);
#endif
rc = printStructure(std::cout,option);
} break;
}
@ -1069,11 +1072,9 @@ namespace Action {
path_ = path;
int rc = 0;
#ifdef __MINGW__
if ( Params::instance().target_ & Params::ctStdInOut ) {
_setmode(_fileno(stdout),O_BINARY);
}
#endif
if (!rc && Params::instance().target_ & Params::ctThumb) {
rc = writeThumbnail();
@ -1265,11 +1266,9 @@ namespace Action {
return -1;
}
#ifdef __MINGW__
if ( Params::instance().target_ & Params::ctStdInOut ) {
_setmode(_fileno(stdin),O_BINARY);
}
#endif
int rc = 0;
Timestamp ts;

2
src/basicio.cpp
View File

@ -1493,7 +1493,7 @@ namespace Exiv2 {
if (prot == pStdin) {
if (isatty(fileno(stdin)))
throw Error(53);
#ifdef _MSC_VER
#if defined(_MSC_VER) || defined(__MINGW__)
// convert stdin to binary
if (_setmode(_fileno(stdin), _O_BINARY) == -1)
throw Error(54);