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

The following commit has been merged in the master branch:
commit 7b84f8bbceb356074acddc281e02ad53bd6cae86
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Sep 6 18:40:59 2015 +0000

    #1114  Fix submitted.
---
 src/actions.cpp             |  26 +++++++++++++++++---------
 test/bugfixes-test.sh       |   8 ++++++++
 test/data/bugfixes-test.out | Bin 1841173 -> 1841265 bytes
 test/data/exiv2-bug1114.jpg | Bin 0 -> 37887 bytes
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index cebc638..b0f55bf 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -698,7 +698,15 @@ namespace Action {
                     done = true;
                 }
             }
-            if (!done) std::cout << std::dec << md.value();
+            if (!done) {
+                // #1114 - show negative values for SByte
+                if (md.typeId() != Exiv2::signedByte){
+                    std::cout << std::dec << md.value();
+                } else {
+                    int value = md.value().toLong();
+                    std::cout << std::dec << (value<128?value:value-255);
+                }
+            }
         }
         if (Params::instance().printItems_ & Params::prTrans) {
             if (!first) std::cout << "  ";
@@ -1122,20 +1130,20 @@ namespace Action {
         }
         Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(path_);
         assert(image.get() != 0);
-		image->readMetadata();
+        image->readMetadata();
 
-		std::string    iccPath   = newFilePath(path_,".icc");
-		std::filebuf   iccBuffer ;
-		iccBuffer.open(iccPath.c_str(),std::ios::out);
-		std::ostream   iccStream(&iccBuffer);
+        std::string    iccPath   = newFilePath(path_,".icc");
+        std::filebuf   iccBuffer ;
+        iccBuffer.open(iccPath.c_str(),std::ios::out);
+        std::ostream   iccStream(&iccBuffer);
 
-		image->printStructure(iccStream,Exiv2::kpsIccProfile);
+        image->printStructure(iccStream,Exiv2::kpsIccProfile);
 
-		iccBuffer.close();
+        iccBuffer.close();
         if (Params::instance().verbose_) {
             std::cout << _("Writing iccProfile: ") << iccPath << std::endl;
         }
-		return 0;
+        return 0;
     } // Extract::writeIccProfile
 
 
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 36b5e83..6e0c528 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -405,6 +405,14 @@ source ./functions.source
 	copyTestFile                        $filename
 	runTest exiv2 -M 'del Xmp.dc.title' $filename
 	cat                                 $filename
+	echo ''
+
+	num=1114
+	filename=exiv2-bug$num.jpg
+	printf "$num " >&3
+	echo '------>' Bug $num '<-------' >&2
+	copyTestFile                        $filename
+	runTest exiv2 -pv -g TuneAdj        $filename
 
 ) 3>&1 > $results 2>&1
 
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 8b2bda9..3806e2b 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug1114.jpg b/test/data/exiv2-bug1114.jpg
new file mode 100644
index 0000000..011343e
Binary files /dev/null and b/test/data/exiv2-bug1114.jpg differ

-- 
exiv2 packaging