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

The following commit has been merged in the master branch:
commit d93d9dd80df9195fa9177ff59663fce252ec5d8a
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Fri Nov 28 01:43:18 2014 +0000

    Print correct PictureWizard Color tag value. Patch by Pascal de Bruijn (private communication).
---
 src/samsungmn.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/samsungmn.cpp b/src/samsungmn.cpp
index 6926259..5ea0fdc 100644
--- a/src/samsungmn.cpp
+++ b/src/samsungmn.cpp
@@ -168,6 +168,20 @@ namespace Exiv2 {
         { 11, N_("Custom3")   }
     };
 
+    //! Print the PictureWizard Color tag value
+    std::ostream& printPwColor(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedShort) {
+            return os << value;
+        }
+        // Special case where no color modification is done
+        if (value.toLong() == 65535) {
+            return os << _("Neutral");
+        }
+        // Output seems to represent Hue in degrees
+        return os << value.toLong();
+    }
+
     //! Print the tag value minus 4
     std::ostream& printValueMinus4(std::ostream& os, const Value& value, const ExifData*)
     {
@@ -180,7 +194,7 @@ namespace Exiv2 {
     // Samsung PictureWizard Tag Info
     const TagInfo Samsung2MakerNote::tagInfoPw_[] = {
         TagInfo(0x0000, "Mode", N_("Mode"), N_("Mode"), samsungPwId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(samsungPwMode)),
-        TagInfo(0x0001, "Color", N_("Color"), N_("Color"), samsungPwId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0001, "Color", N_("Color"), N_("Color"), samsungPwId, makerTags, unsignedShort, 1, printPwColor),
         TagInfo(0x0002, "Saturation", N_("Saturation"), N_("Saturation"), samsungPwId, makerTags, unsignedShort, 1, printValueMinus4),
         TagInfo(0x0003, "Sharpness", N_("Sharpness"), N_("Sharpness"), samsungPwId, makerTags, unsignedShort, 1, printValueMinus4),
         TagInfo(0x0004, "Contrast", N_("Contrast"), N_("Contrast"), samsungPwId, makerTags, unsignedShort, 1, printValueMinus4),

-- 
exiv2 packaging