[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=85009a3

The following commit has been merged in the master branch:
commit 85009a30e3e82e5935d5e0a073be11386ec356b8
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Mon May 31 13:50:04 2010 +0000

    more macro mode
---
 src/sonymn.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index fa7e938..12381f2 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -195,10 +195,18 @@ namespace Exiv2 {
         { 2, N_("n/a") }
     };
 
+    //! Lookup table to translate Sony macro mode values to readable labels
+    extern const TagDetails sonyMacroMode[] = {
+        { 0,     N_("Off")         },
+        { 1,     N_("On")          },
+        { 2,     N_("Close Focus") },
+        { 65535, N_("n/a")         }
+    };
+
     //! Lookup table to translate Sony flash level values to readable labels
     extern const TagDetails sonyFlashLevel[] = {
         { -32768, N_("Off")    },
-        { -1,     N_("n/a")    },
+        { -1,     N_("On")    },
         { 0,      N_("Normal") },
         { 32767,  N_("High")   }
     };
@@ -368,7 +376,7 @@ namespace Exiv2 {
                 sony1IfdId, makerTags, unsignedLong, printImageSize),
         TagInfo(0xB040, "Macro", N_("Macro"),
                 N_("Macro"),
-                sony1IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
+                sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyMacroMode)),
         TagInfo(0xB041, "ExposureMode", N_("Exposure Mode"),
                 N_("Exposure Mode"),
                 sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureMode)),

-- 
exiv2 packaging