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

The following commit has been merged in the master branch:
commit b7d54e2e85e1a627b9e9654f0d2628dfa395e3af
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Tue Jun 1 12:16:34 2010 +0000

    new Rotation2 and PictureFinish tags
---
 src/minoltamn.cpp | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index c153207..3a98774 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -947,6 +947,20 @@ namespace Exiv2 {
         { 3, "DMF"  }
     };
 
+    //! Lookup table to translate Minolta Dynax 5D camera settings picture finish values to readable labels
+    extern const TagDetails minoltaPictureFinish5D[] = {
+        { 0, N_("Natural")         },
+        { 1, N_("Natural+")        },
+        { 2, N_("Portrait")        },
+        { 3, N_("Wind Scene")      },
+        { 4, N_("Evening Scene")   },
+        { 5, N_("Night Scene")     },
+        { 6, N_("Night Portrait")  },
+        { 7, N_("Monochrome")      },
+        { 8, N_("Adobe RGB")       },
+        { 9, N_("Adobe RGB (ICC)") }
+    };
+
     //! Method to convert Minolta Dynax 5D exposure manual bias values.
     std::ostream& MinoltaMakerNote::printMinoltaExposureManualBias5D(std::ostream& os, const Value& value, const ExifData*)
     {
@@ -1039,6 +1053,15 @@ namespace Exiv2 {
         TagInfo(0x0054, "FreeMemoryCardImages", N_("Free Memory Card Images"),
                 N_("Free memory card images"),
                 minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0065, "Rotation2", N_("Rotation2"),
+                N_("Rotation2"),
+                minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaSonyRotation),
+        TagInfo(0x006E, "Color Temperature", N_("Color Temperature"),
+                N_("Color Temperature"),
+                minoltaCs5DIfdId, makerTags, signedShort, printValue),
+        TagInfo(0x0071, "PictureFinish", N_("Picture Finish"),
+                N_("Picture Finish"),
+                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaPictureFinish5D)),
         TagInfo(0x0091, "ExposureManualBias", N_("Exposure Manual Bias"),
                 N_("Exposure manual bias"),
                 minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaExposureManualBias5D),

-- 
exiv2 packaging