[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=917080f

The following commit has been merged in the master branch:
commit 917080fc37211c6bdecdfca1eec5834b22b5f964
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Mar 7 03:23:38 2009 +0000

    Handle unknown type name (reported by Marijn Kampf).
---
 samples/exifprint.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp
index 1ac4e3f..3159994 100644
--- a/samples/exifprint.cpp
+++ b/samples/exifprint.cpp
@@ -28,12 +28,13 @@ try {
     }
     Exiv2::ExifData::const_iterator end = exifData.end();
     for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
+        const char* tn = i->typeName();
         std::cout << std::setw(44) << std::setfill(' ') << std::left
                   << i->key() << " "
                   << "0x" << std::setw(4) << std::setfill('0') << std::right
                   << std::hex << i->tag() << " "
                   << std::setw(9) << std::setfill(' ') << std::left
-                  << i->typeName() << " "
+                  << (tn ? tn : "Unknown") << " "
                   << std::dec << std::setw(3)
                   << std::setfill(' ') << std::right
                   << i->count() << "  "

-- 
exiv2 packaging