[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=8c0dfbe

The following commit has been merged in the master branch:
commit 8c0dfbeca8a9e602dd3aa4a1719a7ef8bb133ea1
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu Jul 28 02:39:32 2016 +0000

    Update various lists to match ExifTool version 10.24.
---
 src/fujimn.cpp   | 12 +++++++-----
 src/pentaxmn.cpp |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 64f0e30..455eef9 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -97,11 +97,13 @@ namespace Exiv2 {
 
     //! FlashMode, tag 0x1010
     extern const TagDetails fujiFlashMode[] = {
-        { 0, N_("Auto")              },
-        { 1, N_("On")                },
-        { 2, N_("Off")               },
-        { 3, N_("Red-eye reduction") },
-        { 3, N_("Red-eye reduction") }          // To silence compiler warning
+        {  0, N_("Auto")              },
+        {  1, N_("On")                },
+        {  2, N_("Off")               },
+        {  3, N_("Red-eye reduction") },
+        {  4, N_("External")          },
+        { 16, N_("Commander")         },
+        { 16, N_("Commander")         }         // To silence compiler warning
     };
 
     //! FocusMode, tag 0x1021
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 67ff679..18ae3a8 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -746,6 +746,7 @@ namespace Exiv2 {
         { 0x032c, "Sigma 17-70mm F2.8-4.5 DC Macro" },                   //3
         { 0x032c, "Sigma 18-50mm F3.5-5.6 DC" },                         //4
         { 0x032c, "Sigma 17-35mm F2.8-4 EX DG" },                        //5
+        { 0x032c, "Sigma AF 18-35mm F3.5-4.5 Aspherical" },              //6
         { 0x032e, "Sigma or Samsung Lens" },                             //0
         { 0x032e, "Sigma APO 70-200mm F2.8 EX" },                        //1
         { 0x032e, "Sigma EX APO 100-300mm F4 IF" },                      //2

-- 
exiv2 packaging