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

The following commit has been merged in the master branch:
commit cc5f0f434e533fe8b80f84a7af153c6d8cf264b8
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Nov 23 15:28:15 2015 +0000

    #1137.  Implemented.
---
 src/actions.cpp  | 5 +++++
 src/exiv2.cpp    | 6 ++++--
 src/exiv2app.hpp | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index e9984c9..20c0a5b 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -623,6 +623,11 @@ namespace Action {
                       << std::right << std::hex
                       << md.tag();
         }
+        if (Params::instance().printItems_ & Params::prSet) {
+            if (!first) std::cout << " ";
+            first = false;
+            std::cout << "set" ;
+        }
         if (Params::instance().printItems_ & Params::prGroup) {
             if (!first) std::cout << " ";
             first = false;
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index ca5da26..9878f5c 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -610,6 +610,7 @@ int Params::evalPrintFlags(const std::string& optarg)
             case 'v': printItems_ |= prValue; break;
             case 't': printItems_ |= prTrans; break;
             case 'h': printItems_ |= prHex;   break;
+            case 'V': printItems_ |= prSet|prValue;break;
             default:
                 std::cerr << progname() << ": " << _("Unrecognized print item") << " `"
                           << optarg[i] << "'
";
@@ -1096,14 +1097,15 @@ namespace {
         for ( ; filename != end; ++filename) {
             try {
                 std::ifstream file(filename->c_str());
-                if (!file) {
+                bool bStdin = filename->compare("-")== 0;
+                if (!file && !bStdin) {
                     std::cerr << *filename << ": "
                               << _("Failed to open command file for reading
");
                     return false;
                 }
                 int num = 0;
                 std::string line;
-                while (std::getline(file, line)) {
+                while (std::getline(bStdin? std::cin : file, line)) {
                     ModifyCmd modifyCmd;
                     if (parseLine(modifyCmd, line, ++num)) {
                         modifyCmds.push_back(modifyCmd);
diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index bd6b551..7dc9fef 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -165,7 +165,8 @@ public:
         prSize  =  128,
         prValue =  256,
         prTrans =  512,
-        prHex   = 1024
+        prHex   = 1024,
+        prSet   = 2048
     };
 
     //! Enumerates common targets, bitmap

-- 
exiv2 packaging