[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=713665f

The following commit has been merged in the master branch:
commit 713665f8e430b52d8a7b9418ad5a03f2c8f6fad2
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 22 05:02:12 2010 +0000

    Implement Sony Makernote Rotation tag
---
 src/sonymn.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 64eaddb..4a523f0 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -378,6 +378,13 @@ namespace Exiv2 {
 
     // -- Sony camera settings ---------------------------------------------------------------
 
+    //! Lookup table to translate Sony camera settings rotation values to readable labels
+    extern const TagDetails sonyRotation[] = {
+        { 0, N_("Horizontal (normal)") },
+        { 1, N_("Rotate 90 CW")        },
+        { 2, N_("Rotate 270 CW")       }
+    };
+
     // 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.
@@ -483,7 +490,7 @@ namespace Exiv2 {
 
         TagInfo(0x0063, "Rotation", N_("Rotation"),
                 N_("Rotation"),
-                sony1CsIfdId, makerTags, unsignedShort, printValue),
+                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyRotation)),
 
         TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"),
                 N_("Sony Image Size"),
@@ -571,7 +578,7 @@ namespace Exiv2 {
 
         TagInfo(0x0063, "Rotation", N_("Rotation"),
                 N_("Rotation"),
-                sony1Cs2IfdId, makerTags, unsignedShort, printValue),
+                sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyRotation)),
 
         TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"),
                 N_("Sony Image Size"),

-- 
exiv2 packaging