[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=012211e

The following commit has been merged in the master branch:
commit 012211e251780c0ae4b8195c58c21f141d17cb42
Author: tbeu <mail at tbeu.de>
Date:   Mon Aug 15 18:58:40 2016 +0000

    Fix and update Sony camera settings drive mode to match ExifTool
---
 src/sonymn.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 671c528..3d4c606 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -505,15 +505,20 @@ namespace Exiv2 {
 
     //! 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") },
-        { 19, N_("D-Range Optimizer Bracketing Low") } // To silence compiler warning
+        { 0x01, N_("Single Frame")                      },
+        { 0x02, N_("Continuous High")                   },
+        { 0x04, N_("Self-timer 10 sec")                 },
+        { 0x05, N_("Self-timer 2 sec, Mirror Lock-up")  },
+        { 0x06, N_("Single-frame Bracketing")           },
+        { 0x07, N_("Continuous Bracketing")             },
+        { 0x0a, N_("Remote Commander")                  },
+        { 0x0b, N_("Mirror Lock-up")                    },
+        { 0x12, N_("Continuous Low")                    },
+        { 0x18, N_("White Balance Bracketing Low")      },
+        { 0x19, N_("D-Range Optimizer Bracketing Low")  },
+        { 0x28, N_("White Balance Bracketing High")     },
+        { 0x29, N_("D-Range Optimizer Bracketing High") },
+        { 0x29, N_("D-Range Optimizer Bracketing High") } // To silence compiler warning
     };
 
     //! Lookup table to translate Sony camera settings focus mode values to readable labels

-- 
exiv2 packaging