[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=8475aa4

The following commit has been merged in the master branch:
commit 8475aa4c6562b04cd419a5009246dbb36f88fbb7
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Feb 13 02:58:14 2004 +0000

    Added orientation print function
---
 src/tags.cpp | 29 +++++++++++++++++++++++------
 src/tags.hpp |  4 +++-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index 02d0fcf..74cfe90 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      tags.cpp
-  Version:   $Name:  $ $Revision: 1.14 $
+  Version:   $Name:  $ $Revision: 1.15 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   15-Jan-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.14 $ $RCSfile: tags.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.15 $ $RCSfile: tags.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -115,7 +115,7 @@ namespace Exif {
         TagInfo(0x010f, "Make", "Manufacturer of image input equipment", ifd0, otherTags, printValue),
         TagInfo(0x0110, "Model", "Model of image input equipment", ifd0, otherTags, printValue),
         TagInfo(0x0111, "StripOffsets", "Image data location", ifd0, recOffset, printValue),
-        TagInfo(0x0112, "Orientation", "Orientation of image", ifd0, imgStruct, printValue),
+        TagInfo(0x0112, "Orientation", "Orientation of image", ifd0, imgStruct, print0x0112),
         TagInfo(0x0115, "SamplesPerPixel", "Number of components", ifd0, imgStruct, printValue),
         TagInfo(0x0116, "RowsPerStrip", "Number of rows per strip", ifd0, recOffset, printValue),
         TagInfo(0x0117, "StripByteCounts", "Bytes per compressed strip", ifd0, recOffset, printValue),
@@ -492,8 +492,8 @@ namespace Exif {
     {
         long unit = value.toLong();
         switch (unit) {
-        case 2:  os << "Inch"; break;
-        case 3:  os << "Centimeter"; break;
+        case 2:  os << "inch"; break;
+        case 3:  os << "cm"; break;
         default: os << unit; break;
         }
         return os;
@@ -521,6 +521,23 @@ namespace Exif {
         return os;
     }
 
+    std::ostream& print0x0112(std::ostream& os, const Value& value)
+    {
+        long orientation = value.toLong();
+        switch (orientation) {
+        case 1:  os << "top, left"; break;
+        case 2:  os << "top, right"; break;
+        case 3:  os << "bottom, right"; break;
+        case 4:  os << "bottom, left"; break;
+        case 5:  os << "left, top"; break;
+        case 6:  os << "right, top"; break;
+        case 7:  os << "right, bottom"; break;
+        case 8:  os << "left, bottom"; break;
+        default: os << orientation; break;
+        }
+        return os;
+    }
+
     std::ostream& print0x0213(std::ostream& os, const Value& value)
     {
         long position = value.toLong();
@@ -637,7 +654,7 @@ namespace Exif {
         switch (mode) {
         case 0:  os << "Unknown"; break;
         case 1:  os << "Average"; break;
-        case 2:  os << "Center weighted average"; break;
+        case 2:  os << "Center weighted"; break;
         case 3:  os << "Spot"; break;
         case 4:  os << "Multispot"; break;
         case 5:  os << "Pattern"; break;
diff --git a/src/tags.hpp b/src/tags.hpp
index eae8f05..69e1209 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    tags.hpp
   @brief   %Exif tag and type information
-  @version $Name:  $ $Revision: 1.14 $
+  @version $Name:  $ $Revision: 1.15 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    15-Jan-04, ahu: created
@@ -216,6 +216,8 @@ namespace Exif {
     std::ostream& print0x0103(std::ostream& os, const Value& value);
     //! Print the pixel composition
     std::ostream& print0x0106(std::ostream& os, const Value& value);
+    //! Print the orientation
+    std::ostream& print0x0112(std::ostream& os, const Value& value);
     //! Print the YCbCrPositioning
     std::ostream& print0x0213(std::ostream& os, const Value& value);
     //! Print the Copyright 

-- 
exiv2 packaging