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

The following commit has been merged in the master branch:
commit e9d0aea8e5f8776f3583e8f7d1045736bcd754eb
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Feb 21 12:00:32 2004 +0000

    Minor changes
---
 src/actions.cpp  |  6 +++---
 src/doxygen.hpp  |  4 ++--
 src/example1.cpp | 11 ++++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index d3d79b1..6cd4b9d 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      actions.cpp
-  Version:   $Name:  $ $Revision: 1.6 $
+  Version:   $Name:  $ $Revision: 1.7 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   08-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.6 $ $RCSfile: actions.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.7 $ $RCSfile: actions.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -243,7 +243,7 @@ namespace Action {
         for (md = exifData.begin(); md != exifData.end(); ++md) {
             std::cout << "0x" << std::setw(4) << std::setfill('0') << std::right
                       << std::hex << md->tag() << " " 
-                      << std::setw(4) << std::setfill(' ') << std::left
+                      << std::setw(9) << std::setfill(' ') << std::left
                       << md->ifdName() << " "
                       << std::setw(9) << std::setfill(' ') << std::left
                       << md->typeName() << " "
diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index c8fc239..c6d1498 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -4,7 +4,7 @@
 /*!
   @file    doxygen.hpp
   @brief   Additional documentation, this file contains no source code
-  @version $Name:  $ $Revision: 1.2 $
+  @version $Name:  $ $Revision: 1.3 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    07-Feb-04, ahu: created
@@ -24,7 +24,7 @@
   Exiv2 is also a C++ %Exif metadata library, providing high-level access to the
   %Exif data of an image. Supported functionality includes
   - read %Exif information from JPEG files
-  - access metadata through unique keys and standard C++ iterators
+  - access metadata through keys and standard C++ iterators
   - add, modify and delete metadata 
   - write %Exif data to JPEG files
   - extract %Exif metadata to files, insert from these files
diff --git a/src/example1.cpp b/src/example1.cpp
index 7d41350..9e2ecf1 100644
--- a/src/example1.cpp
+++ b/src/example1.cpp
@@ -3,7 +3,7 @@
   Abstract:  Example showing how to add, modify and delete Exif metadata
 
   File:      example1.cpp
-  Version:   $Name:  $ $Revision: 1.4 $
+  Version:   $Name:  $ $Revision: 1.5 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   26-Jan-04, ahu: created
  */
@@ -67,6 +67,8 @@ try {
     std::string date = pos->toString();
     date.replace(0,4,"2000");
     pos->setValue(date); 
+    std::cout << "Modified key \"" << key 
+              << "\", new value \"" << pos->value() << "\"
";
 
     // Find the other key
     key = "Image.ImageCharacteristics.PrimaryChromaticities";
@@ -83,6 +85,8 @@ try {
     pos->setValue(rv);
     // Delete the memory allocated by getValue
     delete v;
+    std::cout << "Modified key \"" << key 
+              << "\", new value \"" << pos->value() << "\"
";
 
     std::cout << "---
";
     exifPrint(exifData);
@@ -90,16 +94,13 @@ try {
     // *************************************************************************
     // Delete metadata from the Exif data container
 
-    // Delete a metadatum by its key
-    key = "Image.DateTime.DateTimeOriginal";
-    exifData.erase(key);
-
     // Delete the metadatum at iterator position pos
     key = "Image.ImageCharacteristics.PrimaryChromaticities";
     pos = exifData.findKey(key);
     if (pos == exifData.end()) throw Exif::Error("Key not found");
     exifData.erase(pos);
 
+    std::cout << "Deleted key \"" << key << "\"
";
     std::cout << "---
";
     exifPrint(exifData);
 

-- 
exiv2 packaging