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

The following commit has been merged in the master branch:
commit c2281bca9fa6605bdfbbadf02de3ed99fd7fff9a
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Wed Apr 14 13:53:29 2010 +0000

    update Sony makernotes
---
 src/sonymn.cpp | 23 ++++++++++++++++++-----
 src/sonymn.hpp |  5 +++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 92d4837..46511ea 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -212,13 +212,13 @@ namespace Exiv2 {
         TagInfo(0x3000, "ShotInfo", N_("Shot Info"),
                 N_("Shot Information"),
                 sonyIfdId, makerTags, undefined, printValue),
-
-        // TODO more tags here
-
-        TagInfo(0xb001, "SonyModelID", "Sony Model ID",
+        TagInfo(0xb000, "FileFormat", N_("File Format"),
+                N_("File Format"),
+                sonyIfdId, makerTags, unsignedByte, print0xb000),
+        TagInfo(0xb001, "SonyModelID", N_("Sony Model ID"),
                 N_("Sony Model ID"),
                 sonyIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyModelId)),
-        TagInfo(0xb020, "ColorReproduction", "Color Reproduction",
+        TagInfo(0xb020, "ColorReproduction", N_("Color Reproduction"),
                 N_("Color Reproduction"),
                 sonyIfdId, makerTags, asciiString, printValue),
         TagInfo(0xb021, "ColorTemperature", N_("Color Temperature"),
@@ -282,4 +282,17 @@ namespace Exiv2 {
         return tagInfo_;
     }
 
+    std::ostream& SonyMakerNote::print0xb000(std::ostream& os,
+                                             const Value& value,
+                                             const ExifData*)
+    {
+        std::string model = value.toString();
+        if      (model == "0002") os << "JPEG";
+        else if (model == "1000") os << "SR2";
+        else if (model == "2000") os << "ARW 1.0";
+        else if (model == "3000") os << "ARW 2.0";
+        else if (model == "3100") os << "ARW 2.1";
+        else                      os << "(" << value << ")";
+        return os;
+    }
 }                                       // namespace Exiv2
diff --git a/src/sonymn.hpp b/src/sonymn.hpp
index f0f601f..2b92f34 100644
--- a/src/sonymn.hpp
+++ b/src/sonymn.hpp
@@ -56,6 +56,11 @@ namespace Exiv2 {
         //! Return read-only list of built-in Sony tags
         static const TagInfo* tagList();
 
+        //! @name Print functions for Sony %MakerNote tags
+        //@{
+        //! Print Sony Model
+        static std::ostream& print0xb000(std::ostream& os, const Value& value, const ExifData*);
+
     private:
         //! Tag information
         static const TagInfo tagInfo_[];

-- 
exiv2 packaging