[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=1935edd

The following commit has been merged in the master branch:
commit 1935eddeac1bed1f63c30de7f84d69fff6e2b8d1
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Aug 11 14:34:20 2016 +0000

    #1202 Adding "Manual" Exif.CanonCs.FocusContinuous
---
 src/canonmn.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 2c40b49..abed822 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1043,7 +1043,8 @@ namespace Exiv2 {
     //! FocusContinuous, tag 0x0020
     extern const TagDetails canonCsFocusContinuous[] = {
         { 0, N_("Single")     },
-        { 1, N_("Continuous") }
+        { 1, N_("Continuous") },
+        { 8, N_("Manual")     }
     };
 
     //! AESetting, tag 0x0021
@@ -1143,7 +1144,7 @@ namespace Exiv2 {
         TagInfo(0x002a, "ColorTone", N_("Color Tone"), N_("Color tone"), canonCsId, makerTags, signedShort, 1, printValue),
         TagInfo(0x002e, "SRAWQuality", N_("SRAW Quality Tone"), N_("SRAW quality"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsSRAWQuality)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonCsTag)", "(UnknownCanonCsTag)", N_("Unknown Canon Camera Settings 1 tag"), canonCsId, makerTags, unsignedShort, 1, printValue)
+        TagInfo(0xffff, "(UnknownCanonCsTag)", "(UnknownCanonCsTag)", N_("Unknown Canon Camera Settings 1 tag"), canonCsId, makerTags, signedShort, 1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagListCs()

-- 
exiv2 packaging