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

The following commit has been merged in the master branch:
commit bb8f801b17b9131a9ca2aac62df5855da1adb03f
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Tue Apr 27 10:29:58 2010 +0000

    Ahaha. WB settings is also shared between Minolta and Sony. Exactly smae values, probably same developer (:=)))...
---
 src/minoltamn.cpp         | 11 ++++++++++-
 src/minoltasonyvalues.cpp | 20 ++++++++++++++++++++
 src/minoltasonyvalues.hpp |  7 +++++--
 src/sonymn.cpp            | 15 +--------------
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 143bfec..fd0f222 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -140,7 +140,7 @@ namespace Exiv2 {
                 minoltaIfdId, makerTags, signedRational, printValue),
         TagInfo(0x0105, "Teleconverter", N_("Teleconverter Model"),
                 N_("Teleconverter Model"),
-                sony1IfdId, makerTags, unsignedLong, printMinoltaSonyTeleconverterModel),
+                minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyTeleconverterModel),
         TagInfo(0x0107, "ImageStabilization", N_("Image Stabilization"),
                 N_("Image stabilization"),
                 minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageStabilization)),
@@ -156,12 +156,21 @@ namespace Exiv2 {
         TagInfo(0x010c, "LensID", N_("Lens ID"),
                 N_("Lens identifier"),
                 minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyLensID),
+        TagInfo(0x0111, "ColorCompensationFilter", N_("Color Compensation Filter"),
+                N_("Color Compensation Filter: negative is green, positive is magenta"),
+                minoltaIfdId, makerTags, unsignedLong, printValue),
+        TagInfo(0x0112, "WhiteBalanceFineTune", N_("White Balance Fine Tune"),
+                N_("White Balance Fine Tune Value"),
+                minoltaIfdId, makerTags, unsignedLong, printValue),
         TagInfo(0x0113, "ImageStabilization", N_("Image Stabilization"),
                 N_("Image Stabilization"),
                 minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue),
         TagInfo(0x0114, "CameraSettings5D", N_("Camera Settings (5D)"),
                 N_("Camera Settings (for Dynax 5D model)"),
                 minoltaIfdId, makerTags, undefined, printValue),
+        TagInfo(0x0115, "WhiteBalance", N_("White Balance"),
+                N_("White balance"),
+                minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyWhiteBalanceStd),
         TagInfo(0x0e00, "PrintIM", N_("Print IM"),
                 N_("PrintIM information"),
                 minoltaIfdId, makerTags, undefined, printValue),
diff --git a/src/minoltasonyvalues.cpp b/src/minoltasonyvalues.cpp
index b64726c..43298cf 100644
--- a/src/minoltasonyvalues.cpp
+++ b/src/minoltasonyvalues.cpp
@@ -532,4 +532,24 @@ namespace Exiv2 {
     {
         return EXV_PRINT_TAG(minoltaSonyTeleconverterModel)(os, value, metadata);
     }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony/Minolta Std camera settings white balance values to readable labels
+    extern const TagDetails minoltaSonyWhiteBalanceStd[] = {
+        { 0x00,  N_("Auto")                           },
+        { 0x01,  N_("Color Temperature/Color Filter") },
+        { 0x10,  N_("Daylight")                       },
+        { 0x20,  N_("Cloudy")                         },
+        { 0x30,  N_("Shade")                          },
+        { 0x40,  N_("Tungsten")                       },
+        { 0x50,  N_("Flash")                          },
+        { 0x60,  N_("Fluorescent")                    },
+        { 0x70,  N_("Custom")                         }
+    };
+
+    std::ostream& printMinoltaSonyWhiteBalanceStd(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyWhiteBalanceStd)(os, value, metadata);
+    }
 }                                       // namespace Exiv2
diff --git a/src/minoltasonyvalues.hpp b/src/minoltasonyvalues.hpp
index 64b6d0d..6f95178 100644
--- a/src/minoltasonyvalues.hpp
+++ b/src/minoltasonyvalues.hpp
@@ -74,10 +74,13 @@ namespace Exiv2 {
     EXIV2API std::ostream& printMinoltaSonySceneMode(std::ostream&, const Value&, const ExifData*);
 
     //! Print Minolta/Sony Image Quality values to readable labels.
-    std::ostream& printMinoltaSonyImageQuality(std::ostream&, const Value&, const ExifData*);
+    EXIV2API std::ostream& printMinoltaSonyImageQuality(std::ostream&, const Value&, const ExifData*);
 
     //! Print Minolta/Sony Teleconverter Model values to readable labels.
-    std::ostream& printMinoltaSonyTeleconverterModel(std::ostream&, const Value&, const ExifData*);
+    EXIV2API std::ostream& printMinoltaSonyTeleconverterModel(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony White Balance Std values to readable labels.
+    EXIV2API std::ostream& printMinoltaSonyWhiteBalanceStd(std::ostream&, const Value&, const ExifData*);
 
     // TODO: Added shared methods here.
 
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index b70b7d1..b0f1b45 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -49,19 +49,6 @@ namespace Exiv2 {
 
     // -- Standard Sony Makernotes tags ---------------------------------------------------------------
 
-    //! Lookup table to translate Sony Std camera settings white balance values to readable labels
-    extern const TagDetails sonyWhiteBalanceStd[] = {
-        { 0x00,  N_("Auto")                           },
-        { 0x01,  N_("Color Temperature/Color Filter") },
-        { 0x10,  N_("Daylight")                       },
-        { 0x20,  N_("Cloudy")                         },
-        { 0x30,  N_("Shade")                          },
-        { 0x40,  N_("Tungsten")                       },
-        { 0x50,  N_("Flash")                          },
-        { 0x60,  N_("Fluorescent")                    },
-        { 0x70,  N_("Custom")                         }
-    };
-
     //! Lookup table to translate Sony Auto HDR values to readable labels
     extern const TagDetails sonyAutoHDR[] = {
         { 0x00000, N_("Off") },
@@ -217,7 +204,7 @@ namespace Exiv2 {
                 sony1IfdId, makerTags, undefined, printValue),
         TagInfo(0x0115, "WhiteBalance", N_("White Balance"),
                 N_("White balance"),
-                sony1IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyWhiteBalanceStd)),
+                sony1IfdId, makerTags, unsignedLong, printMinoltaSonyWhiteBalanceStd),
         TagInfo(0x0116, "0x0116", "0x0116",
                 N_("Unknown"),
                 sony1IfdId, makerTags, undefined, printValue),

-- 
exiv2 packaging