[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=8977dde

The following commit has been merged in the master branch:
commit 8977ddea698b5639703d047ad9d7fffa7ca6239b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Sep 7 15:57:45 2006 +0000

    Added Fuji FinePixColor (makernote tag 0x1210) tag details (Robert Peter)
---
 src/fujimn.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 65b7ec3..5eb9708 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -129,6 +129,13 @@ namespace Exiv2 {
         { 768, "Manual"            }
     };
 
+    //! FinePixColor, tag 0x1210
+    extern const TagDetails fujiFinePixColor[] = {
+        { 0, "Normal"   },
+        { 16, "Chrome" },
+        { 48, "B&W" }
+    };
+
     // Fujifilm MakerNote Tag Info
     const TagInfo FujiMakerNote::tagInfo_[] = {
         TagInfo(0x0000, "Version", "Version", "Fujifilm Makernote version", fujiIfdId, makerTags, undefined, printValue),
@@ -148,6 +155,7 @@ namespace Exiv2 {
         TagInfo(0x1100, "Continuous", "Continuous", "Continuous shooting or auto bracketing setting", fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),
         TagInfo(0x1101, "0x1101", "0x1101", "Unknown", fujiIfdId, makerTags, unsignedShort, printValue),
         TagInfo(0x1200, "0x1200", "0x1200", "Unknown", fujiIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x1210, "FinePixColor", "FinePixColor", "Fuji FinePix Color setting", fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFinePixColor)),
         TagInfo(0x1300, "BlurWarning", "BlurWarning", "Blur warning status", fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),
         TagInfo(0x1301, "FocusWarning", "FocusWarning", "Auto Focus warning status", fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),
         TagInfo(0x1302, "AeWarning", "AeWarning", "Auto Exposure warning status", fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),

-- 
exiv2 packaging