[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=756886d

The following commit has been merged in the master branch:
commit 756886d9b0aa69e4d4ab75f6b61258a89a607e7f
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 15 11:28:53 2010 +0000

    print WB
---
 src/sonymn.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 84ed619..a8bd651 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -187,16 +187,24 @@ namespace Exiv2 {
 
     //! Lookup table to translate Sony dynamic range optimizer values to readable labels
     extern const TagDetails print0xb04f[] = {
-        { 0, N_("Off") },
+        { 0, N_("Off")      },
         { 1, N_("Standard") },
-        { 2, N_("Plus")  }
+        { 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")  }
+        { 0, N_("Off")      },
+        { 1, N_("On")       },
+        { 2, N_("Advanced") }
+    };
+
+    //! Lookup table to translate Sony WB values to readable labels
+    extern const TagDetails sonyWhiteBalance[] = {
+        { 0,  N_("Auto")          },
+        { 4,  N_("Manual")        },
+        { 5,  N_("Daylight")      },
+        { 14, N_("Incandescent")  }
     };
 
     // Sony MakerNote Tag Info
@@ -328,11 +336,9 @@ namespace Exiv2 {
         TagInfo(0xb052, "IntelligentAuto", N_("Intelligent Auto"),
                 N_("Intelligent Auto"),
                 sonyIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyIntelligentAuto)),
-
-        // TODO
         TagInfo(0xb054, "WhiteBalance", N_("White Balance"),
                 N_("White Balance"),
-                sonyIfdId, makerTags, unsignedShort, printValue),
+                sonyIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyWhiteBalance)),
 
         // --------------------------------------------------------------------------------
 

-- 
exiv2 packaging