[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=18ff424

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

    start to update Sony Makernotes support, using last revision of Exiftool database
---
 src/sonymn.cpp | 35 +++++++++++++++++++++++++++++++++++
 src/sonymn.hpp |  8 ++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 25e750c..33c1671 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -46,8 +46,43 @@ EXIV2_RCSID("@(#) $Id$")
 // class member definitions
 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")                     },
+        { 0x48, N_("Minolta AF 2x APO (D)")    },
+        { 0x50, N_("Minolta AF 2x APO II")     },
+        { 0x88, N_("Minolta AF 1.4x APO (D) ") },
+        { 0x90, N_("Minolta AF 1.4x APO II")   }
+    };
+
     // Sony MakerNote Tag Info
     const TagInfo SonyMakerNote::tagInfo_[] = {
+
+        TagInfo(0x0102, "Quality", N_("Image Quality"),
+                N_("Image quality"),
+                sonyIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyImageQuality)),
+        TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"),
+                N_("Flash exposure compensation in EV"),
+                sonyIfdId, makerTags, signedRational, printValue),
+        TagInfo(0x0105, "Teleconverter", N_("Teleconverter Model"),
+                N_("Teleconverter Model"),
+                sonyIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyTeleconverterModel)),
+
         TagInfo(0x2000, "0x2000", "0x2000",
                 N_("Unknown"),
                 sonyIfdId, makerTags, undefined, printValue),
diff --git a/src/sonymn.hpp b/src/sonymn.hpp
index 1fa9851..f0f601f 100644
--- a/src/sonymn.hpp
+++ b/src/sonymn.hpp
@@ -20,10 +20,15 @@
  */
 /*!
   @file    sonymn.hpp
-  @brief   Basic Sony MakerNote implementation
+  @brief   Sony MakerNote implemented using the following references:<br>
+           <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Sony.html">Sony Makernote list</a> by Phil Harvey<br>
+Email communication with <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a><br>
+
   @version $Rev$
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
+             @author  Gilles Caulier (cgilles)
+           <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
   @date    18-Apr-05, ahu: created
  */
 #ifndef SONYMN_HPP_
@@ -56,7 +61,6 @@ namespace Exiv2 {
         static const TagInfo tagInfo_[];
 
     }; // class SonyMakerNote
-
 }                                       // namespace Exiv2
 
 #endif                                  // #ifndef SONYMN_HPP_

-- 
exiv2 packaging