[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=278c5d3

The following commit has been merged in the master branch:
commit 278c5d3ec4cfe2acce791de177ca260eafedef37
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Tue Jun 1 12:30:18 2010 +0000

    factoring zone matching
---
 src/minoltamn.cpp | 20 ++++++++++++--------
 src/minoltamn.hpp |  3 +++
 src/sonymn.cpp    |  9 +--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 3a98774..e5d8eec 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -77,13 +77,6 @@ namespace Exiv2 {
         { 5, N_("Extra Fine") }
     };
 
-    //! Lookup table to translate Minolta zone matching values
-    extern const TagDetails minoltaZoneMatching[] = {
-        { 0, N_("ISO Setting Used") },
-        { 1, N_("High Key")         },
-        { 2, N_("Low Key")          }
-    };
-
     //! Lookup table to translate Minolta image stabilization values
     extern const TagDetails minoltaImageStabilization[] = {
         { 1, N_("Off") },
@@ -157,7 +150,7 @@ namespace Exiv2 {
                 minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue),
         TagInfo(0x010a, "ZoneMatching", N_("Zone Matching"),
                 N_("Zone matching"),
-                minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaZoneMatching)),
+                minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyZoneMatching),
         TagInfo(0x010b, "ColorTemperature", N_("Color Temperature"),
                 N_("Color temperature"),
                 minoltaIfdId, makerTags, unsignedLong, printValue),
@@ -2101,4 +2094,15 @@ namespace Exiv2 {
         return EXV_PRINT_TAG(minoltaSonyWhiteBalanceStd)(os, value, metadata);
     }
 
+    //! Lookup table to translate Sony/Minolta zone matching values to readable labels
+    extern const TagDetails minoltaSonyZoneMatching[] = {
+        { 0, N_("ISO Setting Used") },
+        { 1, N_("High Key") },
+        { 2, N_("Low Key")  }
+    };
+
+    std::ostream& printMinoltaSonyZoneMatching(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyZoneMatching)(os, value, metadata);
+    }
 }                                       // namespace Exiv2
diff --git a/src/minoltamn.hpp b/src/minoltamn.hpp
index 56748c7..757f6d2 100644
--- a/src/minoltamn.hpp
+++ b/src/minoltamn.hpp
@@ -148,6 +148,9 @@ namespace Exiv2 {
     //! Print Minolta/Sony White Balance Std values to readable labels.
     EXIV2API std::ostream& printMinoltaSonyWhiteBalanceStd(std::ostream&, const Value&, const ExifData*);
 
+    //! Print Minolta/Sony ZoneMatching values to readable labels.
+    EXIV2API std::ostream& printMinoltaSonyZoneMatching(std::ostream&, const Value&, const ExifData*);
+
     // TODO: Added shared methods here.
 
 }                                       // namespace Exiv2
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index e988a8f..2836ed0 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -80,13 +80,6 @@ namespace Exiv2 {
         { 279, "NEX-3"     }
     };
 
-    //! Lookup table to translate Sony zone matching values to readable labels
-    extern const TagDetails sonyZoneMatching[] = {
-        { 0, N_("ISO Setting Used") },
-        { 1, N_("High Key") },
-        { 2, N_("Low Key")  }
-    };
-
     //! Lookup table to translate Sony dynamic range optimizer values to readable labels
     extern const TagDetails print0xb025[] = {
         { 0,  N_("Off")           },
@@ -370,7 +363,7 @@ namespace Exiv2 {
                 sony1IfdId, makerTags, unsignedLong, printMinoltaSonySceneMode),
         TagInfo(0xB024, "ZoneMatching", N_("Zone Matching"),
                 N_("Zone Matching"),
-                sony1IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyZoneMatching)),
+                sony1IfdId, makerTags, unsignedLong, printMinoltaSonyZoneMatching),
         TagInfo(0xB025, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"),
                 N_("Dynamic Range Optimizer"),
                 sony1IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(print0xb025)),

-- 
exiv2 packaging