[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=a593735

The following commit has been merged in the master branch:
commit a59373596cbed0729c21b01ebbbaa2e02c955ee8
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Mon May 31 14:06:45 2010 +0000

    more long expo NR mode
---
 src/sonymn.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 8423c14..31c016b 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -146,7 +146,7 @@ namespace Exiv2 {
         { 0,     N_("Off")             },
         { 1,     N_("On (Continuous)") },
         { 2,     N_("On (Shooting)")   },
-        { 65535, N_("Not Applicable")  }
+        { 65535, N_("n/a")             }
     };
 
     //! Lookup table to translate Sony dynamic range optimizer values to readable labels
@@ -217,11 +217,11 @@ namespace Exiv2 {
 
     //! Lookup table to translate Sony release mode values to readable labels
     extern const TagDetails sonyReleaseMode[] = {
-        { 0,     N_("Normal")                    },
-        { 2,     N_("Burst")                     },
-        { 5,     N_("Exposure Bracketing ")      },
-        { 6,     N_("White Balance Bracketing ") },
-        { 65535, N_("n/a")                       }
+        { 0,     N_("Normal")                   },
+        { 2,     N_("Burst")                    },
+        { 5,     N_("Exposure Bracketing")      },
+        { 6,     N_("White Balance Bracketing") },
+        { 65535, N_("n/a")                      }
     };
 
     //! Lookup table to translate Sony sequence number values to readable labels
@@ -230,6 +230,13 @@ namespace Exiv2 {
         { 65535, N_("n/a")                       }
     };
 
+    //! Lookup table to translate Sony long exposure noise reduction values to readable labels
+    extern const TagDetails sonyLongExposureNoiseReduction[] = {
+        { 0,     N_("Off") },
+        { 1,     N_("On")  },
+        { 65535, N_("n/a") }
+    };
+
     std::ostream& SonyMakerNote::print0xb000(std::ostream& os, const Value& value, const ExifData*)
     {
         if (value.count() != 4)
@@ -410,7 +417,7 @@ namespace Exiv2 {
                 sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAntiBlur)),
         TagInfo(0xB04E, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"),
                 N_("Long Exposure Noise Reduction"),
-                sony1IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
+                sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyLongExposureNoiseReduction)),
         TagInfo(0xB04F, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"),
                 N_("Dynamic Range Optimizer"),
                 sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(print0xb04f)),

-- 
exiv2 packaging