[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=26df292

The following commit has been merged in the master branch:
commit 26df2920030470921c5f10f80e9656e9e1d547a8
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Jan 15 02:14:15 2009 +0000

    Fixed decoding of lens data for D90 (lens data version 0204). Thanks to Niels Kristian Bech Jensen.
---
 src/nikonmn.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 68021ca..2731012 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1341,8 +1341,16 @@ fmountlens[] = {
                 // The decrypt algorithm requires access to serial number
                 // and shutter count tags
                 decryptNikonData(lens.pData_ + 4, lens.size_ - 4, *metadata);
+                idx = 11;
+            }
+        }
+        else if (0 == memcmp(lens.pData_, "0204", 4)) {
+            if (metadata) {
+                // The decrypt algorithm requires access to serial number
+                // and shutter count tags
+                decryptNikonData(lens.pData_ + 4, lens.size_ - 4, *metadata);
+                idx = 12;
             }
-            idx = 11;
         }
         if (idx == 0 || lens.size_ < idx + 7) {
             // Unknown version or not enough data

-- 
exiv2 packaging