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

The following commit has been merged in the master branch:
commit 6011899bbf0561e12b3bcf61def49e8026e8f00d
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu Jun 16 23:55:43 2016 +0000

    Update various lists to match ExifTool version 10.20.
---
 src/canonmn.cpp   |  2 ++
 src/olympusmn.cpp | 20 ++++++++++++++------
 src/pentaxmn.cpp  |  3 +++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index a46563d..8086cab 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -944,6 +944,7 @@ namespace Exiv2 {
         { 507, "Canon EF 16-35mm f/4L IS USM"                               },
         { 508, "Canon EF 11-24mm f/4L USM"                                  },
         { 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM"                    },
+        { 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x"             },
         { 750, "Canon EF 35mm f/1.4L II USM"                                },
         { 4142,"Canon EF-S 18-135mm f/3.5-5.6 IS STM"                       },
         { 4143,"Canon EF-M 18-55mm f/3.5-5.6 IS STM"                        }, // 0
@@ -958,6 +959,7 @@ namespace Exiv2 {
         { 4152,"Canon EF 24-105mm f/3.5-5.6 IS STM"                         },
         { 4153,"Canon EF-M 15-45mm f/3.5-6.3 IS STM"                        },
         { 4154,"Canon EF-S 24mm f/2.8 STM"                                  },
+        { 4155,"Canon EF-M 28mm f/3.5 Macro IS STM"                         },
         { 4156,"Canon EF 50mm f/1.8 STM"                                    },
         {36912,"Canon EF-S 18-135mm f/3.5-5.6 IS USM"                       },
         {65535,"n/a"                                                        }
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index ca8066a..b0e061b 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -614,12 +614,20 @@ namespace Exiv2 {
 
     //! PictureMode, tag 0x0520
     extern const TagDetails olympusPictureMode[] = {
-        {   1, N_("Vivid")    },
-        {   2, N_("Natural")  },
-        {   3, N_("Muted")    },
-        {   4, N_("Portrait") },
-        { 256, N_("Monotone") },
-        { 512, N_("Sepia")    }
+        {   1, N_("Vivid")                },
+        {   2, N_("Natural")              },
+        {   3, N_("Muted")                },
+        {   4, N_("Portrait")             },
+        {   5, N_("i-Enhance")            },
+        {   7, N_("Color Creator")        },
+        {   9, N_("Color Profile 1")      },
+        {  10, N_("Color Profile 2")      },
+        {  11, N_("Color Profile 3")      },
+        {  12, N_("Monochrome Profile 1") },
+        {  13, N_("Monochrome Profile 2") },
+        {  14, N_("Monochrome Profile 3") },
+        { 256, N_("Monotone")             },
+        { 512, N_("Sepia")                }
     };
 
     //! PictureModeBWFilter, tag 0x0525
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 62be425..e6c12d6 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -198,6 +198,8 @@ namespace Exiv2 {
         {    0x13088, "WG-5 GPS" },
         {    0x13092, "K-1" },
         {    0x1309c, "K-3 II" },
+        {    0x131f0, "WG-M2" },
+        {    0x13222, "K-70" },
     };
 
     //! Quality, tag 0x0008
@@ -925,6 +927,7 @@ namespace Exiv2 {
         { 0x083d, "HD PENTAX-D FA 28-105mm F3.5-5.6 ED DC WR" },
         { 0x083e, "HD PENTAX-D FA 24-70mm F2.8 ED SDM WR" },
         { 0x083f, "HD PENTAX-D FA 15-30mm F2.8 ED SDM WR" },
+        { 0x08c5, "HD PENTAX-DA 55-300mm F4.5-6.3 ED PLM WR RE" },
         { 0x08c6, "smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE" },
         { 0x08c7, "HD PENTAX-DA 18-50mm F4-5.6 DC WR RE" },
         { 0x08c8, "HD PENTAX-DA 16-85mm F3.5-5.6 ED DC WR" },

-- 
exiv2 packaging