[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=32af620

The following commit has been merged in the master branch:
commit 32af620713b8cbdbf480efc53cfa8446422a46a3
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jan 12 10:18:09 2016 +0000

    #1153 Fix submitted.  Thank You, Tim for reporting this and providing test data.
---
 src/minoltamn.cpp           |  29 ++++++++++++++++++++++++++++-
 test/bugfixes-test.sh       |   2 +-
 test/data/bugfixes-test.out | Bin 1849493 -> 1849600 bytes
 test/data/exiv2-bug1153.exv | Bin 0 -> 25581 bytes
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index f1e9659..73af8fc 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1927,7 +1927,8 @@ namespace Exiv2 {
         { 45851, "Tamron SP AF 300mm F2.8 LD IF" },
         { 45861, "Tamron SP AF 35-105mm F2.8 LD Aspherical IF" },
         { 45871, "Tamron AF 70-210mm F2.8 SP LD" },
-        { 65535, "Manual lens" }
+        {0xffff, "Manual lens | "                        // 1
+                 "Sony E 50mm F1.8 OSS" },               // 2
     };
 
     // ----------------------------------------------------------------------
@@ -2130,6 +2131,31 @@ namespace Exiv2 {
         return EXV_PRINT_TAG(minoltaSonyLensID)(os, value, metadata);
     }
 
+    static std::ostream& resolveLens0xffff(std::ostream& os, const Value& value,
+                                                 const ExifData* metadata)
+    {
+        try {
+            long lensID = 0xffff;
+            long index  = 0   ;
+
+            std::string model       = getKeyString("Exif.Image.Model"            ,metadata);
+            std::string maxAperture = getKeyString("Exif.Photo.MaxApertureValue" ,metadata);
+            std::string F1_8        = "434/256" ;
+
+			// #1153
+			if ( model == "ILCE-6000" && maxAperture == F1_8 ) try {
+				long    focalLength = getKeyLong  ("Exif.Photo.FocalLength"      ,metadata);
+				long    focalL35mm  = getKeyLong  ("Exif.Photo.FocalLengthIn35mmFilm",metadata);
+				long    focalRatio  = (focalL35mm*100)/focalLength;
+			    if ( inRange(focalRatio,145,155) ) index = 2 ;
+			} catch (...) {}
+
+            if ( index > 0 ) return resolvedLens(os,lensID,index);
+        } catch (...) {}
+
+        return EXV_PRINT_TAG(minoltaSonyLensID)(os, value, metadata);
+    }
+
     struct LensIdFct {
        long     id_;                           //!< Lens id
        PrintFct fct_;                          //!< Pretty-print function
@@ -2144,6 +2170,7 @@ namespace Exiv2 {
        {   0x0034, resolveLens0x34 },
        {   0x0080, resolveLens0x80 },
        {   0x00ff, resolveLens0xff },
+       {   0xffff, resolveLens0xffff },
 //     {   0x00ff, resolveLensTypeUsingExiftool }, // was used for debugging
     };
     // #1145 end - respect lenses with shared LensID
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 36a73ef..612fa71 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -457,7 +457,7 @@ 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
 
-	for num in 1140 1144a 1144b 1144c 1144d 1144e 1144f 1144g 1145a 1145b 1145c 1145d 1145e ; do
+	for num in 1140 1144a 1144b 1144c 1144d 1144e 1144f 1144g 1145a 1145b 1145c 1145d 1145e 1153; do
 	  filename=exiv2-bug$num.exv
 	  printf "$num " >&3
 	  echo '------>' Bug $num '<-------' >&2
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index a0470a6..efe6327 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug1153.exv b/test/data/exiv2-bug1153.exv
new file mode 100644
index 0000000..3e13ef0
Binary files /dev/null and b/test/data/exiv2-bug1153.exv differ

-- 
exiv2 packaging