[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=97aa114

The following commit has been merged in the master branch:
commit 97aa1149c9130e8a49971e0acc219819afe41d89
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Jan 8 12:44:29 2015 +0000

    #1019.  Thank You Thomas for finding this issue.
---
 src/jp2image.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index bc0ea74..e8c3806 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -552,19 +552,19 @@ namespace Exiv2
 
                 case kJp2BoxTypeUuid:
                 {
-                    if(memcmp(boxBuf.pData_ + 8, kJp2UuidExif, sizeof(16)) == 0)
+                    if(memcmp(boxBuf.pData_ + 8, kJp2UuidExif, 16) == 0)
                     {
 #ifdef DEBUG
                         std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Exif Uuid box
";
 #endif
                     }
-                    else if(memcmp(boxBuf.pData_ + 8, kJp2UuidIptc, sizeof(16)) == 0)
+                    else if(memcmp(boxBuf.pData_ + 8, kJp2UuidIptc, 16) == 0)
                     {
 #ifdef DEBUG
                         std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Iptc Uuid box
";
 #endif
                     }
-                    else if(memcmp(boxBuf.pData_ + 8, kJp2UuidXmp,  sizeof(16)) == 0)
+                    else if(memcmp(boxBuf.pData_ + 8, kJp2UuidXmp,  16) == 0)
                     {
 #ifdef DEBUG
                         std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Xmp Uuid box
";
@@ -573,7 +573,7 @@ namespace Exiv2
                     else
                     {
 #ifdef DEBUG
-                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: write Uuid box (lenght: " << box.boxLength << ")
";
+                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: write Uuid box (length: " << box.boxLength << ")
";
 #endif
                         if (outIo.write(boxBuf.pData_, boxBuf.size_) != boxBuf.size_) throw Error(21);
                     }

-- 
exiv2 packaging