[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=665e83a

The following commit has been merged in the master branch:
commit 665e83acd523bd269b09659fb3634401476a25d8
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 22 09:59:52 2010 +0000

    implement DriveMode codec
---
 src/sonymn.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 3554f41..ec1fb3f 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -378,6 +378,18 @@ namespace Exiv2 {
 
     // -- Sony camera settings ---------------------------------------------------------------
 
+    //! Lookup table to translate Sony camera settings drive mode values to readable labels
+    extern const TagDetails sonyDriveModeStd[] = {
+        { 1, N_("Single Frame")                      },
+        { 2, N_("Continuous High")                   },
+        { 4, N_("Self-timer 10 sec")                 },
+        { 5, N_("Self-timer 2 sec")                  },
+        { 7, N_("Continuous Bracketing")             },
+        { 12, N_("Continuous Low")                   },
+        { 18, N_("White Balance Bracketing Low")     },
+        { 19, N_("D-Range Optimizer Bracketing Low") }
+    };
+
     //! Lookup table to translate Sony camera settings rotation values to readable labels
     extern const TagDetails sonyRotation[] = {
         { 0, N_("Horizontal (normal)") },
@@ -400,7 +412,7 @@ namespace Exiv2 {
         // NOTE: A700 only
         TagInfo(0x0004, "DriveMode", N_("Drive Mode"),
                 N_("Drive Mode"),
-                sony1CsIfdId, makerTags, unsignedShort, printValue),
+                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyDriveModeStd)),
         // NOTE: A700 only
         TagInfo(0x0006, "WhiteBalanceFineTune", N_("White Balance Fine Tune"),
                 N_("White Balance Fine Tune"),

-- 
exiv2 packaging