[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=3f2aa49

The following commit has been merged in the master branch:
commit 3f2aa49e6e6a0a966f9bc475fe96646d04b62bc7
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 22 05:42:24 2010 +0000

    implment Focus Mode codec
---
 src/sonymn.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 4a523f0..54e74c7 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -385,6 +385,14 @@ namespace Exiv2 {
         { 2, N_("Rotate 270 CW")       }
     };
 
+    //! Lookup table to translate Minolta Dynax 5D camera settings focus mode values to readable labels
+    extern const TagDetails sonyFocusMode[] = {
+        { 0, N_("Manual") },
+        { 1, "AF-S"       },
+        { 2, "AF-C"       },
+        { 3, "AF-A"       }
+    };
+
     // Sony Camera Settings Tag Info
     // NOTE: all are for A200, A230, A300, A350, A700, A850 and A900 Sony model excepted
     // some entries which are only relevant with A700.
@@ -400,7 +408,7 @@ namespace Exiv2 {
 
         TagInfo(0x0016, "FocusMode", N_("Focus Mode"),
                 N_("Focus Mode"),
-                sony1CsIfdId, makerTags, unsignedShort, printValue),
+                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFocusMode)),
 
         TagInfo(0x0017, "AFAreaMode", N_("AF Area Mode"),
                 N_("AF Area Mode"),
@@ -528,7 +536,7 @@ namespace Exiv2 {
 
         TagInfo(0x0016, "FocusMode", N_("Focus Mode"),
                 N_("Focus Mode"),
-                sony1Cs2IfdId, makerTags, unsignedShort, printValue),
+                sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFocusMode)),
 
         TagInfo(0x0017, "AFAreaMode", N_("AF Area Mode"),
                 N_("AF Area Mode"),

-- 
exiv2 packaging