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

The following commit has been merged in the master branch:
commit f924b465f4c916dcb505de5f860b6a30f498cbfa
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Sun Apr 25 06:57:31 2010 +0000

    more A100 CS tags
---
 src/minoltamn.cpp         | 19 ++++++++++++++-----
 src/minoltasonyvalues.cpp | 14 ++++++++++++++
 src/minoltasonyvalues.hpp |  3 +++
 src/sonymn.cpp            | 11 ++---------
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 6a3c08f..a1dd672 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1394,9 +1394,6 @@ namespace Exiv2 {
                 sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue),
 
 /*
-        TagInfo(0x0050, "Rotation", N_("Rotation"),
-                N_("Rotation"),
-                sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaRotation5D)),
         TagInfo(0x0053, "ExposureCompensation", N_("Exposure Compensation"),
                 N_("Exposure compensation"),
                 sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaExposureCompensation5D),
@@ -1412,10 +1409,22 @@ namespace Exiv2 {
         TagInfo(0x00AE, "ImageNumber", N_("Image Number"),
                 N_("Image number"),
                 sony1MltCsA100IfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x00BD, "ImageStabilization", N_("Image Stabilization"),
+*/
+
+        TagInfo(0x0057, "ImageStabilization", N_("Image Stabilization"),
                 N_("Image stabilization"),
                 sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
-*/
+
+        TagInfo(0x005A, "Rotation", N_("Rotation"),
+                N_("Rotation"),
+                sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyRotation),
+
+        TagInfo(0x005E, "ColorTemperature", N_("Color Temperature"),
+                N_("Color temperature"),
+                sony1MltCsA100IfdId, makerTags, unsignedLong, printValue),
+        TagInfo(0x005F, "ColorCompensationFilter", N_("Color Compensation Filter"),
+                N_("Color compensation filter: negative is green, positive is magenta"),
+                sony1MltCsA100IfdId, makerTags, unsignedLong, printValue),
 
         // End of list marker
         TagInfo(0xffff, "(UnknownSonyCsA100Tag)", "(UnknownSonyCsA100Tag)",
diff --git a/src/minoltasonyvalues.cpp b/src/minoltasonyvalues.cpp
index cb38c5d..b9664ab 100644
--- a/src/minoltasonyvalues.cpp
+++ b/src/minoltasonyvalues.cpp
@@ -459,4 +459,18 @@ namespace Exiv2 {
     {
         return EXV_PRINT_TAG(minoltaSonyQualityCS)(os, value, metadata);
     }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony camera settings rotation values to readable labels
+    extern const TagDetails minoltaSonyRotation[] = {
+        { 0, N_("Horizontal (normal)") },
+        { 1, N_("Rotate 90 CW")        },
+        { 2, N_("Rotate 270 CW")       }
+    };
+
+    std::ostream& printMinoltaSonyRotation(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyRotation)(os, value, metadata);
+    }
 }                                       // namespace Exiv2
diff --git a/src/minoltasonyvalues.hpp b/src/minoltasonyvalues.hpp
index 8152d93..598cda7 100644
--- a/src/minoltasonyvalues.hpp
+++ b/src/minoltasonyvalues.hpp
@@ -67,6 +67,9 @@ namespace Exiv2 {
     //! Print Minolta/Sony Quality values to readable labels.
     EXIV2API std::ostream& printMinoltaSonyQualityCS(std::ostream&, const Value&, const ExifData*);
 
+    //! Print Minolta/Sony Rotation values to readable labels.
+    EXIV2API std::ostream& printMinoltaSonyRotation(std::ostream&, const Value&, const ExifData*);
+
     // TODO: Added shared methods here.
 
 }                                       // namespace Exiv2
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 184714b..6e4fa13 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -390,13 +390,6 @@ namespace Exiv2 {
         { 19, N_("D-Range Optimizer Bracketing Low") }
     };
 
-    //! Lookup table to translate Sony camera settings rotation values to readable labels
-    extern const TagDetails sonyRotation[] = {
-        { 0, N_("Horizontal (normal)") },
-        { 1, N_("Rotate 90 CW")        },
-        { 2, N_("Rotate 270 CW")       }
-    };
-
     //! Lookup table to translate Sony camera settings focus mode values to readable labels
     extern const TagDetails sonyFocusMode[] = {
         { 0, N_("Manual") },
@@ -577,7 +570,7 @@ namespace Exiv2 {
                 sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
         TagInfo(0x0063, "Rotation", N_("Rotation"),
                 N_("Rotation"),
-                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyRotation)),
+                sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyRotation),
         TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"),
                 N_("Sony Image Size"),
                 sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)),
@@ -649,7 +642,7 @@ namespace Exiv2 {
                 sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureProgram)),
         TagInfo(0x0063, "Rotation", N_("Rotation"),
                 N_("Rotation"),
-                sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyRotation)),
+                sony1Cs2IfdId, makerTags, unsignedShort, printMinoltaSonyRotation),
         TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"),
                 N_("Sony Image Size"),
                 sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)),

-- 
exiv2 packaging