[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d801aab

The following commit has been merged in the master branch:
commit d801aabd588b64aaab3b7e575bfa76161828d568
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Sep 6 10:26:06 2016 +0000

    #1057.  Simplification of r4466
---
 src/exiv2app.hpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index 38cc74d..25dc749 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -60,11 +60,8 @@
 #endif
 
 #if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(_MSC_VER)
-#   include <fcntl.h>
-#   include <io.h>
-#   define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#   define SET_BINARY_MODE(file)
+#include <fcntl.h>
+#include <io.h>
 #endif
 
 
@@ -355,12 +352,11 @@ public:
     */
     void getStdin(Exiv2::DataBuf& buf)
     {
+        // copy stdin to stdinBuf
         if ( stdinBuf.size_ == 0 ) {
-            // copy stdin to stdinBuf
-            SET_BINARY_MODE(stdin);
-
 #if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(_MSC_VER) 
             DWORD fdwMode; 
+            _setmode(_fileno(stdin), O_BINARY);
             if ( !GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &fdwMode) ) { // failed: stdin has bytes!
 #else
             // http://stackoverflow.com/questions/34479795/make-c-not-wait-for-user-input/34479916#34479916

-- 
exiv2 packaging