[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=63973cd

The following commit has been merged in the master branch:
commit 63973cda33afe40cd23cb1b71f9fef64d8c1bb87
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 22 10:46:20 2010 +0000

    sony makernotes implementation is now complete
---
 src/sonymn.cpp | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index ae1f5ed..11b23af 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -505,6 +505,23 @@ namespace Exiv2 {
         { 2, "16:9"  }
     };
 
+    //! Lookup table to translate Sony camera settings quality values to readable labels
+    extern const TagDetails sonyQuality[] = {
+        { 0,   N_("RAW ")       },
+        { 2,   N_("CRAW ")      },
+        { 16,  N_("Extra Fine") },
+        { 32,  N_("Fine")       },
+        { 34,  N_("RAW+JPEG")   },
+        { 35,  N_("CRAW+JPEG")  },
+        { 48,  N_("Standard")   }
+    };
+
+    //! Lookup table to translate Sony exposure level increments values to readable labels
+    extern const TagDetails sonyExposureLevelIncrements[] = {
+        { 33, "1/3 EV" },
+        { 50, "1/2 EV" }
+    };
+
     // Sony Camera Settings Tag Info
     // NOTE: all are for A200, A230, A300, A350, A700, A850 and A900 Sony model excepted
     // some entries which are only relevant with A700.
@@ -599,15 +616,12 @@ namespace Exiv2 {
         TagInfo(0x0085, "AspectRatio", N_("Aspect Ratio"),
                 N_("Aspect Ratio"),
                 sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAspectRatio)),
-
         TagInfo(0x0086, "Quality", N_("Quality"),
                 N_("Quality"),
-                sony1CsIfdId, makerTags, unsignedShort, printValue),
-
+                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(printValue)),
         TagInfo(0x0088, "ExposureLevelIncrements", N_("Exposure Level Increments"),
                 N_("Exposure Level Increments"),
-                sony1CsIfdId, makerTags, unsignedShort, printValue),
-
+                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureLevelIncrements)),
         // End of list marker
         TagInfo(0xffff, "(UnknownSony1CsTag)", "(UnknownSony1CsTag)",
                 N_("Unknown Sony1 Camera Settings tag"),

-- 
exiv2 packaging