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

The following commit has been merged in the master branch:
commit ed7b20a20e5f9924aac1e3cf1dc20bb2043460e3
Author: draekko <draekko.software at gmail.com>
Date:   Sat Aug 20 13:11:22 2016 +0000

    #1199 fixed typo from cut/paste in previous commit causing exif flag not to be set for VP8X chunk.
---
 src/webpimage.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index b5b5ff3..4dc2443 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -336,9 +336,9 @@ namespace Exiv2 {
                 }
 
                 if (has_exif) {
-                    payload.pData_[0] |= WEBP_VP8X_XMP_BIT;
+                    payload.pData_[0] |= WEBP_VP8X_EXIF_BIT;
                 } else {
-                    payload.pData_[0] &= ~WEBP_VP8X_XMP_BIT;
+                    payload.pData_[0] &= ~WEBP_VP8X_EXIF_BIT;
                 }
 
                 if (outIo.write(chunkId.pData_, WEBP_TAG_SIZE) != WEBP_TAG_SIZE)
@@ -355,7 +355,7 @@ namespace Exiv2 {
                     if (outIo.write((const byte*)WEBP_CHUNK_HEADER_ICCP, WEBP_TAG_SIZE) != WEBP_TAG_SIZE) throw Error(21);
                     ul2Data(data, (uint32_t) iccProfile_.size_, littleEndian);
                     if (outIo.write(data, WEBP_TAG_SIZE) != WEBP_TAG_SIZE) throw Error(21);
-                    if (outIo.write(iccProfile_.pData_, iccProfile_.size_) != iccProfile_.size_) {
+                    if (outIo.write(iccProfile_.pData_, (long)iccProfile_.size_) != (long)iccProfile_.size_) {
                         throw Error(21);
                     }
                     has_icc = false;
@@ -778,7 +778,7 @@ namespace Exiv2 {
         }
 
         if (has_exif) {
-            data[0] |= WEBP_VP8X_XMP_BIT;
+            data[0] |= WEBP_VP8X_EXIF_BIT;
         }
 
         /* set width - stored in 24bits*/

-- 
exiv2 packaging