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

The following commit has been merged in the master branch:
commit d21943ca94890ea0b4f061aea2d5033e021bf9b3
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Feb 12 15:54:31 2004 +0000

    Added print functions for UserComment and Copyright
---
 src/tags.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
 src/tags.hpp | 10 +++++-----
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index 8596a45..a20d7da 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      tags.cpp
-  Version:   $Name:  $ $Revision: 1.12 $
+  Version:   $Name:  $ $Revision: 1.13 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   15-Jan-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.12 $ $RCSfile: tags.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.13 $ $RCSfile: tags.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -135,7 +135,7 @@ namespace Exif {
         TagInfo(0x0212, "YCbCrSubSampling", "Subsampling ratio of Y to C", ifd0, imgStruct, printValue),
         TagInfo(0x0213, "YCbCrPositioning", "Y and C positioning", ifd0, imgStruct, print0x0213),
         TagInfo(0x0214, "ReferenceBlackWhite", "Pair of black and white reference values", ifd0, imgCharacter, printValue),
-        TagInfo(0x8298, "Copyright", "Copyright holder", ifd0, otherTags, printValue),
+        TagInfo(0x8298, "Copyright", "Copyright holder", ifd0, otherTags, print0x8298),
         TagInfo(0x8769, "ExifTag", "Exif IFD Pointer", ifd0, exifFormat, printValue),
         TagInfo(0x8825, "GPSTag", "GPSInfo IFD Pointer", ifd0, exifFormat, printValue),
         // End of list marker
@@ -167,7 +167,7 @@ namespace Exif {
         TagInfo(0x920a, "FocalLength", "Lens focal length", exifIfd, captureCond, print0x920a),
         TagInfo(0x9214, "SubjectArea", "Subject area", exifIfd, captureCond, printValue),
         TagInfo(0x927c, "MakerNote", "Manufacturer notes", exifIfd, userInfo, printValue),
-        TagInfo(0x9286, "UserComment", "User comments", exifIfd, userInfo, printValue),
+        TagInfo(0x9286, "UserComment", "User comments", exifIfd, userInfo, print0x9286),
         TagInfo(0x9290, "SubSecTime", "DateTime subseconds", exifIfd, dateTime, printValue),
         TagInfo(0x9291, "SubSecTimeOriginal", "DateTimeOriginal subseconds", exifIfd, dateTime, printValue),
         TagInfo(0x9292, "SubSecTimeDigitized", "DateTimeDigitized subseconds", exifIfd, dateTime, printValue),
@@ -465,7 +465,6 @@ namespace Exif {
         return os << value.toLong();
     }
 
-    // Todo: Cleanup needed
     std::ostream& printFloat(std::ostream& os, const Value& value)
     {
         const URationalValue* ur = dynamic_cast<const URationalValue*>(&value);
@@ -477,7 +476,6 @@ namespace Exif {
                 return os << value;
             }
         }
-
         const RationalValue* sr = dynamic_cast<const RationalValue*>(&value);
         if (sr) {
             if (sr->value_[0].second != 0) {
@@ -487,8 +485,18 @@ namespace Exif {
                 return os << value;
             }
         }
-
         return os << value;
+    } // printFloat
+
+    std::ostream& printUnit(std::ostream& os, const Value& value)
+    {
+        long unit = value.toLong();
+        switch (unit) {
+        case 2:  os << "Inch"; break;
+        case 3:  os << "Centimeter"; break;
+        default: os << unit; break;
+        }
+        return os;
     }
 
     std::ostream& print0x0103(std::ostream& os, const Value& value)
@@ -524,13 +532,22 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& printUnit(std::ostream& os, const Value& value)
+    std::ostream& print0x8298(std::ostream& os, const Value& value)
     {
-        long unit = value.toLong();
-        switch (unit) {
-        case 2:  os << "Inch"; break;
-        case 3:  os << "Centimeter"; break;
-        default: os << unit; break;
+        // Print the copyright information in the format Photographer, Editor
+        std::string val = value.toString();
+        std::string::size_type pos = val.find('

-- 
exiv2 packaging