[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=4a326d2

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

    another tags shared between Minolta and Sony : ImageQuality
---
 src/minoltamn.cpp         |  2 +-
 src/minoltasonyvalues.cpp | 21 ++++++++++++++++++++-
 src/minoltasonyvalues.hpp |  3 +++
 src/sonymn.cpp            | 15 +--------------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index c27ad42..7775adc 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -131,7 +131,7 @@ namespace Exiv2 {
 
         TagInfo(0x0102, "Quality", N_("Image Quality"),
                 N_("Image quality"),
-                minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageQuality)),
+                minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyImageQuality),
 
         // TODO: Tag 0x0103 : quality or image size (see ExifTool doc).
 
diff --git a/src/minoltasonyvalues.cpp b/src/minoltasonyvalues.cpp
index 62f5dc7..26cd019 100644
--- a/src/minoltasonyvalues.cpp
+++ b/src/minoltasonyvalues.cpp
@@ -492,9 +492,28 @@ namespace Exiv2 {
         { 17, N_("Night View/Portrait") }
     };
 
-
     std::ostream& printMinoltaSonySceneMode(std::ostream& os, const Value& value, const ExifData* metadata)
     {
         return EXV_PRINT_TAG(minoltaSonySceneMode)(os, value, metadata);
     }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony image quality values to readable labels
+    extern const TagDetails minoltaSonyImageQuality[] = {
+        { 0, N_("Raw")                   },
+        { 1, N_("Super Fine")            },
+        { 2, N_("Fine")                  },
+        { 3, N_("Standard")              },
+        { 4, N_("Economy")               },
+        { 5, N_("Extra Fine")            },
+        { 6, N_("Raw + JPEG")            },
+        { 7, N_("Compressed Raw")        },
+        { 8, N_("Compressed Raw + JPEG") }
+    };
+
+    std::ostream& printMinoltaSonyImageQuality(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyImageQuality)(os, value, metadata);
+    }
 }                                       // namespace Exiv2
diff --git a/src/minoltasonyvalues.hpp b/src/minoltasonyvalues.hpp
index 9d641aa..3b97bd9 100644
--- a/src/minoltasonyvalues.hpp
+++ b/src/minoltasonyvalues.hpp
@@ -73,6 +73,9 @@ namespace Exiv2 {
     //! Print Minolta/Sony Scene Mode values to readable labels.
     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*);
+
     // TODO: Added shared methods here.
 
 }                                       // namespace Exiv2
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 7b1d81c..38c44c0 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -49,19 +49,6 @@ namespace Exiv2 {
 
     // -- Standard Sony Makernotes tags ---------------------------------------------------------------
 
-    //! Lookup table to translate Sony image quality values to readable labels
-    extern const TagDetails sonyImageQuality[] = {
-        { 0, N_("Raw")                   },
-        { 1, N_("Super Fine")            },
-        { 2, N_("Fine")                  },
-        { 3, N_("Standard")              },
-        { 4, N_("Economy")               },
-        { 5, N_("Extra Fine")            },
-        { 6, N_("Raw + JPEG")            },
-        { 7, N_("Compressed Raw")        },
-        { 8, N_("Compressed Raw + JPEG") }
-    };
-
     //! Lookup table to translate Sony teleconverter model values to readable labels
     extern const TagDetails sonyTeleconverterModel[] = {
         { 0x00, N_("None")                     },
@@ -224,7 +211,7 @@ namespace Exiv2 {
     const TagInfo SonyMakerNote::tagInfo_[] = {
         TagInfo(0x0102, "Quality", N_("Image Quality"),
                 N_("Image quality"),
-                sony1IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyImageQuality)),
+                sony1IfdId, makerTags, unsignedLong, printMinoltaSonyImageQuality),
         TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"),
                 N_("Flash exposure compensation in EV"),
                 sony1IfdId, makerTags, signedRational, printValue),

-- 
exiv2 packaging