[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=24e9e36

The following commit has been merged in the master branch:
commit 24e9e36713509a50f1822deb8f0af63d9a43707e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Oct 16 16:39:57 2007 +0000

    Added XMP lists to taglist program, fixed printProperties().
---
 src/properties.cpp |  5 ++---
 src/taglist.cpp    | 12 ++++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/properties.cpp b/src/properties.cpp
index 553f929..91cdacf 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -896,9 +896,8 @@ namespace Exiv2 {
     {
         const XmpPropertyInfo* pl = propertyList(prefix);
         if (pl) {
-            const int ck = sizeof(pl) / sizeof(pl[0]);                
-            for (int k = 0; k < ck; ++k) {
-                os << pl[k];
+            for (int i = 0; pl[i].name_ != 0; ++i) {
+                os << pl[i];
             }
         }
 
diff --git a/src/taglist.cpp b/src/taglist.cpp
index 5c6c325..0032244 100644
--- a/src/taglist.cpp
+++ b/src/taglist.cpp
@@ -11,6 +11,7 @@
 #include "makernote.hpp"
 #include "tags.hpp"
 #include "datasets.hpp"
+#include "properties.hpp"
 #include "error.hpp"
 
 #include <string>
@@ -40,10 +41,16 @@ try {
         IfdId ifdId = ExifTags::ifdIdByIfdItem(item);
         if (ExifTags::isMakerIfd(ifdId)) {
             ExifTags::makerTaglist(std::cout, ifdId);
+            break;
+        }
+
+        try {
+            XmpProperties::printProperties(std::cout, item);
         }
-        else {
+        catch(const AnyError& e) {
             rc = 2;
         }
+
         break;
     }
     case 1:
@@ -55,7 +62,8 @@ try {
     }
     if (rc) {
         std::cout << "Usage: " << argv[0]
-                  << " [Exif|Canon|CanonCs|CanonSi|CanonCf|Fujifilm|Minolta|Nikon1|Nikon2|Nikon3|Olympus|Panasonic|Pentax|Sigma|Sony|Iptc]
"
+                  << " [Exif|Canon|CanonCs|CanonSi|CanonCf|Fujifilm|Minolta|Nikon1|Nikon2|Nikon3|Olympus|Panasonic|Pentax|Sigma|Sony|Iptc"
+                  <<  "|dc|xmp|xmpRights|xmpMM|xmpBJ|xmpTPg|xmpDM|pdf|photoshop|crs|tiff|exif|aux|iptc]
"
                   << "Print Exif tags, MakerNote tags, or Iptc datasets
";
     }
     return rc;

-- 
exiv2 packaging