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

The following commit has been merged in the master branch:
commit dd39d165e24cd47a9943a0049979e5d14a3afe94
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Oct 21 19:19:06 2016 +0000

    #1247 Fix Linux/GCC compilation warning.  Added Hanno's file to the test suite.
---
 src/image.cpp               |   2 +-
 test/bugfixes-test.sh       |   6 ++++++
 test/data/bugfixes-test.out | Bin 1928308 -> 1928392 bytes
 test/data/exiv2-bug1247.jpg | Bin 0 -> 17 bytes
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/image.cpp b/src/image.cpp
index 9422828..66859c3 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -614,7 +614,7 @@ namespace Exiv2 {
     void Image::setIccProfile(Exiv2::DataBuf& iccProfile,bool bTestValid)
     {
         if ( bTestValid ) {
-            if ( iccProfile.pData_ && ( iccProfile.size_ < sizeof(long)) ) throw Error(53);
+            if ( iccProfile.pData_ && ( iccProfile.size_ < (long) sizeof(long)) ) throw Error(53);
             long size = iccProfile.pData_ ? getULong(iccProfile.pData_, bigEndian): -1;
             if ( size!= iccProfile.size_ ) throw Error(53);
         }
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 8551e03..8a76b4d 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -607,6 +607,12 @@ source ./functions.source
     copyTestFile                        $filename
     runTest exiv2 -pa                   $filename
 
+    num=1247
+    printf "$num " >&3
+    filename=exiv2-bug$num.jpg
+    copyTestFile                        $filename
+    runTest exiv2 -pa                   $filename
+
 ) 3>&1 > $results 2>&1
 
 printf "
"
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 633db14..ca12a10 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug1247.jpg b/test/data/exiv2-bug1247.jpg
new file mode 100644
index 0000000..c9b2be0
Binary files /dev/null and b/test/data/exiv2-bug1247.jpg differ

-- 
exiv2 packaging