[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=59d4bc6

The following commit has been merged in the master branch:
commit 59d4bc6e02614bfbc1982fbe67f922bafd836c4e
Author: tbeu <mail at tbeu.de>
Date:   Tue Aug 16 20:12:07 2016 +0000

    Update Canon CS Focus mode to match ExifTool
---
 src/canonmn.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index bc1cdb9..2a8bbc7 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -491,15 +491,18 @@ namespace Exiv2 {
 
     //! FocusMode, tag 0x0007
     extern const TagDetails canonCsFocusMode[] = {
-        {  0, N_("One shot AF")  },
-        {  1, N_("AI servo AF")  },
-        {  2, N_("AI focus AF")  },
-        {  3, N_("Manual focus") },
-        {  4, N_("Single")       },
-        {  5, N_("Continuous")   },
-        {  6, N_("Manual focus") },
-        { 16, N_("Pan focus")    },
-        { 16, N_("Pan focus")    }    // To silence compiler warning
+        {   0, N_("One shot AF")      },
+        {   1, N_("AI servo AF")      },
+        {   2, N_("AI focus AF")      },
+        {   3, N_("Manual focus (3)") },
+        {   4, N_("Single")           },
+        {   5, N_("Continuous")       },
+        {   6, N_("Manual focus (6)") },
+        {  16, N_("Pan focus")        },
+        { 256, N_("AF + MF")          },
+        { 512, N_("Movie Snap Focus") },
+        { 519, N_("Movie Servo AF")   },
+        { 519, N_("Movie Servo AF")   }    // To silence compiler warning
     };
 
     //! ImageSize, tag 0x000a

-- 
exiv2 packaging