[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=2f6188a

The following commit has been merged in the master branch:
commit 2f6188a713191564be50e48cc0c4cf8bdd6be6d4
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Dec 27 19:28:23 2015 +0000

    #1144.  Correction to r4151 and update to test suite.
---
 src/pentaxmn.cpp            |  20 +++++++++-----------
 test/bugfixes-test.sh       |  13 +++++++------
 test/data/bugfixes-test.out | Bin 1845112 -> 1845446 bytes
 test/data/exiv2-bug1144.exv | Bin 0 -> 57491 bytes
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 72af30e..79e173a 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -1148,11 +1148,6 @@ namespace Exiv2 {
     }
 
     // #1144 begin
-    static ExifData::const_iterator getKey(const std::string& key,const ExifData* metadata)
-    {
-		return metadata->findKey(ExifKey(key));
-    }
-
     static std::string getKeyString(const std::string& key,const ExifData* metadata)
     {
 		std::string result;
@@ -1162,7 +1157,7 @@ namespace Exiv2 {
 		return result;
     }
 
-    std::ostream& resolveLensType0x32c(std::ostream& os, const Value& value,
+    std::ostream& resolveLens0x32c(std::ostream& os, const Value& value,
                                                  const ExifData* metadata)
     {
         try {
@@ -1187,15 +1182,18 @@ namespace Exiv2 {
     // #1144 end
 
     // #816 begin
-    std::ostream& resolveLensTypeSigma(std::ostream& os, const Value& value,
+    std::ostream& resolveLens0x3ff(std::ostream& os, const Value& value,
                                                  const ExifData* metadata)
     // ----------------------------------------------------------------------
     {
         try {
-            unsigned long lensID = value.toLong(0)*256 + value.toLong(1); // 0x3ff
+            unsigned long lensID = 0x3ff;
             unsigned long index  = 0;
 
-            const ExifData::const_iterator lensInfo = getKey("Exif.PentaxDng.LensInfo",metadata);
+            const ExifData::const_iterator lensInfo = metadata->findKey(ExifKey("Exif.PentaxDng.LensInfo")) != metadata->end()
+                                                    ? metadata->findKey(ExifKey("Exif.PentaxDng.LensInfo"))
+                                                    : metadata->findKey(ExifKey("Exif.Pentax.LensInfo"))
+                                                    ;
             if ( lensInfo == metadata->end() ) return EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)(os, value, metadata);
             if ( lensInfo->count() < 5       ) return EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)(os, value, metadata);
 
@@ -1260,10 +1258,10 @@ namespace Exiv2 {
        {   0x031d, resolveLensType },
        {   0x031f, resolveLensType },
        {   0x0329, resolveLensType },
-       {   0x032c, resolveLensType0x32c },
+       {   0x032c, resolveLens0x32c},
        {   0x032e, resolveLensType },
        {   0x0334, resolveLensType },
-       {   0x03ff, resolveLensTypeSigma },
+       {   0x03ff, resolveLens0x3ff},
        {   0x041a, resolveLensType },
        {   0x042d, resolveLensType },
        {   0x08ff, resolveLensType },
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 4becf91..f0bcae7 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -448,12 +448,13 @@ source ./functions.source
 	runTest exiv2 -PkV --grep GPSL http://dev.exiv2.org/attachments/download/805/DSC_7154.jpg | runTest exiv2 -m- $filename
 	runTest exiv2 -pa $filename
 
-	num=1140
-	filename=exiv2-bug$num.exv
-	printf "$num " >&3
-	echo '------>' Bug $num '<-------' >&2
-	copyTestFile                        $filename
-	runTest exiv2 -pv -g Lens           $filename
+	for num in 1140 1144; do
+	  filename=exiv2-bug$num.exv
+	  printf "$num " >&3
+	  echo '------>' Bug $num '<-------' >&2
+	  copyTestFile                        $filename
+	  runTest exiv2 -pv -g Lens           $filename
+	done
 
 
 ) 3>&1 > $results 2>&1
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 62add72..a081f48 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug1144.exv b/test/data/exiv2-bug1144.exv
new file mode 100644
index 0000000..826dff7
Binary files /dev/null and b/test/data/exiv2-bug1144.exv differ

-- 
exiv2 packaging