[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=46c2dbf

The following commit has been merged in the master branch:
commit 46c2dbf43b0a3b5c8c8e78d0cdaf963482789804
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 14 16:32:55 2010 +0000

    #695: Applied patch from Nikolai Saoukh.
---
 src/metacopy.cpp | 8 +++++++-
 src/metacopy.hpp | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/metacopy.cpp b/src/metacopy.cpp
index e3fde7d..251b86e 100644
--- a/src/metacopy.cpp
+++ b/src/metacopy.cpp
@@ -74,6 +74,9 @@ try {
     if (params.comment_) {
         writeImg->setComment(readImg->comment());
     }
+    if (params.xmp_) {
+        writeImg->setXmpData(readImg->xmpData());
+    }
 
     try {
         writeImg->writeMetadata();
@@ -100,11 +103,13 @@ int Params::option(int opt, const std::string& /*optarg*/, int optopt)
     case 'i': iptc_ = true; break;
     case 'e': exif_ = true; break;
     case 'c': comment_ = true; break;
+    case 'x': xmp_ = true; break;
     case 'p': preserve_ = true; break;
     case 'a':
         iptc_ =true;
         exif_ =true;
         comment_ =true;
+        xmp_ =true;
         break;
     case ':':
         std::cerr << progname() << ": Option -" << static_cast<char>(optopt)
@@ -152,7 +157,7 @@ int Params::getopt(int argc, char* const argv[])
             std::cerr << progname() << ": Write file must be specified
";
             rc = 1;
         }
-        if (preserve_ && iptc_ && exif_ && comment_ ) {
+        if (preserve_ && iptc_ && exif_ && comment_ && xmp_ ) {
             std::cerr << progname() << ": Option -p has no effect when all metadata types are specified.
";
             rc = 1;
         }
@@ -175,6 +180,7 @@ void Params::help(std::ostream& os) const
        << "   -i      Read Iptc data from readfile and write to writefile.
"
        << "   -e      Read Exif data from readfile and write to writefile.
"
        << "   -c      Read Jpeg comment from readfile and write to writefile.
"
+       << "   -x      Read XMP data from readfile and write to writefile.
"
        << "   -a      Read all metadata from readfile and write to writefile.
"
        << "   -p      Preserve existing metadata in writefile if not replaced.
"
        << "   -h      Display this help and exit.

";
diff --git a/src/metacopy.hpp b/src/metacopy.hpp
index aa3f72e..6c24a64 100644
--- a/src/metacopy.hpp
+++ b/src/metacopy.hpp
@@ -40,6 +40,7 @@ public:
     bool iptc_;                    //!< Iptc option flag.
     bool exif_;                    //!< Exif option flag.
     bool comment_;                 //!< JPEG comment option flag.
+    bool xmp_;                     //!< XMP option flag.
     bool preserve_;                //!< Preserve existing metadata option flag.
     std::string read_;             //!< Source file
     std::string write_;            //!< Destination file
@@ -54,6 +55,7 @@ public:
                iptc_(false),
                exif_(false),
                comment_(false),
+               xmp_(false),
                preserve_(false)
         {}
 

-- 
exiv2 packaging