[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=1b594d6

The following commit has been merged in the master branch:
commit 1b594d6fe79391e1f4de4d4b093679cc08472027
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 15 11:26:25 2010 +0000

    print Intelligent Auto
---
 src/sonymn.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 56e0225..84ed619 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -192,6 +192,13 @@ namespace Exiv2 {
         { 2, N_("Plus")  }
     };
 
+    //! Lookup table to translate Sony Intelligent Auto values to readable labels
+    extern const TagDetails sonyIntelligentAuto[] = {
+        { 0, N_("Off") },
+        { 1, N_("On") },
+        { 2, N_("Advanced")  }
+    };
+
     // Sony MakerNote Tag Info
     const TagInfo SonyMakerNote::tagInfo_[] = {
 
@@ -318,11 +325,9 @@ namespace Exiv2 {
         TagInfo(0xb04f, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"),
                 N_("Dynamic Range Optimizer"),
                 sonyIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(print0xb04f)),
-
-        // TODO
         TagInfo(0xb052, "IntelligentAuto", N_("Intelligent Auto"),
                 N_("Intelligent Auto"),
-                sonyIfdId, makerTags, unsignedShort, printValue),
+                sonyIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyIntelligentAuto)),
 
         // TODO
         TagInfo(0xb054, "WhiteBalance", N_("White Balance"),

-- 
exiv2 packaging