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

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

    implement AFIlluminator
---
 src/sonymn.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 91f720c..f2b2399 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -446,11 +446,17 @@ namespace Exiv2 {
     };
 
     //! Lookup table to translate Sony camera settings priority setup shutter release values to readable labels
-    extern const TagDetails prioritySetupShutterRelease[] = {
+    extern const TagDetails sonyPrioritySetupShutterRelease[] = {
         { 0, N_("AF") },
         { 1, N_("Release") },
     };
 
+    //! Lookup table to translate Minolta/Sony bool function values to readable labels
+    extern const TagDetails sonyAFIlluminator[] = {
+        { 0, N_("Auto") },
+        { 1, N_("Off")  }
+    };
+
     // 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.
@@ -509,12 +515,11 @@ namespace Exiv2 {
         // NOTE: A700 only
         TagInfo(0x0040, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"),
                 N_("Priority Setup Shutter Release"),
-                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(prioritySetupShutterRelease)),
-
+                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyPrioritySetupShutterRelease)),
         // NOTE: A700 only
         TagInfo(0x0041, "AFIlluminator", N_("AF Illuminator"),
                 N_("AF Illuminator"),
-                sony1CsIfdId, makerTags, unsignedShort, printValue),
+                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAFIlluminator)),
 
         // NOTE: A700 only
         TagInfo(0x0042, "AFWithShutter", N_("AF With Shutter"),

-- 
exiv2 packaging