[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=2f3195a

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

    print DRO
---
 src/sonymn.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 9a41828..56e0225 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -132,7 +132,7 @@ namespace Exiv2 {
     };
 
     //! Lookup table to translate Sony dynamic range optimizer values to readable labels
-    extern const TagDetails sonyDynamicRangeOptimizer[] = {
+    extern const TagDetails print0xb025[] = {
         { 0,  N_("Off")           },
         { 1,  N_("Standard ")     },
         { 2,  N_("Advanced Auto") },
@@ -185,6 +185,13 @@ namespace Exiv2 {
         { 65535, N_("Not Applicable")  }
     };
 
+    //! Lookup table to translate Sony dynamic range optimizer values to readable labels
+    extern const TagDetails print0xb04f[] = {
+        { 0, N_("Off") },
+        { 1, N_("Standard") },
+        { 2, N_("Plus")  }
+    };
+
     // Sony MakerNote Tag Info
     const TagInfo SonyMakerNote::tagInfo_[] = {
 
@@ -271,7 +278,7 @@ namespace Exiv2 {
                 sonyIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyZoneMatching)),
         TagInfo(0xb025, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"),
                 N_("Dynamic Range Optimizer"),
-                sonyIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyDynamicRangeOptimizer)),
+                sonyIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(print0xb025)),
         TagInfo(0xb026, "ImageStabilization", N_("Image Stabilization"),
                 N_("Image stabilization"),
                 sonyIfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue),
@@ -308,11 +315,9 @@ namespace Exiv2 {
         TagInfo(0xb04e, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"),
                 N_("Long Exposure Noise Reduction"),
                 sonyIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
-
-        // TODO
         TagInfo(0xb04f, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"),
                 N_("Dynamic Range Optimizer"),
-                sonyIfdId, makerTags, unsignedShort, printValue),
+                sonyIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(print0xb04f)),
 
         // TODO
         TagInfo(0xb052, "IntelligentAuto", N_("Intelligent Auto"),

-- 
exiv2 packaging