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

The following commit has been merged in the master branch:
commit 9198431ea2cb0208781fff45100bae182206c1bf
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Dec 18 09:37:26 2009 +0000

    -b option now also suppresses Byte and SByte values.
---
 src/actions.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 8dd22c9..7f304ee 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -622,7 +622,9 @@ namespace Action {
             if (!first) std::cout << "  ";
             first = false;
             if (   Params::instance().binary_
-                && md.typeId() == Exiv2::undefined
+                && (   md.typeId() == Exiv2::undefined
+                    || md.typeId() == Exiv2::unsignedByte
+                    || md.typeId() == Exiv2::signedByte)   
                 && md.size() > 100) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;
@@ -633,7 +635,9 @@ namespace Action {
             if (!first) std::cout << "  ";
             first = false;
             if (   Params::instance().binary_
-                && md.typeId() == Exiv2::undefined
+                && (   md.typeId() == Exiv2::undefined
+                    || md.typeId() == Exiv2::unsignedByte
+                    || md.typeId() == Exiv2::signedByte)   
                 && md.size() > 100) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;
@@ -644,7 +648,9 @@ namespace Action {
             if (!first) std::cout << std::endl;
             first = false;
             if (   Params::instance().binary_
-                && md.typeId() == Exiv2::undefined
+                && (   md.typeId() == Exiv2::undefined
+                    || md.typeId() == Exiv2::unsignedByte
+                    || md.typeId() == Exiv2::signedByte)   
                 && md.size() > 100) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;

-- 
exiv2 packaging