[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=099fc85

The following commit has been merged in the master branch:
commit 099fc8553305b5f34b759d8c50376db8049c2e65
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 15 09:46:38 2010 +0000

    share macro mode decoding
---
 src/minoltamn.cpp         |  8 +-------
 src/minoltasonyvalues.cpp | 12 ++++++++++++
 src/minoltasonyvalues.hpp |  7 +++++--
 src/sonymn.cpp            | 13 ++++++++++---
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 11864cc..a91cffe 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -235,12 +235,6 @@ namespace Exiv2 {
         { 2, N_("Spot")            }
     };
 
-    //! Lookup table to translate Minolta Std camera settings macro mode values to readable labels
-    extern const TagDetails minoltaMacroModeStd[] = {
-        { 0, N_("Off") },
-        { 1, N_("On")  }
-    };
-
     //! Lookup table to translate Minolta Std camera settings digital zoom values to readable labels
     extern const TagDetails minoltaDigitalZoomStd[] = {
         { 0, N_("Off")                      },
@@ -506,7 +500,7 @@ namespace Exiv2 {
                 minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaFNumberStd),
         TagInfo(0x000B, "MacroMode", N_("Macro Mode"),
                 N_("Macro mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaMacroModeStd)),
+                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaSonyMacroMode),
         TagInfo(0x000C, "DigitalZoom", N_("Digital Zoom"),
                 N_("Digital zoom"),
                 minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDigitalZoomStd)),
diff --git a/src/minoltasonyvalues.cpp b/src/minoltasonyvalues.cpp
index 06cc00e..e65af7f 100644
--- a/src/minoltasonyvalues.cpp
+++ b/src/minoltasonyvalues.cpp
@@ -351,4 +351,16 @@ namespace Exiv2 {
         return EXV_PRINT_TAG(minoltaSonyColorMode)(os, value, metadata);
     }
 
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Minolta/Sony macro mode values to readable labels
+    extern const TagDetails minoltaSonyMacroMode[] = {
+        { 0, N_("Off") },
+        { 1, N_("On")  }
+    };
+
+    std::ostream& printMinoltaSonyMacroMode(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyMacroMode)(os, value, metadata);
+    }
 }                                       // namespace Exiv2
diff --git a/src/minoltasonyvalues.hpp b/src/minoltasonyvalues.hpp
index 29fcad3..fbf609b 100644
--- a/src/minoltasonyvalues.hpp
+++ b/src/minoltasonyvalues.hpp
@@ -40,12 +40,15 @@
 // namespace extensions
 namespace Exiv2 {
 
-    //! PrintMinolta/Sony Lens id values to readable labels
+    //! PrintMinolta/Sony Lens id values to readable labels.
     EXIV2API std::ostream& printMinoltaSonyLensID(std::ostream&, const Value&, const ExifData*);
 
-    //! PrintMinolta/Sony Color Mode values to readable labels
+    //! PrintMinolta/Sony Color Mode values to readable labels.
     EXIV2API std::ostream& printMinoltaSonyColorMode(std::ostream&, const Value&, const ExifData*);
 
+    //! PrintMinolta/Sony Macro Mode values to readable labels.
+    EXIV2API std::ostream& printMinoltaSonyMacroMode(std::ostream&, const Value&, const ExifData*);
+
     // TODO: Added shared methods here.
 
 }                                       // namespace Exiv2
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 56e3704..d2c5054 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -244,9 +244,7 @@ namespace Exiv2 {
                 N_("Lens identifier"),
                 sonyIfdId, makerTags, unsignedLong, printMinoltaSonyLensID),
 
-        // --------------------------------------------------------------------------------
         // TODO
-
         TagInfo(0xb028, "MinoltaMakerNote", N_("Minolta MakerNote"),
                 N_("Minolta MakerNote"),
                 sonyIfdId, makerTags, undefined, printValue),
@@ -255,42 +253,51 @@ namespace Exiv2 {
                 N_("Color Mode"),
                 sonyIfdId, makerTags, unsignedLong, printMinoltaSonyColorMode),
 
+        // TODO
         TagInfo(0xb02b, "FullImageSize", N_("Full Image Size"),
                 N_("Full Image Size"),
                 sonyIfdId, makerTags, unsignedLong, printValue),
 
+        // TODO
         TagInfo(0xb02c, "PreviewImageSize", N_("Preview Image Size"),
                 N_("Preview Image Size"),
                 sonyIfdId, makerTags, unsignedLong, printValue),
 
         TagInfo(0xb040, "Macro", N_("Macro"),
                 N_("Macro"),
-                sonyIfdId, makerTags, unsignedShort, printValue),
+                sonyIfdId, makerTags, unsignedShort, printMinoltaSonyMacroMode),
 
+        // TODO
         TagInfo(0xb041, "ExposureMode", N_("Exposure Mode"),
                 N_("Exposure Mode"),
                 sonyIfdId, makerTags, unsignedShort, printValue),
 
+        // TODO
         TagInfo(0xb047, "Quality", N_("Quality"),
                 N_("Quality"),
                 sonyIfdId, makerTags, unsignedShort, printValue),
 
+        // TODO
         TagInfo(0xb04b, "AntiBlur", N_("Anti-Blur"),
                 N_("Anti-Blur"),
                 sonyIfdId, makerTags, unsignedShort, printValue),
 
+        // TODO
         TagInfo(0xb04e, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"),
                 N_("Long Exposure Noise Reduction"),
                 sonyIfdId, makerTags, unsignedShort, printValue),
 
+        // TODO
         TagInfo(0xb04f, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"),
                 N_("Dynamic Range Optimizer"),
                 sonyIfdId, makerTags, unsignedShort, printValue),
 
+        // TODO
         TagInfo(0xb052, "IntelligentAuto", N_("Intelligent Auto"),
                 N_("Intelligent Auto"),
                 sonyIfdId, makerTags, unsignedShort, printValue),
 
+        // TODO
         TagInfo(0xb054, "WhiteBalance", N_("White Balance"),
                 N_("White Balance"),
                 sonyIfdId, makerTags, unsignedShort, printValue),

-- 
exiv2 packaging