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

The following commit has been merged in the master branch:
commit ba43cf489e70dc842a76f295eea4dc9fee909d50
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Apr 28 01:30:39 2006 +0000

    Minor fix (Roger Larsson)
---
 src/nikonmn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 4c8e843..ff72515 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -647,7 +647,7 @@ namespace Exiv2 {
             // Mapping by Roger Larsson
             unsigned focusmetering = value.toLong(0);
             unsigned focuspoint = value.toLong(1);
-            unsigned focusused = (value.toLong(2) << 16) + value.toLong(3);
+            unsigned focusused = (value.toLong(2) << 8) + value.toLong(3);
             enum {standard, wide} combination = standard;
             const unsigned focuspoints = sizeof(nikonFocuspoints) / sizeof(nikonFocuspoints[0]);
 

-- 
exiv2 packaging