[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=2eec949

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

    Changed print format
---
 src/actions.cpp   |  6 +++---
 src/exifprint.cpp | 16 ++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 37f7d42..1dc752b 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      actions.cpp
-  Version:   $Name:  $ $Revision: 1.2 $
+  Version:   $Name:  $ $Revision: 1.3 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   08-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.2 $ $RCSfile: actions.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.3 $ $RCSfile: actions.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -129,7 +129,7 @@ namespace Action {
                       << md->ifdItem() << " "
                       << std::setw(27) << std::setfill(' ') << std::left
                       << md->tagName() << " "
-                      << std::dec << md->value() << "
";
+                      << std::dec << *md << "
";
         }
         return 0;
     }
diff --git a/src/exifprint.cpp b/src/exifprint.cpp
index 6207d8d..e03f0ff 100644
--- a/src/exifprint.cpp
+++ b/src/exifprint.cpp
@@ -23,12 +23,12 @@
 
   File:      exifprint.cpp
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
-  Version  : $Name:  $ $Revision: 1.8 $
+  Version  : $Name:  $ $Revision: 1.9 $
   History  : 26-Jan-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.8 $ $RCSfile: exifprint.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.9 $ $RCSfile: exifprint.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -67,12 +67,16 @@ try {
     for (ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
         std::cout << "0x" << std::setw(4) << std::setfill('0') << std::right
                   << std::hex << i->tag() << " " 
-                  << std::setw(9) << std::setfill(' ') << std::left
-                  << i->ifdItem() << " "
+                  << std::setw(4) << std::setfill(' ') << std::left
+                  << i->ifdName() << " "
                   << std::setw(27) << std::setfill(' ') << std::left
                   << i->tagName() << " "
-//                  << std::dec << i->value() 
-                  << std::dec << *i 
+                  << std::setw(9) << std::setfill(' ') << std::left
+                  << i->typeName() << " "
+                  << std::dec << std::setw(3) 
+                  << std::setfill(' ') << std::right
+                  << i->count() << " "
+                  << std::dec << i->value() 
                   << "
";
     }
 

-- 
exiv2 packaging