[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=6f7b3ba

The following commit has been merged in the master branch:
commit 6f7b3ba8f7572dabdbee7f86014f67c003b94145
Author: draekko <draekko.software at gmail.com>
Date:   Thu Aug 18 10:10:44 2016 +0000

    #1199 removed convenience converstion for iptc to xmp, apps should handle it directly since webp doesnt support iptc.
---
 include/exiv2/webpimage.hpp |  1 +
 src/image.cpp               |  2 +-
 src/webpimage.cpp           | 16 ++++++----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/include/exiv2/webpimage.hpp b/include/exiv2/webpimage.hpp
index 534d9f2..b606269 100644
--- a/include/exiv2/webpimage.hpp
+++ b/include/exiv2/webpimage.hpp
@@ -80,6 +80,7 @@ namespace Exiv2 {
           @brief Not supported. Calling this function will throw an Error(32).
          */
         void setComment(const std::string& comment);
+        void setIptcData(const IptcData& /*iptcData*/);
 
         //! @name Accessors
         //@{
diff --git a/src/image.cpp b/src/image.cpp
index 3c08a4f..6fc0e4a 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -113,7 +113,7 @@ namespace {
         { ImageType::crw,  newCrwInstance,  isCrwType,  amReadWrite, amNone,      amNone,      amReadWrite },
         { ImageType::mrw,  newMrwInstance,  isMrwType,  amRead,      amRead,      amRead,      amNone      },
         { ImageType::tiff, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
-        { ImageType::webp, newWebPInstance, isWebPType, amReadWrite, amReadWrite, amReadWrite, amNone      },
+        { ImageType::webp, newWebPInstance, isWebPType, amReadWrite, amNone,      amReadWrite, amNone      },
         { ImageType::dng,  newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
         { ImageType::nef,  newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
         { ImageType::pef,  newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 89f5b71..84f5a29 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -75,6 +75,12 @@ namespace Exiv2 {
 
     /* =========================================== */
 
+    void WebPImage::setIptcData(const IptcData& /*iptcData*/)
+    {
+        // not supported
+        throw(Error(32, "IPTC metadata", "WebP"));
+    }
+
     void WebPImage::setComment(const std::string& /*comment*/)
     {
         // not supported
@@ -138,10 +144,6 @@ namespace Exiv2 {
             has_icc = true;
         }
 
-        if (iptcData_.count() > 0) {
-            copyIptcToXmp(iptcData_, xmpData_);
-        }
-
         if (exifData_.count() > 0) {
             ExifParser::encode(blob, littleEndian, exifData_);
             if (blob.size() > 0) {
@@ -150,11 +152,6 @@ namespace Exiv2 {
         }
 
         if (xmpData_.count() > 0) {
-            if (iptcData_.count() == 0) {
-                moveXmpToIptc(xmpData_, iptcData_);
-                iptcData_.clear();
-            }
-
             XmpParser::encode(xmpPacket_, xmpData_,
                               XmpParser::useCompactFormat |
                               XmpParser::omitAllFormatting);
@@ -693,7 +690,6 @@ namespace Exiv2 {
                     std::cout << "Display Hex Dump [size:" << (unsigned long)size << "]" << std::endl;
                     std::cout << Internal::binaryToHex(rawExifData, size);
 #endif
-                    moveXmpToIptc(xmpData_, iptcData_);
                 }
             } else {
                 io_->seek(size, BasicIo::cur);

-- 
exiv2 packaging