[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=b0ff549

The following commit has been merged in the master branch:
commit b0ff549cb711e6f24993da3fe5573360c81ad6b8
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Sep 26 20:12:20 2016 +0000

    #1230 Correction to r4565 to fix msvc build breaker.
---
 src/actions.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 6fc1ff6..bbed213 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1068,7 +1068,7 @@ namespace Action {
         path_ = path;
         int  rc = 0;
 
-        bool bStdout = Params::instance().target_ & Params::ctStdInOut;
+        bool bStdout = Params::instance().target_ & Params::ctStdInOut?true:false;
         if  (bStdout) _setmode(_fileno(stdout), _O_BINARY) ;
 
         if (!rc && Params::instance().target_ & Params::ctThumb) {
@@ -2148,7 +2148,7 @@ namespace {
             && !sourceImage->comment().empty()) {
             if (Params::instance().verbose_) {
                 std::cout << _("Writing JPEG comment from") << " " << source
-                          << " " << _("to") << " " << target << std::endl;
+                          << " " << _("to") << " " << tgt << std::endl;
             }
             targetImage->setComment(sourceImage->comment());
         }
@@ -2157,7 +2157,7 @@ namespace {
             rc=0;
         }
         catch (const Exiv2::AnyError& e) {
-            std::cerr << target <<
+            std::cerr << tgt <<
                 ": " << _("Could not write metadata to file") << ": " << e << "
";
             rc=1;
         }

-- 
exiv2 packaging