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

The following commit has been merged in the master branch:
commit c498837b667a5907df7dfab1cb14db41148bc866
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Mon Apr 12 13:46:43 2010 +0000

    update Sony Makernotes
---
 src/sonymn.cpp | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index f3c6b24..352f12e 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -83,6 +83,12 @@ namespace Exiv2 {
         { 0x70,  N_("Custom")                         }
     };
 
+    //! Lookup table to translate Sony Auto HDR values to readable labels
+    extern const TagDetails sonyAutoHDR[] = {
+        { 0x00000, N_("Off") },
+        { 0x10001, N_("On")  }
+    };
+
     // Sony MakerNote Tag Info
     const TagInfo SonyMakerNote::tagInfo_[] = {
 
@@ -107,10 +113,46 @@ namespace Exiv2 {
         TagInfo(0x0116, "0x0116", "0x0116",
                 N_("Unknown"),
                 sonyIfdId, makerTags, undefined, printValue),
-
+        TagInfo(0x0e00, "PrintIM", N_("Print IM"),
+                N_("PrintIM information"),
+                sonyIfdId, makerTags, undefined, printValue),
         TagInfo(0x2000, "0x2000", "0x2000",
                 N_("Unknown"),
                 sonyIfdId, makerTags, undefined, printValue),
+        TagInfo(0x2001, "PreviewImage", N_("Preview Image"),
+                N_("Preview Image"),
+                sonyIfdId, makerTags, undefined, printValue),
+        TagInfo(0x2002, "0x2002", "0x2002",
+                N_("Unknown"),
+                sonyIfdId, makerTags, unsignedLong, printValue),
+        TagInfo(0x2003, "0x2003", "0x2003",
+                N_("Unknown"),
+                sonyIfdId, makerTags, asciiString, printValue),
+        TagInfo(0x2004, "0x2004", "0x2004",
+                N_("Unknown"),
+                sonyIfdId, makerTags, signedLong, printValue),
+        TagInfo(0x2005, "0x2005", "0x2005",
+                N_("Unknown"),
+                sonyIfdId, makerTags, signedLong, printValue),
+        TagInfo(0x2006, "0x2006", "0x2006",
+                N_("Unknown"),
+                sonyIfdId, makerTags, signedLong, printValue),
+        TagInfo(0x2007, "0x2007", "0x2007",
+                N_("Unknown"),
+                sonyIfdId, makerTags, signedLong, printValue),
+        TagInfo(0x2008, "0x2008", "0x2008",
+                N_("Unknown"),
+                sonyIfdId, makerTags, signedLong, printValue),
+        TagInfo(0x2009, "0x2009", "0x2009",
+                N_("Unknown"),
+                sonyIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x200A, "AutoHDR", N_("Auto HDR"),
+                N_("Auto High Definition Range"),
+                sonyIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyAutoHDR)),
+        TagInfo(0x3000, "ShotInfo", N_("Shot Info"),
+                N_("Shot Information"),
+                sonyIfdId, makerTags, undefined, printValue),
+
         TagInfo(0x9001, "0x9001", "0x9001",
                 N_("Unknown"),
                 sonyIfdId, makerTags, undefined, printValue),

-- 
exiv2 packaging